diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-09-25 17:08:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-09-25 17:08:32 +0000 |
| commit | 971c58e10cb4eaf417778439ac653c1efe363b8f (patch) | |
| tree | c582858c6a3180ade02ec0c3eb638e2c29d0659d /media-gfx | |
| parent | Version bump. (diff) | |
| download | gentoo-2-971c58e10cb4eaf417778439ac653c1efe363b8f.tar.gz gentoo-2-971c58e10cb4eaf417778439ac653c1efe363b8f.tar.bz2 gentoo-2-971c58e10cb4eaf417778439ac653c1efe363b8f.zip | |
Fix building with make >= 3.82 wrt #334569 by Diego E. Pettenò.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
3 files changed, 42 insertions, 14 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/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 |