Fix building with make >= 3.82 wrt #334569 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 45 insertions, 26 deletions

diff --git a/media-gfx/tuxpaint-stamps/ChangeLog b/media-gfx/tuxpaint-stamps/ChangeLog
index a1109512eaff..0741d04a488a 100644
--- a/media-gfx/tuxpaint-stamps/ChangeLog
+++ b/media-gfx/tuxpaint-stamps/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/tuxpaint-stamps
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/ChangeLog,v 1.26 2009/07/30 21:13:32 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/ChangeLog,v 1.27 2010/09/25 17:08:31 ssuominen Exp $
+
+  25 Sep 2010; Samuli Suominen <ssuominen@gentoo.org>
+  tuxpaint-stamps-20090628.ebuild,
+  +files/tuxpaint-stamps-20090628-make-382.patch:
+  Fix building with make >= 3.82 wrt #334569 by Diego E. Pettenò.
 
 *tuxpaint-stamps-20090628 (30 Jul 2009)
 
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index 3dad44bbf457..8dce831abd34 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tuxpaint-stamps-20090628-make-382.patch 361 RMD160 369bff2d59a785162e659f58d7e79782a2448c1f SHA1 69dbc02ae062e1639d90a869327c7a48c69d4467 SHA256 d238714745432445f6ccbf928d9ee5d6dbe63f64c47fbc402232c5b31bb6bc59
 DIST tuxpaint-stamps-2008.06.30.tar.gz 31310391 RMD160 bea7fe57fccc1f43237b3deb2d62b2d5104ef601 SHA1 32a3be5b24b558353e5684a6032b6d173fa2cf0c SHA256 93ade0ae9dea1786beb8e6fa6052b053ffce1f79deb65918c7ba411343fa1b6a
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 RMD160 dea213976a699310c97e2e280a8cda6706464ee7 SHA1 da00c337e13585d88688d79993936e9b49044e26 SHA256 271d9a5739d24b6dcee751bf8c889eecb3beb3ff67f5a870dba5d7732dca3e68
 EBUILD tuxpaint-stamps-20080630.ebuild 712 RMD160 5717e8330d2279bf3b5d22bf91f513333f21c242 SHA1 793c906fb451a0f590ea007a6786f34123c17d76 SHA256 b6ab0e49b49c41baffdf14b9ba5a46346bb3860464ffa6f12fdbc34b8c61d14a
-EBUILD tuxpaint-stamps-20090628.ebuild 715 RMD160 84d9750cdc66fcfd47cc162fd200406383d25b24 SHA1 ba7a43c4ac03e51bc0947ae61d27c30360b0449c SHA256 7dde7b8cc769769aa26dc4427d5d859070ef1a4472f0329c0daa91d7a0460f9b
-MISC ChangeLog 3659 RMD160 bf880f69c82a7843470fb0d876e299bc1a0d7405 SHA1 13e9a1c31fc933d256f0f1aa1a48bc5b40d65bc6 SHA256 9f5c18ca0e45e87ec2358e8047542b9ca90724d1ebdf782b24729895e7a12fc7
+EBUILD tuxpaint-stamps-20090628.ebuild 778 RMD160 7d84ce05decb0cada16f95ba3249de8974b3dcdf SHA1 ce12f0d24f5559f60599b636ab30d80fc07fc1ef SHA256 fe0f43623ce8bf1be35eb641a537c3bcd6613ce6baa5664cccc4c494d0c0d586
+MISC ChangeLog 3869 RMD160 7b88aaa134364df22ff8b73ebe030c6786451fa7 SHA1 3bdb1592e492810ff4cd5df153e8fac2ed2d0bc3 SHA256 5398f439654c3ef4fc9eacd6e77572bae86c09451bf84e09f6bf3b272fcd2d26
 MISC metadata.xml 263 RMD160 a69dc6878e490e4f120f2e1ce6beffc266f91d24 SHA1 9941ec21026da922c9da2e1c8839e15d31095b43 SHA256 39693ef25368d8fc4e114bc54dd52ab6809f2c942e7b28259bd62873e6058fab
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpyDTAACgkQkKaRLQcq0GJZAQCgnm3xXVSvsRwu3KlXXUWzcwvm
-xTIAn04BqyC1f5mKQRsmjcs2KWnqmVA9
-=DhzU
------END PGP SIGNATURE-----
diff --git a/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch
new file mode 100644
index 000000000000..9a92ae112457
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/334569
+
+--- Makefile
++++ Makefile
+@@ -79,9 +79,7 @@
+ 	@rm -rf "build/tuxpaint-stamps-$(VER_DATE)" "build/tuxpaint-stamps-$(VER_DATE).tar.gz"
+ 	@-if [ -d build ] ; then rmdir build ; fi
+ 
+-releasedir: build/tuxpaint-stamps-$(VER_DATE)
+-
+-build/tuxpaint-stamps-$(VER_DATE):
++releasedir:
+ 	@echo
+ 	@echo "Creating release directory"
+ 	@echo
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild
index f0287888de7c..0dddee49682a 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild
@@ -1,24 +1,32 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild,v 1.1 2009/07/30 21:13:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild,v 1.2 2010/09/25 17:08:31 ssuominen Exp $
 
-MY_P="${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}"
-DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
-HOMEPAGE="http://www.tuxpaint.org/"
+EAPI=2
+inherit eutils
 
-DEPEND="media-gfx/tuxpaint"
-RDEPEND="${DEPEND}"
+MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
 
-IUSE=""
+DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
+HOMEPAGE="http://www.tuxpaint.org/"
 SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-gfx/tuxpaint"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make-382.patch
+}
 
-src_install () {
-	make PREFIX="${D}/usr" install-all || die "Installation failed"
+src_install() {
+	emake PREFIX="${D}/usr" install-all || die
 
 	rm -f docs/COPYING.txt
 	dodoc docs/*.txt