fix for --as-needed, bug #155727.

Package-Manager: portage-2.1.2_rc4-r4

4 files changed, 104 insertions, 23 deletions

diff --git a/www-misc/htdig/ChangeLog b/www-misc/htdig/ChangeLog
index fe590d02e355..e7917cac3cfa 100644
--- a/www-misc/htdig/ChangeLog
+++ b/www-misc/htdig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/htdig
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.17 2006/05/05 17:16:53 squinky86 Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.18 2007/01/03 15:51:57 rl03 Exp $
+
+  03 Jan 2007; Renat Lumpau <rl03@gentoo.org>
+  +files/htdig-3.2.0_beta6-as-needed.patch, htdig-3.2.0_beta6-r1.ebuild:
+  fix for --as-needed, bug #155727.
 
   05 May 2006; Jon Hood <squinky86@gentoo.org> htdig-3.2.0_beta6-r1.ebuild:
   Stable on amd64, bug #107062.
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index 224906537976..c22d95aed364 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -1,38 +1,45 @@
-AUX 3.1.6-ssl.patch 19082 RMD160 32c8d70ae5aad26901e70fd1068fc58201fb8ea2 SHA1 672aa5f408ef250a888877e73901eae2f9270697 SHA256 d1b07cf0a684547578b1f015f8e73568706cd213ece1259012de60e0d3730064 size 19082
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 3.1.6-ssl.patch 19082 RMD160 32c8d70ae5aad26901e70fd1068fc58201fb8ea2 SHA1 672aa5f408ef250a888877e73901eae2f9270697 SHA256 d1b07cf0a684547578b1f015f8e73568706cd213ece1259012de60e0d3730064
 MD5 43fc0bbc4d967b1a9584542e960c89f0 files/3.1.6-ssl.patch 19082
 RMD160 32c8d70ae5aad26901e70fd1068fc58201fb8ea2 files/3.1.6-ssl.patch 19082
 SHA256 d1b07cf0a684547578b1f015f8e73568706cd213ece1259012de60e0d3730064 files/3.1.6-ssl.patch 19082
-AUX htdig-3.1.6-unescaped-output.diff 640 RMD160 112bbd3c2dcf392888183974d7604f0de5e0033b SHA1 aa7e349bee6df022e86cfa5b9d32fa789d1132a5 SHA256 75cc4caefd3302fa06a851a1378de11e7a9a0986611478fdf2bc8457827ec63f size 640
+AUX htdig-3.1.6-unescaped-output.diff 640 RMD160 112bbd3c2dcf392888183974d7604f0de5e0033b SHA1 aa7e349bee6df022e86cfa5b9d32fa789d1132a5 SHA256 75cc4caefd3302fa06a851a1378de11e7a9a0986611478fdf2bc8457827ec63f
 MD5 d44854e0008c7b69a927940fe3f373d9 files/htdig-3.1.6-unescaped-output.diff 640
 RMD160 112bbd3c2dcf392888183974d7604f0de5e0033b files/htdig-3.1.6-unescaped-output.diff 640
 SHA256 75cc4caefd3302fa06a851a1378de11e7a9a0986611478fdf2bc8457827ec63f files/htdig-3.1.6-unescaped-output.diff 640
-AUX htdig-3.2.0_beta6-gcc4.patch 541 RMD160 3b684305cee717d6cf4a628fbea6af1b7891164b SHA1 a7db0eca162197556f4ea709822835d50b237015 SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef942f77adfbf54bb69e7da7dd58c3 size 541
+AUX htdig-3.2.0_beta6-as-needed.patch 2244 RMD160 312aa0861fb155f89d6e447063aa06fea523ab2f SHA1 c0f79d84c8321fc5778b7133f338553c21215d44 SHA256 3d0e74896a15f698532d4305f0a2257302ee0d275639b5f1d761cba51a6885fa
+MD5 accc71624fcbc23e67ab294365c8ca61 files/htdig-3.2.0_beta6-as-needed.patch 2244
+RMD160 312aa0861fb155f89d6e447063aa06fea523ab2f files/htdig-3.2.0_beta6-as-needed.patch 2244
+SHA256 3d0e74896a15f698532d4305f0a2257302ee0d275639b5f1d761cba51a6885fa files/htdig-3.2.0_beta6-as-needed.patch 2244
+AUX htdig-3.2.0_beta6-gcc4.patch 541 RMD160 3b684305cee717d6cf4a628fbea6af1b7891164b SHA1 a7db0eca162197556f4ea709822835d50b237015 SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef942f77adfbf54bb69e7da7dd58c3
 MD5 2aeda683f95b58efc0978d7fe951de59 files/htdig-3.2.0_beta6-gcc4.patch 541
 RMD160 3b684305cee717d6cf4a628fbea6af1b7891164b files/htdig-3.2.0_beta6-gcc4.patch 541
 SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef942f77adfbf54bb69e7da7dd58c3 files/htdig-3.2.0_beta6-gcc4.patch 541
