Fix --as-needed bug #247443

Use package name in distfiles
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 x86_64

4 files changed, 31 insertions, 15 deletions

diff --git a/games-puzzle/krystaldrop/ChangeLog b/games-puzzle/krystaldrop/ChangeLog
index 8619730319ab..575280d8bf38 100644
--- a/games-puzzle/krystaldrop/ChangeLog
+++ b/games-puzzle/krystaldrop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/krystaldrop
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.8 2008/07/31 04:21:55 mr_bones_ Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.9 2009/02/10 10:29:56 tupone Exp $
+
+  10 Feb 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/krystaldrop-0.7.2-as-needed.patch, krystaldrop-0.7.2.ebuild:
+  Fix --as-needed bug #247443 by flameeyes@gentoo.org
+  Use package name in distfiles
 
   31 Jul 2008; Michael Sterrett <mr_bones_@gentoo.org>
   +files/krystaldrop-0.7.2-gcc43.patch, krystaldrop-0.7.2.ebuild:
diff --git a/games-puzzle/krystaldrop/Manifest b/games-puzzle/krystaldrop/Manifest
index a531e91b8cf4..78fbdbeb8ee9 100644
--- a/games-puzzle/krystaldrop/Manifest
+++ b/games-puzzle/krystaldrop/Manifest
@@ -1,9 +1,10 @@
+AUX krystaldrop-0.7.2-as-needed.patch 358 RMD160 5f0e7e767ecc3603cb6e89d15df2d66100e53037 SHA1 a9c45dd52ca6087d3c1a1d4767310c6b76b4e547 SHA256 354a40c47651832be46e28b7e939f7bbabe8e3ed91ee0f142571976cf0ab59bd
 AUX krystaldrop-0.7.2-deps.patch 1152 RMD160 48eac8807d977daddbc40a57eeec407950d10d13 SHA1 72d0ce25b1c1bfdca0ba7170f7a274a2162334cd SHA256 bc8121c186af89aa1116d0eed5b5743c91a691434965f4128b2e9ac4ade2ea84
 AUX krystaldrop-0.7.2-gcc41.patch 2677 RMD160 552e9d91f6b78dd35c4f849261f8d31f9cf4ea25 SHA1 269b03d4504d96b0da604f355668e328b75b3463 SHA256 413d56f90d196ecfdc7ec3210b78ee54cd7348cf451e23c519ffcd2e3913a70a
 AUX krystaldrop-0.7.2-gcc43.patch 3396 RMD160 2f145173a2dd5d26dbb5d00c30529a048f21943f SHA1 b53a317e072f607c8cb3110189aee18f6f22df3b SHA256 37e14f887e34628d6675f060423c46cd54855f5623a4de0c8c9458fc841104cf
 AUX krystaldrop-assert.patch 417 RMD160 3d1b1461baad3c9c0597fe967791a9e170d3e618 SHA1 4d4688eb5622c6d3d2c973dc98640ab49c18d5aa SHA256 ac4a526be3335f7aab6fd00f0af5a79556aedc66704277704a9bb41030983df2
-DIST art_0.7.2.tgz 17079147 RMD160 3a01c1375946f6d0b764ed3482ebb346ffe6480c SHA1 80d6ba755bb98f914fbc85ebdaa59b482e332e44 SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27
-DIST src_0.7.2.tgz 162856 RMD160 d53bcfb904bf32948ccf47838df011f67435e45b SHA1 c87ba2773f2ef5fe97fa4bc2eb89d2324a27e2c6 SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5
-EBUILD krystaldrop-0.7.2.ebuild 1632 RMD160 ad8784cc7d8b0971cf1b4914b5e10d1408e285fd SHA1 f809dcff2cdf90d221e302c984850e5fc572c114 SHA256 ffe14120fb35266c4877e85c3108c69bca7247f712cdf5bdb135b17aaefcdb9f
-MISC ChangeLog 1343 RMD160 d664fd34048a56fc778cce3be79db5e86397cbf2 SHA1 5907f39fb4d2c1697723e2101d933019ad587a0d SHA256 e79495f15242daf74fd44c5dbc4d3296fe844396e3149415c7f9746bbfbf4569
+DIST krystaldrop-0.7.2-art.tgz 17079147 RMD160 3a01c1375946f6d0b764ed3482ebb346ffe6480c SHA1 80d6ba755bb98f914fbc85ebdaa59b482e332e44 SHA256 7cd9dbd1ad12eb7e26e57e2a52b59e7137e20979d4fc8cb21a48faff983f6e27
+DIST krystaldrop-0.7.2-src.tgz 162856 RMD160 d53bcfb904bf32948ccf47838df011f67435e45b SHA1 c87ba2773f2ef5fe97fa4bc2eb89d2324a27e2c6 SHA256 d0e42cf05f241e409649de6a48045c026c42417cdabd233c8fef8783096946e5
+EBUILD krystaldrop-0.7.2.ebuild 1666 RMD160 9d8b1d8db11dc6242ece02d291be3fcb65eb0982 SHA1 da3fcb99751862cd6cde30b5cfa324cf0804fe1b SHA256 4608788e1656c01e86d5f54ba02212fa1cfdb727d57fd32119df4def6b308099
+MISC ChangeLog 1547 RMD160 6c83a6920f210c256b1bfef15f57694dcffcbe8d SHA1 17bdf577d3d9f0ccac70da0806584c65f28f647a SHA256 419c2ea1b8076c2d4fc50f3751eb1f59de4924c254600ca5399ffbd79422297d
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch
new file mode 100644
index 000000000000..54eba0e97014
--- /dev/null
+++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-as-needed.patch
@@ -0,0 +1,11 @@
+--- Sources/Makefile.old        2009-02-10 10:03:03.000000000 +0100
++++ Sources/Makefile    2009-02-10 10:04:21.000000000 +0100
+@@ -186,7 +186,7 @@
+ 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
+ 
+ kdrop: $(OBJ)
+-	$(LINK) $(LCFLAGS) $(LIBS) -o $@ $(OBJ)
++	$(LINK) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ $(OBJ): %.o: dep/%.d
+ $(OBJ): %.o: %.cpp
diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
index 163ee93eb609..611ae3aaba24 100644
--- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
+++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild
@@ -1,13 +1,14 @@
-# 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-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.9 2008/07/31 04:21:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.10 2009/02/10 10:29:56 tupone Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="Free clone of an excellent NeoGeo puzzle game, Magical Drop"
 HOMEPAGE="http://krystaldrop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/krystaldrop/art_${PV}.tgz
-	mirror://sourceforge/krystaldrop/src_${PV}.tgz"
+SRC_URI="mirror://sourceforge/krystaldrop/art_${PV}.tgz -> ${P}-art.tgz
+	mirror://sourceforge/krystaldrop/src_${PV}.tgz -> ${P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,16 +24,14 @@ DEPEND="virtual/opengl
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack src_${PV}.tgz
-	cd "${S}"
+src_prepare() {
+	mv ../art .
 	epatch "${FILESDIR}/krystaldrop-assert.patch" \
 		"${FILESDIR}/${P}"-gcc41.patch \
 		"${FILESDIR}/${P}"-gcc43.patch \
+		"${FILESDIR}/${P}"-as-needed.patch \
 		"${FILESDIR}/${P}"-deps.patch
 
-	unpack art_${PV}.tgz
-
 	sed -i \
 		-e "/^EXEDIR:=/ s|$|/bin|" \
 		-e "/^INSTALL_PREFIX:=/ s|$|${D}|" Makefile \