Fix building with -Wl,--as-needed wrt #320349 by Kacper Kowalik.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 31 insertions, 5 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index b6c91568d085..5f01aa55e816 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/balsa
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.101 2010/06/29 02:02:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.102 2010/06/29 16:04:45 ssuominen Exp $
+
+  29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> balsa-2.4.7.ebuild,
+  +files/balsa-2.4.7-asneeded.patch:
+  Fix building with -Wl,--as-needed wrt #320349 by Kacper Kowalik.
 
   29 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org> -balsa-2.4.2.ebuild:
   Remove old version, also fails with --as-needed in LDFLAGS
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index dcb619cd1e9e..9b41061506a7 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,8 +1,9 @@
 AUX balsa-2.4.1-vcard.patch 581 RMD160 9efe72c102d8746c1f53ebde04b52b9dd6497775 SHA1 3e75bfebd6110bb85bdc2f2d7a93550feb2a1877 SHA256 c3c8ed63deb660b3f8cafbcc996f369fc2e1f766060e3ba9801865e616188ba9
+AUX balsa-2.4.7-asneeded.patch 216 RMD160 22b35d2ef74038e19a28fe816bffe86e6871c180 SHA1 98f7db14052e543539948574287d1f0a8b581092 SHA256 f7a75bdf30b3c828e8e012fab33c645073687d56efaca66ce599441d686e1d05
 AUX balsa-2.4.7-build-failure-notify.patch 946 RMD160 756119e9f4f7f0877b3b43a1778a7b4cb9b0a7ce SHA1 14e6ee41935c282900aee89010f38d8ef530aa7c SHA256 a40003889650f4d91e75cc44376f47c40a53a78b72f18825fdb646a4fedc1873
 DIST balsa-2.4.1.tar.bz2 3057983 RMD160 846905d9754fb5c4d3438c81078e79d61989cc99 SHA1 fc8a0ee154b22505607a82c886ccb074c28ac499 SHA256 06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
 DIST balsa-2.4.7.tar.bz2 2926482 RMD160 4679e66423387fe16f6e3192aa61f60740c9a18a SHA1 def4bd033c0f0bfbfb8f1b2a748cabe420e57038 SHA256 581326a68a52f8344c900ca47d862536821bc5864c38b09cb6c333722a212952
 EBUILD balsa-2.4.1-r1.ebuild 2559 RMD160 a83ff8142f91f79e1ca9a4a468002f02fe209bb4 SHA1 20fdfa335d74a3dde99240b67fd5c73e67d2ffe0 SHA256 282b428fc1b91f5e6cf67f5cb569c67b99a5d446319e7c8e01eb550b0878ff39
-EBUILD balsa-2.4.7.ebuild 2842 RMD160 3fe90983c785aad4b8bc640b90438850b17a0430 SHA1 bd5921c89ed417b89ed9b6919deecfb99d1b8797 SHA256 ef98ae1c1432aabc2085cd5d5e0299e56612315b5c0a7aafedaabd3d741f106d
-MISC ChangeLog 23627 RMD160 8dd7026727b516a08dedcd0347f22374257ffa63 SHA1 3c263904740b3a3458fd0470bd63803b7f08a4ea SHA256 11e2b4ca907b61369ceab6db6cd2833854400ead57885c9c9929bc3336cc8cb2
+EBUILD balsa-2.4.7.ebuild 2988 RMD160 35f541efec84db25608a82b6603e281eab93bd3c SHA1 a543da2d4e9b4edb667fa2d79f58d06941166410 SHA256 31e5f68dfabfc24e86343748c042f8469140cb943828466ed79f11458ea6dcda
+MISC ChangeLog 23807 RMD160 8a5964a2c07baecb47e8edd7b2e882cf728481ea SHA1 56e1018c3435bc2bc46665778bfdef76d89470e8 SHA256 1f3917d5549b7babd2f4acfb6e6cc86dd200bab7727dc847ffcd694769363038
 MISC metadata.xml 458 RMD160 75720f401492866e5d0c5659c53779856f6a47e9 SHA1 c678d1933c2161e59e783520548d7c69bb505049 SHA256 fe906fdde4dd35e9815a37479abbec9a15bd2854bbaa7bc648645ed3c73663ef
diff --git a/mail-client/balsa/balsa-2.4.7.ebuild b/mail-client/balsa/balsa-2.4.7.ebuild
index 4e36c89c219e..28f65968cf66 100644
--- a/mail-client/balsa/balsa-2.4.7.ebuild
+++ b/mail-client/balsa/balsa-2.4.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.7.ebuild,v 1.6 2010/06/26 16:51:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.4.7.ebuild,v 1.7 2010/06/29 16:04:45 ssuominen Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Email client for GNOME"
 HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
@@ -55,6 +55,7 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=app-text/scrollkeeper-0.1.4
 	app-text/gnome-doc-utils
+	dev-util/gtk-doc-am
 	doc? ( dev-util/gtk-doc )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
@@ -104,4 +105,10 @@ src_prepare() {
 
 	# Fix build failure with USE="-libnotify", bug #314123
 	epatch "${FILESDIR}/${P}-build-failure-notify.patch"
+
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	mkdir m4
+	intltoolize --force --copy --automake || die
+	eautoreconf
 }
diff --git a/mail-client/balsa/files/balsa-2.4.7-asneeded.patch b/mail-client/balsa/files/balsa-2.4.7-asneeded.patch
new file mode 100644
index 000000000000..66e0baf863ef
--- /dev/null
+++ b/mail-client/balsa/files/balsa-2.4.7-asneeded.patch
@@ -0,0 +1,14 @@
+Fixing as-needed issues
+
+http://bugs.gentoo.org/show_bug.cgi?id=320349
+
+--- configure.in
++++ configure.in
+@@ -306,6 +306,7 @@
+ gtk+-2.0 >= 2.14.0
+ gmime-2.4
+ gio-2.0
++gthread-2.0
+ gnome-icon-theme
+ $gnome_extras
+ ])