Fix --as-needed bug #247303

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64

4 files changed, 26 insertions, 10 deletions

diff --git a/media-libs/paragui/ChangeLog b/media-libs/paragui/ChangeLog
index 6e181f08c66a..35c1a3b11cdd 100644
--- a/media-libs/paragui/ChangeLog
+++ b/media-libs/paragui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/paragui
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/ChangeLog,v 1.30 2008/06/29 09:39:05 loki_val Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/ChangeLog,v 1.31 2009/02/02 11:16:46 tupone Exp $
+
+  02 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/paragui-1.0.4-as-needed.patch, paragui-1.0.4.ebuild:
+  Fix --as-needed bug #247303 by flameeyes@gentoo.org
 
   29 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
   +files/paragui-1.1.8-gcc43.patch, paragui-1.1.8.ebuild:
diff --git a/media-libs/paragui/Manifest b/media-libs/paragui/Manifest
index 722a5f74266d..b0af29ea373b 100644
--- a/media-libs/paragui/Manifest
+++ b/media-libs/paragui/Manifest
@@ -1,11 +1,12 @@
+AUX paragui-1.0.4-as-needed.patch 717 RMD160 fce8966f1daa99f3db13fc8778a8f9d32c745101 SHA1 3c9ab11a458147208b133304ae704fc4aa0c2e40 SHA256 ed2fc9ff09cd8e13e2b98a1408db86d344bf8caff21092f0159ab51e09be9e2c
 AUX paragui-1.1.8-asneeded.patch 1137 RMD160 291c3ea223fc11a3b6eef92bd1189767042819d6 SHA1 dcb99b86777d4dc05155cdf0228675a3d7e7761c SHA256 82b74dbec2b95a5a6eece5f72f40d4418ab4a8d823dac24ea709667fb65d96da
 AUX paragui-1.1.8-gcc43.patch 752 RMD160 93bee9a1c3d4bca2fae16d9604c0b4170b1628a6 SHA1 caa2c2e98e919cda1d742c3443c7fa80f781e593 SHA256 77f36c50fbe15f7980fd5463556de474f1d04446e0261f7db2c890f59d9b98ce
 AUX paragui-1.1.8-header.patch 297 RMD160 4a940c2952d993f736efdeb302d7f5433587e454 SHA1 a41213175c3be7f910369a48434870a3374763ca SHA256 258f0e3869b5bbaf8f3ed7f0c74e44521dd41217ab5c399c5c0e1bd3c17f6379
 DIST paragui-1.0.4.tar.gz 1089511 RMD160 c6352dfe99344bf2dc604784ac8ef0a80dbcb5ad SHA1 3e412618b77499bf08a3eb478fec38f0a35ce86f SHA256 b67d9b6f2fd11b8b117566c8c0c8d99f948b1db4e2399a9d407f14085bebb49c
 DIST paragui-1.1.7.tar.gz 1821914 RMD160 f20a3a78e92add0eb5bbe04aae4491784f57d7f0 SHA1 82c1f19c7f9d4ab07683a9eb29353e5846b93da5 SHA256 bb853f17d52cf2152c1f228f979375247d85adc938878d87ad02df3b86eef09b
 DIST paragui-1.1.8.tar.gz 1867075 RMD160 3cd7b16abe0ad5afe2cbec1a7d3fc9a9fe12610d SHA1 ebc0072c927c6edcbc30eb29a8af4f678a2568f6 SHA256 5a6663d3be6819bce8a8ca0bf8a0d33c7508e28d8e9f220649cef19e9d5260c3
