Respect LDFLAGS. Bug #335142

Package-Manager: portage-2.1.9.14/cvs/Linux i686

4 files changed, 32 insertions, 12 deletions

diff --git a/games-puzzle/magiccube4d/ChangeLog b/games-puzzle/magiccube4d/ChangeLog
index 0bb41537962c..e631c29bfdac 100644
--- a/games-puzzle/magiccube4d/ChangeLog
+++ b/games-puzzle/magiccube4d/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/magiccube4d
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/ChangeLog,v 1.10 2007/10/22 20:30:05 angelos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/ChangeLog,v 1.11 2010/10/15 08:53:26 tupone Exp $
+
+  15 Oct 2010; Tupone Alfredo <tupone@gentoo.org> magiccube4d-2.2.ebuild,
+  +files/magiccube4d-2.2-ldflags.patch:
+  Respect LDFLAGS. Bug #335142 by flameeyes@gentoo.org
 
   22 Oct 2007; Christoph Mende <angelos@gentoo.org>
   +files/magiccube4d-2.2-64bit-ptr.patch, magiccube4d-2.2.ebuild:
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
index 17265c3885a4..2b65818e84dd 100644
--- a/games-puzzle/magiccube4d/Manifest
+++ b/games-puzzle/magiccube4d/Manifest
@@ -1,7 +1,8 @@
 AUX magiccube4d-2.2-64bit-ptr.patch 1406 RMD160 41f0509ed945c3778e21081c0d184f4c230d1c2f SHA1 3671c92fb3e8c070d013d8a3bf900cdd731de6ed SHA256 05465f556602569b1e32360ffc74439bfeb4f060e4a2be9351a7ffbdfdd7623d
 AUX magiccube4d-2.2-gcc41.patch 877 RMD160 d7465f4766d60c1ba848a3bbaaf43eff992278fc SHA1 653bafd8ec124b1ffed87f1ec8def5156755aec5 SHA256 b69cc3f95795e5c7c6885bf69ffa384695fe001270e6bb3837ec39568e0c9d1a
+AUX magiccube4d-2.2-ldflags.patch 497 RMD160 3239b90e83439fce62a3e66ae33787482636dafa SHA1 13172d5a00b9ed29bf749ecb8d3f5e32ad3bbaa5 SHA256 8dd2cb5db7b8ff9156f72bfba490474cea980b45df5ebb203b481bb114da0545
 AUX magiccube4d-EventHandler.patch 425 RMD160 7def7090510bb0ff21bddfc1c392ba9629bd933d SHA1 638e816767be628ce78de04609f26228fac60f53 SHA256 6bfdc4a34d560624da46f437f66f857c259dc8cf945feb0d989f4fc3a145a98b
 DIST mc4d-src-2_2.tgz 144645 RMD160 c7bfabceb64c0c0515e94f01bcd528bd550f9b3e SHA1 dbf87d91c49f4d9d12ae814276af280c46162864 SHA256 79c7b62bbe7a132a2eacf58f92f80113ea63171d3eea59755bc828a1aa9daa44
-EBUILD magiccube4d-2.2.ebuild 1030 RMD160 f228d3ec1f9b7e49a5136d22f6ec46f2ef765a9c SHA1 5f3daefd41c06fd7b1b565c95ba8d4e6c20d8efa SHA256 4510dfdfbfd3469a0899690d4159476a9aa2ad3e26fc00ce95c40065b1f8b61c
-MISC ChangeLog 1183 RMD160 bf9d9047024d4bfb44d596bc73a1e64480cc1fe8 SHA1 a049435a6c0fdaf87f2c509fb06d2928748b3e2a SHA256 dbbb34f7682c721043f2008263935fef3978f5a27898c0e00df37d852af8db40
+EBUILD magiccube4d-2.2.ebuild 1052 RMD160 8679ed86401542f33d540726a1c3aaa83661fdca SHA1 d820b9325b6d21bf95770e096224fa6e3eb6e150 SHA256 3bc6beaa75993af1371a1535e25eaa697c2335e2574b632ffb4366db9289dc68
+MISC ChangeLog 1352 RMD160 e4247231b1b50a6136990ed1a501156a10988e96 SHA1 013fe83317f5171465884f8856e0614d23531260 SHA256 ee16bc3312610c6c9c0b8644dde5f8cd78aeaeaff8131da478fcf84929b93dad
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
new file mode 100644
index 000000000000..446eb0cc91ae
--- /dev/null
+++ b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
@@ -0,0 +1,15 @@
+--- Makefile.in.old	2010-10-15 10:38:48.000000000 +0200
++++ Makefile.in	2010-10-15 10:39:07.000000000 +0200
+@@ -72,10 +72,10 @@
+ 	$(CXX) -c $(CXXFLAGS) $<
+ 
+ $(TARGET): $(OBJS)
+-	$(CXX) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
++	$(CXX) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
+ 
+ $(TARGET).static: $(OBJS)
+-	$(CXX) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
++	$(CXX) $(LDFLAGS) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
+ 
+ Vec.h: vec_h.c
+ 	$(CC) -o vec_h vec_h.c
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
index 275ce721cd26..b77923cf9947 100644
--- a/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
+++ b/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.12 2007/12/12 02:11:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/magiccube4d/magiccube4d-2.2.ebuild,v 1.13 2010/10/15 08:53:26 tupone Exp $
+EAPI="2"
 
 inherit eutils games
 
@@ -14,16 +15,16 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="x11-libs/libXaw"
+RDEPEND="x11-libs/libXaw"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-src-${MY_PV}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-EventHandler.patch \
 		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-64bit-ptr.patch
+		"${FILESDIR}/${P}"-64bit-ptr.patch \
+		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
 		-e "s:-Werror::" \
 		configure \
@@ -31,7 +32,6 @@ src_unpack() {
 }
 
 src_compile() {
-	egamesconf || die
 	emake DFLAGS="${CFLAGS}" || die "emake failed"
 }