Make it build with --as-needed. bug #149675

Package-Manager: portage-2.1.2_pre2-r3

4 files changed, 41 insertions, 18 deletions

diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog
index d016fd07b927..72af19f85b56 100644
--- a/app-pda/gnome-pilot/ChangeLog
+++ b/app-pda/gnome-pilot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/gnome-pilot
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.26 2006/07/20 10:35:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.27 2006/10/06 15:04:40 dang Exp $
+
+  06 Oct 2006; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gnome-pilot-2.0.13-as-needed.patch, gnome-pilot-2.0.13-r1.ebuild:
+  Make it build with --as-needed. bug #149675
 
 *gnome-pilot-2.0.13-r1 (20 Jul 2006)
 
diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest
index 2b9a2d0476f6..03b9307dbcc8 100644
--- a/app-pda/gnome-pilot/Manifest
+++ b/app-pda/gnome-pilot/Manifest
@@ -37,6 +37,10 @@ AUX gnome-pilot-2.0.12-zire31.patch 474 RMD160 ed4957bf48e60c69f64b6b77050f466dd
 MD5 95d8bbe1bdf7dc712cc5d616a9a93995 files/gnome-pilot-2.0.12-zire31.patch 474
 RMD160 ed4957bf48e60c69f64b6b77050f466ddbf7dbea files/gnome-pilot-2.0.12-zire31.patch 474
 SHA256 26cb2b5b7e3645fb76ae06ee479f479ddff9a8a45f0a4359684d179c2733c7b3 files/gnome-pilot-2.0.12-zire31.patch 474
+AUX gnome-pilot-2.0.13-as-needed.patch 562 RMD160 3c13f16eb3ab77b378d714bf6d58f19bd8be78e9 SHA1 69ea4056c01f34fb0844bb7c1f25f2c44149596c SHA256 bbc4033c5db5b8f73bee18c51d8d8abc9773a61e7d68674debf2f1b7a210401a
+MD5 7dc631d3dd1e7a86d4e7fdb82d2a6852 files/gnome-pilot-2.0.13-as-needed.patch 562
+RMD160 3c13f16eb3ab77b378d714bf6d58f19bd8be78e9 files/gnome-pilot-2.0.13-as-needed.patch 562
+SHA256 bbc4033c5db5b8f73bee18c51d8d8abc9773a61e7d68674debf2f1b7a210401a files/gnome-pilot-2.0.13-as-needed.patch 562
 AUX gnome-pilot-gentoo.diff 4186 RMD160 b6d3b0400a6eaf4877406875faff47eb8fac1f14 SHA1 f5e34f202044aa3d22b4e1408ee4ef3976f00ac3 SHA256 3d3be44637149604a4574bc310926e38b19cedd345a5e2ad77a0fc034140472a
 MD5 f50c6d977f5c1c3729bb88a763356de4 files/gnome-pilot-gentoo.diff 4186
 RMD160 b6d3b0400a6eaf4877406875faff47eb8fac1f14 files/gnome-pilot-gentoo.diff 4186
@@ -67,18 +71,18 @@ EBUILD gnome-pilot-2.0.12.ebuild 985 RMD160 20a73fc27d450d623054f8f45d73a6618948
 MD5 0ee8aa20a23401b608d2ea073e19ceb3 gnome-pilot-2.0.12.ebuild 985
 RMD160 20a73fc27d450d623054f8f45d73a6618948da1c gnome-pilot-2.0.12.ebuild 985
 SHA256 58d63aebc5b90152d4264f23c94fadae5815e17acd19000d1b1d2a5046ff2472 gnome-pilot-2.0.12.ebuild 985
-EBUILD gnome-pilot-2.0.13-r1.ebuild 1054 RMD160 72be482dd805c107f4aeca54fbbafe5ecbc00290 SHA1 6b53f7e57ee75b1391c94bf3dcc3597aec983d29 SHA256 c3ca4fffaec734f96c260dff448e61256f7be6da9ad87930b2ef0c67e815e7b7
-MD5 be6dba22afa6de311a62a3f26185405e gnome-pilot-2.0.13-r1.ebuild 1054
-RMD160 72be482dd805c107f4aeca54fbbafe5ecbc00290 gnome-pilot-2.0.13-r1.ebuild 1054
-SHA256 c3ca4fffaec734f96c260dff448e61256f7be6da9ad87930b2ef0c67e815e7b7 gnome-pilot-2.0.13-r1.ebuild 1054
+EBUILD gnome-pilot-2.0.13-r1.ebuild 1098 RMD160 689edd7013d35cea1bb0e8d2b1b4a8e9a53c52d5 SHA1 6049a44be971d99e6f2b68b3cd8e78fb542725ce SHA256 b6366571940cacb827df503b5102a516d5e7e49513f53b03819b5fa2e2031d93
+MD5 67de768dfa9008fa380f14b6be1f6128 gnome-pilot-2.0.13-r1.ebuild 1098
+RMD160 689edd7013d35cea1bb0e8d2b1b4a8e9a53c52d5 gnome-pilot-2.0.13-r1.ebuild 1098
+SHA256 b6366571940cacb827df503b5102a516d5e7e49513f53b03819b5fa2e2031d93 gnome-pilot-2.0.13-r1.ebuild 1098
 EBUILD gnome-pilot-2.0.13.ebuild 960 RMD160 3e19b51c0a78c8313a41d14085f8a714c3f53871 SHA1 dd642a02c23932081c311d3e4214e57270fd7794 SHA256 3e5b78b6893d9292a7c57896e9abdd6d1369e566685cb2cd4c82133c83ccf3e5
 MD5 f1c2db78f02bdd258b44555825714186 gnome-pilot-2.0.13.ebuild 960
 RMD160 3e19b51c0a78c8313a41d14085f8a714c3f53871 gnome-pilot-2.0.13.ebuild 960
 SHA256 3e5b78b6893d9292a7c57896e9abdd6d1369e566685cb2cd4c82133c83ccf3e5 gnome-pilot-2.0.13.ebuild 960
