Fix build after resolving --as-needed. bug #257455

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

4 files changed, 23 insertions, 13 deletions

diff --git a/dev-games/guichan/ChangeLog b/dev-games/guichan/ChangeLog
index 0ce6eb771cf0..e1716f2f03c0 100644
--- a/dev-games/guichan/ChangeLog
+++ b/dev-games/guichan/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/guichan
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/ChangeLog,v 1.16 2009/02/03 03:56:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/ChangeLog,v 1.17 2009/02/03 15:54:43 tupone Exp $
+
+  03 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  files/guichan-0.8.1-as-needed.patch, guichan-0.8.1.ebuild:
+  Fix build after resolving --as-needed. bug #257455 by franzec05@gmail.com
 
   03 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> guichan-0.8.1.ebuild:
   Commented out the patch until the as-needed stuff is fixed (bug #257455)
diff --git a/dev-games/guichan/Manifest b/dev-games/guichan/Manifest
index 6f09ae7ad0bf..973a28b4bc68 100644
--- a/dev-games/guichan/Manifest
+++ b/dev-games/guichan/Manifest
@@ -1,5 +1,5 @@
-AUX guichan-0.8.1-as-needed.patch 512 RMD160 8bdf452e7b78342031facc0ea97772e49f5649da SHA1 c572d6b775fc106aaa72c41b28fe31828be507f8 SHA256 0de58015e1077662116fd89a1fe577f58f50bda7efce11f2f44464938b9016b1
+AUX guichan-0.8.1-as-needed.patch 701 RMD160 0bcc074d4c9eb7c257c3c9966d4649d463cc85da SHA1 5555be3185e755a4ad33b9cee66c80655ff6eccb SHA256 53c62d9e7ce7782154675d57170d4630bc83bfa6d5f66a4fe073b597b61ad2e4
 DIST guichan-0.8.1.tar.gz 556670 RMD160 4a8238e0cf38057a1b8cedb2e7da62a5e8849d18 SHA1 7ab44c3b1b0f0577bc5e8a44b918f61cb66164c3 SHA256 6a48754f16ecb6f4da7c40bfff469f75b62127acc108b7f513d9bd85192b77d4
-EBUILD guichan-0.8.1.ebuild 1084 RMD160 816abdfb9d6d310ba622857f720e6cadb8a28dc7 SHA1 5e6bee76625524b0ad1475072a093df49d773a23 SHA256 a98a2801801c4e0630a248793497e257bc39927988c367e18f4a14a82d04ea85
-MISC ChangeLog 2362 RMD160 d5bc551cbbc90e94de04e08bc009faf995170f2b SHA1 741fc234a85f19f1c19b135ada4f7ef2e02ffd0e SHA256 a4039c695b291105ff2843334496268cc2c8335e4b1492a5a5dfab3bed974814
+EBUILD guichan-0.8.1.ebuild 1012 RMD160 18a68a9cb2debe9870e813eb448c18d1720bf476 SHA1 ddd2beae7ff8246a38baf23b05c0dab23767f245 SHA256 ae4c428b4bb9b32f3d323d5843338f9fd66c1ccc6b71651cceb7f4729ba86d42
+MISC ChangeLog 2547 RMD160 a265255beb12d03e606b534d184fe675a6df0fd9 SHA1 db57c1dfd94126a9fa397753987511e4f7ffedd1 SHA256 249c3fa35549ef687856da6edd314feb5d524e659becb9a0def8712c1276ea30
 MISC metadata.xml 236 RMD160 883c6c7498e3248887a2ab25ade7db50544de6fe SHA1 0c5fe13fc5a85e0be007822fb1518a2eb0168887 SHA256 1b237224dc164d33a8ad46d480edcc72673b11274313cf167cb5acb50749a1f8
diff --git a/dev-games/guichan/files/guichan-0.8.1-as-needed.patch b/dev-games/guichan/files/guichan-0.8.1-as-needed.patch
index 24f1c993bb96..a61d4b1bc7de 100644
--- a/dev-games/guichan/files/guichan-0.8.1-as-needed.patch
+++ b/dev-games/guichan/files/guichan-0.8.1-as-needed.patch
@@ -1,6 +1,5 @@
-diff -ru guichan-0.8.1.orig/src/sdl/Makefile.am guichan-0.8.1/src/sdl/Makefile.am
---- guichan-0.8.1.orig/src/sdl/Makefile.am	2008-04-12 07:57:57.000000000 -0400
-+++ guichan-0.8.1/src/sdl/Makefile.am	2009-01-28 08:53:53.000000000 -0500
+--- src/sdl/Makefile.am.old	2008-04-12 07:57:57.000000000 -0400
++++ src/sdl/Makefile.am	2009-01-28 08:53:53.000000000 -0500
 @@ -6,6 +6,8 @@
  
  libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
@@ -10,3 +9,11 @@ diff -ru guichan-0.8.1.orig/src/sdl/Makefile.am guichan-0.8.1/src/sdl/Makefile.a
  libguichan_sdl_la_SOURCES =	\
  	sdl.cpp			\
  	sdlgraphics.cpp		\
+--- src/Makefile.am.old 2009-02-03 16:41:09.000000000 +0100
++++ src/Makefile.am     2009-02-03 16:41:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib
++SUBDIRS = widgets . @GUICHAN_EXTRADIRS@ hge openlayer contrib
+ 
+ INCLUDES = -I$(top_srcdir)/include
+ 
diff --git a/dev-games/guichan/guichan-0.8.1.ebuild b/dev-games/guichan/guichan-0.8.1.ebuild
index 4ab749cbcdb8..48f755ebd964 100644
--- a/dev-games/guichan/guichan-0.8.1.ebuild
+++ b/dev-games/guichan/guichan-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/guichan-0.8.1.ebuild,v 1.4 2009/02/03 03:56:27 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/guichan/guichan-0.8.1.ebuild,v 1.5 2009/02/03 15:54:43 tupone Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -21,11 +21,10 @@ DEPEND="allegro? ( media-libs/allegro )
 		media-libs/sdl-image
 	)"
 
-# Commented out until the as-needed stuff is fixed (bug #257455)
-#src_prepare() {
-	#epatch "${FILESDIR}"/${P}-as-needed.patch
-	#eautoreconf
-#}
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
 
 src_configure() {
 	econf \