-EBUILD paragui-1.0.4.ebuild 786 RMD160 44465f7c245b28b88c9b18827d70c842658124a2 SHA1 7048fe2e808da87500bad234364d619d4016ecd9 SHA256 4adbcd4862bca4d628cf3c2ba034fa8c856469fe108b356453376a6a008e5730
+EBUILD paragui-1.0.4.ebuild 810 RMD160 831c90ed331b4bc0889024c6c66c35d0aea288c2 SHA1 169be45030fadff98aba425974a2511e3c80fb74 SHA256 0c2a99c8f90b515caef587ad592baec80529bcdc60e3f8da4466c175b0f6953f
 EBUILD paragui-1.1.7.ebuild 917 RMD160 45f2901fbabb89e9bba6f4390bafd936b005cf4c SHA1 895eaf0f507d3dabe58b4519e8f09e0461762f67 SHA256 30ebd43e61dea3e0c576a2dcc8cc371d889773cdd7517ac5cdfb18812cf87bdc
 EBUILD paragui-1.1.8.ebuild 1053 RMD160 80048de34b06ec6f0a6481f3f8d4f6b157ee7c06 SHA1 d03defbf7dccb2d2780971d4b912302878ed5a71 SHA256 57ad1dcc459fbc02523b88c8b5b72cf5bef6960054d806b784669cee23632e06
-MISC ChangeLog 4234 RMD160 4352df669ab49bf51e94ea89e23f27054f174f8c SHA1 da6d0400bbca16ce63d3df76eb89667d5a0f846f SHA256 db70eadd95ad1dd9e3ef6e4d0eb74759a08552ff7f80ac65fe1b7a32a3c68549
+MISC ChangeLog 4399 RMD160 7807ce18683db7047e0818f168e10f1285988f85 SHA1 7827715d39230df19c17557cda92e943aaf9e514 SHA256 45b986bc9f2cf30c7bd52cc72c8af39294b4c912ac2c601312f2fb5a6679a753
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/media-libs/paragui/files/paragui-1.0.4-as-needed.patch b/media-libs/paragui/files/paragui-1.0.4-as-needed.patch
new file mode 100644
index 000000000000..a9930591ca0c
--- /dev/null
+++ b/media-libs/paragui/files/paragui-1.0.4-as-needed.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.in.old	2009-02-02 12:01:36.000000000 +0100
++++ src/Makefile.in	2009-02-02 12:02:56.000000000 +0100
+@@ -129,7 +129,7 @@
+ libparagui_la_LDFLAGS =  	-release $(LT_RELEASE) 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+-libparagui_la_LIBADD =  	$(SDL_LIBS) 	$(IMAGE_LIBS) 	$(EXPAT_LIB) 	$(PHYSFS_LIB) 	./draw/libpgdraw.la 	./font/libpgfont.la 	./core/libpgcore.la 	./widgets/libpgwidgets.la 	./themes/libtheme.la 	$(LIBSTDCPP)
++libparagui_la_LIBADD = $(SDL_LIBS) $(IMAGE_LIBS) $(EXPAT_LIB) $(PHYSFS_LIB) -lfreetype ./draw/libpgdraw.la ./font/libpgfont.la ./core/libpgcore.la ./widgets/libpgwidgets.la ./themes/libtheme.la $(LIBSTDCPP)
+ 
+ 
+ INCLUDES =  	$(SDL_CFLAGS) 	-I$(top_srcdir)/include
diff --git a/media-libs/paragui/paragui-1.0.4.ebuild b/media-libs/paragui/paragui-1.0.4.ebuild
index c874b05830a9..a62053ee4eee 100644
--- a/media-libs/paragui/paragui-1.0.4.ebuild
+++ b/media-libs/paragui/paragui-1.0.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/paragui-1.0.4.ebuild,v 1.9 2007/11/11 21:54:42 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/paragui/paragui-1.0.4.ebuild,v 1.10 2009/02/02 11:16:46 tupone Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="A cross-platform high-level application framework and GUI library"
@@ -18,10 +19,9 @@ DEPEND=">=media-libs/libsdl-1.2.4
 	dev-libs/expat
 	dev-games/physfs"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.1.8-header.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1.8-header.patch \
+		"${FILESDIR}"/${P}-as-needed.patch
 }
 
 src_install() {