-DIST htdig-3.1.6.tar.gz 2068675 RMD160 1414943255f16cd278a31b8014a5bfe6c4400ead SHA256 c50aae9beeeb4525901f19319350631bc16a501855f1e6f918209ba44c19638b size 2068675
-DIST htdig-3.2.0b6.tar.gz 3104936 RMD160 621e85920f3452bc1a28a61cf7f8b3e08808bc55 SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 size 3104936
-EBUILD htdig-3.1.6-r7.ebuild 1927 RMD160 1565e2f715779072133d539de3e8696cb8f333f1 SHA1 ba602677bb2d91f211528f7baeea404fabac032d SHA256 2f3cfa956b2c2740b705f2ac6f87b8469b1954e2d6cb61e4ff50a69afd398450 size 1927
+DIST htdig-3.1.6.tar.gz 2068675 RMD160 1414943255f16cd278a31b8014a5bfe6c4400ead SHA256 c50aae9beeeb4525901f19319350631bc16a501855f1e6f918209ba44c19638b
+DIST htdig-3.2.0b6.tar.gz 3104936 RMD160 621e85920f3452bc1a28a61cf7f8b3e08808bc55 SHA1 106db8c137a3e8f0f5fcf24ac96e01f3515e9cae SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8
+EBUILD htdig-3.1.6-r7.ebuild 1927 RMD160 1565e2f715779072133d539de3e8696cb8f333f1 SHA1 ba602677bb2d91f211528f7baeea404fabac032d SHA256 2f3cfa956b2c2740b705f2ac6f87b8469b1954e2d6cb61e4ff50a69afd398450
 MD5 fdee365334b22bf39c4917647b91dccd htdig-3.1.6-r7.ebuild 1927
 RMD160 1565e2f715779072133d539de3e8696cb8f333f1 htdig-3.1.6-r7.ebuild 1927
 SHA256 2f3cfa956b2c2740b705f2ac6f87b8469b1954e2d6cb61e4ff50a69afd398450 htdig-3.1.6-r7.ebuild 1927
-EBUILD htdig-3.1.6-r8.ebuild 1621 RMD160 1beb70f95187b6bbe62adb96e3a245273dbda664 SHA1 8f71b9a926c387c92c28c2148cc9a1f2d5c1db4f SHA256 2b552cdf0c0497999cc3651b9ea9d3670a97a17a336cc9b20d60905c45e6d1ae size 1621
+EBUILD htdig-3.1.6-r8.ebuild 1621 RMD160 1beb70f95187b6bbe62adb96e3a245273dbda664 SHA1 8f71b9a926c387c92c28c2148cc9a1f2d5c1db4f SHA256 2b552cdf0c0497999cc3651b9ea9d3670a97a17a336cc9b20d60905c45e6d1ae
 MD5 2ecf52a2b5e8d19fbf03d131f910385f htdig-3.1.6-r8.ebuild 1621
 RMD160 1beb70f95187b6bbe62adb96e3a245273dbda664 htdig-3.1.6-r8.ebuild 1621
 SHA256 2b552cdf0c0497999cc3651b9ea9d3670a97a17a336cc9b20d60905c45e6d1ae htdig-3.1.6-r8.ebuild 1621
