diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-10-12 07:59:14 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-10-12 07:59:14 +0000 |
| commit | 85bbc57a4831ad2a6b8002bfc29cac27555ac878 (patch) | |
| tree | 6116128f3c33451ad2f2f38b64d42d6608cd460e /games-kids/lletters | |
| parent | tidy (diff) | |
| download | gentoo-2-85bbc57a4831ad2a6b8002bfc29cac27555ac878.tar.gz gentoo-2-85bbc57a4831ad2a6b8002bfc29cac27555ac878.tar.bz2 gentoo-2-85bbc57a4831ad2a6b8002bfc29cac27555ac878.zip | |
Fix building with make >= 3.82 wrt #340599 by Diego E. Pettenò
(Portage version: 2.2_rc91/cvs/Linux x86_64)
Diffstat (limited to 'games-kids/lletters')
| -rw-r--r-- | games-kids/lletters/ChangeLog | 8 | ||||
| -rw-r--r-- | games-kids/lletters/files/lletters-0.1.95-make-382.patch | 23 | ||||
| -rw-r--r-- | games-kids/lletters/lletters-0.1.95-r2.ebuild | 11 |
3 files changed, 35 insertions, 7 deletions
diff --git a/games-kids/lletters/ChangeLog b/games-kids/lletters/ChangeLog index c1a0b8e90633..6a1105565606 100644 --- a/games-kids/lletters/ChangeLog +++ b/games-kids/lletters/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-kids/lletters -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.21 2009/01/12 17:45:17 mr_bones_ Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/ChangeLog,v 1.22 2010/10/12 07:59:14 ssuominen Exp $ + + 12 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> + lletters-0.1.95-r2.ebuild, +files/lletters-0.1.95-make-382.patch: + Fix building with make >= 3.82 wrt #340599 by Diego E. Pettenò 12 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org> lletters-0.1.95-r2.ebuild: diff --git a/games-kids/lletters/files/lletters-0.1.95-make-382.patch b/games-kids/lletters/files/lletters-0.1.95-make-382.patch new file mode 100644 index 000000000000..2a5ee9ecc4a7 --- /dev/null +++ b/games-kids/lletters/files/lletters-0.1.95-make-382.patch @@ -0,0 +1,23 @@ +http://bugs.gentoo.org/340599 + +--- intl/Makefile.in ++++ intl/Makefile.in +@@ -202,12 +202,12 @@ + # The dependency for intlh.inst is different in gettext and all other + # packages. Because we cannot you GNU make features we have to solve + # the problem while rewriting Makefile.in. +-@GT_YES@intlh.inst: intlh.inst.in ../config.status +-@GT_YES@ cd .. \ +-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ +-@GT_YES@ $(SHELL) ./config.status +-@GT_NO@.PHONY: intlh.inst +-@GT_NO@intlh.inst: ++intlh.inst: intlh.inst.in ../config.status ++ cd .. \ ++ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ ++ $(SHELL) ./config.status ++.PHONY: intlh.inst ++intlh.inst: + + # Tell versions [3.59,3.63) of GNU make not to export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/games-kids/lletters/lletters-0.1.95-r2.ebuild b/games-kids/lletters/lletters-0.1.95-r2.ebuild index 2fbfc7177f98..a5dafb0638fd 100644 --- a/games-kids/lletters/lletters-0.1.95-r2.ebuild +++ b/games-kids/lletters/lletters-0.1.95-r2.ebuild @@ -1,6 +1,6 @@ -# 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/games-kids/lletters/lletters-0.1.95-r2.ebuild,v 1.6 2009/01/12 17:45:17 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-kids/lletters/lletters-0.1.95-r2.ebuild,v 1.7 2010/10/12 07:59:14 ssuominen Exp $ EAPI=2 inherit eutils games @@ -26,8 +26,9 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${WORKDIR}"/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff \ - "${FILESDIR}"/${P}-build-2.patch - cp -r "${WORKDIR}"/{images,sounds} . || die "copying images and sounds failed." + "${FILESDIR}"/${P}-build-2.patch \ + "${FILESDIR}"/${P}-make-382.patch + cp -r "${WORKDIR}"/{images,sounds} . || die } src_configure() { @@ -35,7 +36,7 @@ src_configure() { } src_install () { - emake DESTDIR="${D}" install || die "emake install failed." + emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog CREDITS NEWS README* TODO newdoc debian/changelog ChangeLog.debian doicon debian/${PN}.xpm |