-MISC ChangeLog 7593 RMD160 ed185109237eb1f73f13688d3e589171e948c875 SHA1 0db8e546f9a4bb5aef6f746a0cf6acfadeaa2a33 SHA256 e3eb604c717483b261f7775e156cbbedb190a5a67fe63292e346eab2f156a5d0
-MD5 c9187795c838b8482bebcdddfdfb4e7c ChangeLog 7593
-RMD160 ed185109237eb1f73f13688d3e589171e948c875 ChangeLog 7593
-SHA256 e3eb604c717483b261f7775e156cbbedb190a5a67fe63292e346eab2f156a5d0 ChangeLog 7593
+MISC ChangeLog 7763 RMD160 b3acc34f5ac4f8153cf298bf97d7a74b378b7a69 SHA1 9619cac9fe0157ad35e18b9a626d44d81f3a8123 SHA256 2a363ac76eb3f489d9e4bf7ab9eebb96cf1a88bd744324981deba34cb59c7ba0
+MD5 ce835b40f7cd33c7255b204eff0a445c ChangeLog 7763
+RMD160 b3acc34f5ac4f8153cf298bf97d7a74b378b7a69 ChangeLog 7763
+SHA256 2a363ac76eb3f489d9e4bf7ab9eebb96cf1a88bd744324981deba34cb59c7ba0 ChangeLog 7763
 MISC metadata.xml 175 RMD160 5a758a9c6be5886bcabe17412a27ddb9c4c1a091 SHA1 5f39f2aee5dc458e1f1184425ff00a600cfbeb93 SHA256 ad69c13297c0e440519a25f99fdcefd579e75f58d652bb174055ae0c827b8543
 MD5 1e1031eae2f36a13b2cd73550a31d03d metadata.xml 175
 RMD160 5a758a9c6be5886bcabe17412a27ddb9c4c1a091 metadata.xml 175
@@ -105,9 +109,9 @@ MD5 96ebc38a63ba1b47c78261000925f2ac files/digest-gnome-pilot-2.0.13-r1 298
 RMD160 2e928580dc8eeae0d2fa1d3e5a716ec8c5231e36 files/digest-gnome-pilot-2.0.13-r1 298
 SHA256 0fcf2f47bb0899b255e02da5eda21a86f30df7382edfd7a7e6d36f8f765801ca files/digest-gnome-pilot-2.0.13-r1 298
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFEv1ykuB6ZT1m7QRERAshHAJ0ZbFsaBBgaII8ljlaNWmjiS4mbLwCfbvYC
-6GcgllwUOIQQwju7WEWHOV0=
-=anOb
+iD8DBQFFJnCNomPajV0RnrERAoXUAJ9/Mw1SJjBcdJqqe+w964+v0byyoACdExeG
+8gQ1EZQFmGX9KQ9khouWI1g=
+=TdrG
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gnome-pilot/files/gnome-pilot-2.0.13-as-needed.patch b/app-pda/gnome-pilot/files/gnome-pilot-2.0.13-as-needed.patch
new file mode 100644
index 000000000000..50ab7504db91
--- /dev/null
+++ b/app-pda/gnome-pilot/files/gnome-pilot-2.0.13-as-needed.patch
@@ -0,0 +1,13 @@
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-pilot-2.0.13.orig/gpilotd/Makefile.am gnome-pilot-2.0.13/gpilotd/Makefile.am
+--- gnome-pilot-2.0.13.orig/gpilotd/Makefile.am	2005-12-03 14:09:50.000000000 -0500
++++ gnome-pilot-2.0.13/gpilotd/Makefile.am	2006-10-06 10:40:05.000000000 -0400
+@@ -142,6 +142,9 @@
+ libgpilotdconduit_la_LDFLAGS = \
+ 	-version-info $(GPILOTD_CONDUIT_CURRENT):$(GPILOTD_CONDUIT_REVISION):$(GPILOTD_CONDUIT_AGE)
+ 
++libgpilotdconduit_la_LIBADD = \
++	$(GNOME_PILOT_LIBS)
++
+ ###
+ 
+ noinst_HEADERS = gnome-pilot-conduit-backup-private.h
diff --git a/app-pda/gnome-pilot/gnome-pilot-2.0.13-r1.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.0.13-r1.ebuild
index df7e68a7d6d8..1487e773998a 100644
--- a/app-pda/gnome-pilot/gnome-pilot-2.0.13-r1.ebuild
+++ b/app-pda/gnome-pilot/gnome-pilot-2.0.13-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.13-r1.ebuild,v 1.1 2006/07/20 10:35:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.0.13-r1.ebuild,v 1.2 2006/10/06 15:04:40 dang Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 DESCRIPTION="Gnome Palm Pilot and Palm OS Device Syncing Library"
 HOMEPAGE="http://live.gnome.org/GnomePilot"
@@ -32,7 +32,9 @@ DOCS="AUTHORS COPYING* ChangeLog README NEWS"
 SCROLLKEEPER_UPDATE="0"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	gnome2_omf_fix
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	eautoreconf
 }