-EBUILD htdig-3.2.0_beta6-r1.ebuild 1383 RMD160 f8641ea415ed028d8c08f4806e24ea7d33b41872 SHA1 1e5393cf22979d97d720f494f196079c3c9b1b7a SHA256 65f277f57bf06fdc373df2ff81ba437f5aed9b58470848d946af3f548051efd1 size 1383
-MD5 70e7a8f206177215f85920fd8b088eb3 htdig-3.2.0_beta6-r1.ebuild 1383
-RMD160 f8641ea415ed028d8c08f4806e24ea7d33b41872 htdig-3.2.0_beta6-r1.ebuild 1383
-SHA256 65f277f57bf06fdc373df2ff81ba437f5aed9b58470848d946af3f548051efd1 htdig-3.2.0_beta6-r1.ebuild 1383
-EBUILD htdig-3.2.0_beta6.ebuild 1556 RMD160 3305be4133574041afd77d3c5a66dc6b59fb9c8a SHA1 536e015e8f839ba4175e1d1e071792a95af00d5b SHA256 a874792cadb93ccd7f2180f328822bbf57bfba76c0e03949e16bc5dde234d5c8 size 1556
+EBUILD htdig-3.2.0_beta6-r1.ebuild 1430 RMD160 2127e81b597f1a3f2143be1f52cd43d4f8487d13 SHA1 dc21624ef0a23fb88ffcd7e20979114c808e5bef SHA256 fa7f13bcace286d3f46b9e54ea7bfb91550128849cb8d4d544afa955fb71f8da
+MD5 51bc98e7a3bcb210b88beb054774280f htdig-3.2.0_beta6-r1.ebuild 1430
+RMD160 2127e81b597f1a3f2143be1f52cd43d4f8487d13 htdig-3.2.0_beta6-r1.ebuild 1430
+SHA256 fa7f13bcace286d3f46b9e54ea7bfb91550128849cb8d4d544afa955fb71f8da htdig-3.2.0_beta6-r1.ebuild 1430
+EBUILD htdig-3.2.0_beta6.ebuild 1556 RMD160 3305be4133574041afd77d3c5a66dc6b59fb9c8a SHA1 536e015e8f839ba4175e1d1e071792a95af00d5b SHA256 a874792cadb93ccd7f2180f328822bbf57bfba76c0e03949e16bc5dde234d5c8
 MD5 e96f6d184841df65d4e4f43c1f74c818 htdig-3.2.0_beta6.ebuild 1556
 RMD160 3305be4133574041afd77d3c5a66dc6b59fb9c8a htdig-3.2.0_beta6.ebuild 1556
 SHA256 a874792cadb93ccd7f2180f328822bbf57bfba76c0e03949e16bc5dde234d5c8 htdig-3.2.0_beta6.ebuild 1556
-MISC ChangeLog 6620 RMD160 13a87e37ed73c90ae9baf0ab5785523db4ffce2d SHA1 caa54b9bd31f629778556fbb8b75a9131770b95a SHA256 9eab77e840849cb58543be6a243add9c4db72dbd7f60bec423c937bc39d8ec59 size 6620
-MD5 fd607c92938776fc4aa4fff72e7f158a ChangeLog 6620
-RMD160 13a87e37ed73c90ae9baf0ab5785523db4ffce2d ChangeLog 6620
-SHA256 9eab77e840849cb58543be6a243add9c4db72dbd7f60bec423c937bc39d8ec59 ChangeLog 6620
-MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 size 161
+MISC ChangeLog 6771 RMD160 a3c19179562c0e864df93d2a4a51ffd7abbd3dbb SHA1 33e805b596075cdad296d69b93ba6fdfa67fe98d SHA256 44d2228de509d1c230b53518113d100e259dd36e1c203a12097dc15663aa0ae1
+MD5 0428250bd5ed54315183aa1d3202c692 ChangeLog 6771
+RMD160 a3c19179562c0e864df93d2a4a51ffd7abbd3dbb ChangeLog 6771
+SHA256 44d2228de509d1c230b53518113d100e259dd36e1c203a12097dc15663aa0ae1 ChangeLog 6771
+MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 metadata.xml 161
@@ -48,3 +55,10 @@ SHA256 c986f1e3f4c8b17b8797c4fe46661af8399cb4c7dae45bf90a21549e925dc445 files/di
 MD5 e6548e96cacfbef1c6a3dd84e57a24ee files/digest-htdig-3.2.0_beta6-r1 244
 RMD160 12f3e71f1833de29ecd8f34dc69eceefb0b11338 files/digest-htdig-3.2.0_beta6-r1 244
 SHA256 c986f1e3f4c8b17b8797c4fe46661af8399cb4c7dae45bf90a21549e925dc445 files/digest-htdig-3.2.0_beta6-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFm9EnEzitwsaoONoRAsD9AJ0ZM1Og+Z4Cqeo20p8LO3CYbMrpAwCeIx/Z
