Fix --as-needed bug #247338

(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64)

5 files changed, 63 insertions, 18 deletions

diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index 2fa7eeeda933..99129e075134 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/eboard
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.20 2008/02/29 19:01:07 carlo Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.21 2009/02/03 14:22:15 tupone Exp $
+
+  03 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/eboard-1.0.3-as-needed.patch, +files/eboard-1.1.1-as-needed.patch,
+  eboard-1.0.3.ebuild, eboard-1.1.1.ebuild:
+  Fix --as-needed bug #247338 by flameeyes@gentoo.org
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> eboard-1.0.3.ebuild,
   eboard-1.0.4.ebuild:
diff --git a/games-board/eboard/eboard-1.0.3.ebuild b/games-board/eboard/eboard-1.0.3.ebuild
index 40d3ceb2321c..e52d205231a8 100644
--- a/games-board/eboard/eboard-1.0.3.ebuild
+++ b/games-board/eboard/eboard-1.0.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.0.3.ebuild,v 1.4 2008/02/29 19:01:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.0.3.ebuild,v 1.5 2009/02/03 14:22:15 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 EXTRAS1="eboard-extras-1pl2"
@@ -25,24 +26,21 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i \
 		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
 		configure \
 		|| die "sed configure failed"
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
-src_compile() {
+src_configure() {
 	# not an autoconf script
 	./configure \
 		--prefix="${GAMES_PREFIX}" \
 		--data-prefix="${GAMES_DATADIR}" \
 		--man-prefix="/usr/share/man" \
 		$(use_enable nls) || die
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/games-board/eboard/eboard-1.1.1.ebuild b/games-board/eboard/eboard-1.1.1.ebuild
index a3dd749f12de..ed57ea20242b 100644
--- a/games-board/eboard/eboard-1.1.1.ebuild
+++ b/games-board/eboard/eboard-1.1.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.2 2008/03/21 16:32:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-1.1.1.ebuild,v 1.3 2009/02/03 14:22:15 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 EXTRAS1="eboard-extras-1pl2"
@@ -25,24 +26,21 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	sed -i \
 		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
 		configure \
 		|| die "sed configure failed"
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 }
 
-src_compile() {
+src_configure() {
 	# not an autoconf script
 	./configure \
 		--prefix="${GAMES_PREFIX}" \
 		--data-prefix="${GAMES_DATADIR}" \
 		--man-prefix="/usr/share/man" \
 		$(use_enable nls) || die
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/games-board/eboard/files/eboard-1.0.3-as-needed.patch b/games-board/eboard/files/eboard-1.0.3-as-needed.patch
new file mode 100644
index 000000000000..b4ec397ba967
--- /dev/null
+++ b/games-board/eboard/files/eboard-1.0.3-as-needed.patch
@@ -0,0 +1,22 @@
+--- configure.old	2009-02-03 14:46:21.000000000 +0100
++++ configure	2009-02-03 14:48:13.000000000 +0100
+@@ -638,7 +638,7 @@
+ 
+ print CONFIGMAKE "CXX       = $cxx\n";
+ print CONFIGMAKE "CXXFLAGS  = @cxxflags\n";
+-print CONFIGMAKE "LDFLAGS   = @ldflags\n";
++print CONFIGMAKE "LDLIBS    = @ldflags\n";
+ 
+ print CONFIGMAKE "prefix    = \${DESTDIR}$prefix\n";
+ print CONFIGMAKE "bindir    = \${DESTDIR}$prefix/bin\n";
+--- elifekam.old	2009-02-03 14:48:43.000000000 +0100
++++ elifekam	2009-02-03 14:48:58.000000000 +0100
+@@ -24,7 +24,7 @@
+ all: eboard nls-dicts
+ 
+ eboard: $(OBJS)
+-	$(CXX) $(LDFLAGS) -o eboard $(OBJS)
++	$(CXX) $(LDFLAGS) -o eboard $(OBJS) $(LDLIBS)
+ 
+ .cc.o: $< $(HEADERS) $(XPMS)
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@
diff --git a/games-board/eboard/files/eboard-1.1.1-as-needed.patch b/games-board/eboard/files/eboard-1.1.1-as-needed.patch
new file mode 100644
index 000000000000..b4ec397ba967
--- /dev/null
+++ b/games-board/eboard/files/eboard-1.1.1-as-needed.patch
@@ -0,0 +1,22 @@
+--- configure.old	2009-02-03 14:46:21.000000000 +0100
++++ configure	2009-02-03 14:48:13.000000000 +0100
+@@ -638,7 +638,7 @@
+ 
+ print CONFIGMAKE "CXX       = $cxx\n";
+ print CONFIGMAKE "CXXFLAGS  = @cxxflags\n";
+-print CONFIGMAKE "LDFLAGS   = @ldflags\n";
++print CONFIGMAKE "LDLIBS    = @ldflags\n";
+ 
+ print CONFIGMAKE "prefix    = \${DESTDIR}$prefix\n";
+ print CONFIGMAKE "bindir    = \${DESTDIR}$prefix/bin\n";
+--- elifekam.old	2009-02-03 14:48:43.000000000 +0100
++++ elifekam	2009-02-03 14:48:58.000000000 +0100
+@@ -24,7 +24,7 @@
+ all: eboard nls-dicts
+ 
+ eboard: $(OBJS)
+-	$(CXX) $(LDFLAGS) -o eboard $(OBJS)
++	$(CXX) $(LDFLAGS) -o eboard $(OBJS) $(LDLIBS)
+ 
+ .cc.o: $< $(HEADERS) $(XPMS)
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@