+3Bl97/r8zSI5l4PTwRNnAYw=
+=Roti
+-----END PGP SIGNATURE-----
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
new file mode 100644
index 000000000000..bf455ea8b637
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
@@ -0,0 +1,61 @@
+--- htdig-3.2.0b6/Makefile.config.orig	2006-11-19 08:49:57.000000000 -0800
++++ htdig-3.2.0b6/Makefile.config	2006-11-19 08:51:19.000000000 -0800
+@@ -22,10 +22,7 @@
+ 		$(LOCAL_DEFINES) $(PROFILING)
+ 
+ HTLIBS=		$(top_builddir)/htnet/libhtnet.la \
+-		$(top_builddir)/htcommon/libcommon.la \
+-		$(top_builddir)/htword/libhtword.la \
+ 		$(top_builddir)/htlib/libht.la \
+ 		$(top_builddir)/htcommon/libcommon.la \
+ 		$(top_builddir)/htword/libhtword.la \
+-		$(top_builddir)/db/libhtdb.la \
+-		$(top_builddir)/htlib/libht.la
++		$(top_builddir)/db/libhtdb.la 
+--- htdig-3.2.0b6/htlib/Makefile.am.orig	2006-11-19 09:13:47.000000000 -0800
++++ htdig-3.2.0b6/htlib/Makefile.am	2006-11-19 09:17:50.000000000 -0800
+@@ -1,7 +1,8 @@
+ include $(top_srcdir)/Makefile.config
+ 
+ pkglib_LTLIBRARIES = libht.la
+-
++libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la
++libht_la_LIBADD= $(top_builddir)/db/libhtdb.la
+ libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \
+ 	DB2_db.cc IntObject.cc List.cc Object.cc \
+ 	ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \
+@@ -17,9 +18,6 @@
+ 	myqsort.c \
+ 	md5.cc mhash_md5.c 
+ 
+-libht_la_LIBADD=@LTLIBOBJS@
+-# this includes regex.c
+-
+ libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags}
+ 
+ pkginclude_HEADERS = \
+--- htdig-3.2.0b6/htword/Makefile.am.orig	2006-11-19 08:55:08.000000000 -0800
++++ htdig-3.2.0b6/htword/Makefile.am	2006-11-19 08:56:51.000000000 -0800
+@@ -10,7 +10,8 @@
+ LOCAL_DEFINES = 
+ 
+ pkglib_LTLIBRARIES = libhtword.la
+-
++libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la
++libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la
+ libhtword_la_SOURCES = \
+ 	WordBitCompress.cc \
+ 	WordContext.cc \
+
+--- htdig-3.2.0b6/htcommon/Makefile.am.orig	2006-11-19 09:32:39.000000000 -0800
++++ htdig-3.2.0b6/htcommon/Makefile.am	2006-11-19 09:33:42.000000000 -0800
+@@ -12,7 +12,8 @@
+ EXTRA_DIST=conf_lexer.cxx conf_parser.cxx
+ 
+ pkglib_LTLIBRARIES = libcommon.la
+-
++libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la
++libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la
+ libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \
+ 	HtWordReference.cc HtWordList.cc defaults.cc \
+ 	HtURLCodec.cc URL.cc URLTrans.cc \
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r1.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r1.ebuild
index 0f9b85eeb782..6fac07a2b10d 100644
--- a/www-misc/htdig/htdig-3.2.0_beta6-r1.ebuild
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r1.ebuild,v 1.2 2006/05/05 17:16:53 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r1.ebuild,v 1.3 2007/01/03 15:51:57 rl03 Exp $
 
-inherit eutils flag-o-matic
+inherit eutils autotools
 
 MY_PV=${PV/_beta/b}
 S=${WORKDIR}/${PN}-${MY_PV}
@@ -23,6 +23,8 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-as-needed.patch
+	eautoreconf
 }
 
 src_compile() {
@@ -40,7 +42,7 @@ src_compile() {
 }
 
 src_install () {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR=${D} install || die "make install failed"
 
 	dodoc ChangeLog COPYING README
 	dohtml -r htdoc