diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2009-02-06 22:31:49 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-02-06 22:31:49 +0000 |
commit | dd7faad4ade65dfa76af007272db8b4f0fdd391e (patch) | |
tree | 2e1b2e30ef912d37158c3f5d81c961ffd76814ec /games-puzzle | |
parent | adding package.mask file for all of powerpc (diff) | |
download | historical-dd7faad4ade65dfa76af007272db8b4f0fdd391e.tar.gz historical-dd7faad4ade65dfa76af007272db8b4f0fdd391e.tar.bz2 historical-dd7faad4ade65dfa76af007272db8b4f0fdd391e.zip |
EAPI=2; add use-based dep; replace seds with patch; add third parameter to open for bug #257340
Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686
Diffstat (limited to 'games-puzzle')
-rw-r--r-- | games-puzzle/toppler/ChangeLog | 9 | ||||
-rw-r--r-- | games-puzzle/toppler/Manifest | 5 | ||||
-rw-r--r-- | games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch | 56 | ||||
-rw-r--r-- | games-puzzle/toppler/toppler-1.1.3.ebuild | 28 |
4 files changed, 73 insertions, 25 deletions
diff --git a/games-puzzle/toppler/ChangeLog b/games-puzzle/toppler/ChangeLog index cb6633322575..36853a4e26fe 100644 --- a/games-puzzle/toppler/ChangeLog +++ b/games-puzzle/toppler/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-puzzle/toppler -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/toppler/ChangeLog,v 1.18 2008/06/25 19:09:08 nixnut Exp $ +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/toppler/ChangeLog,v 1.19 2009/02/06 22:31:48 mr_bones_ Exp $ + + 06 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> + +files/toppler-1.1.3-gentoo.patch, toppler-1.1.3.ebuild: + EAPI=2; add use-based dep; replace seds with patch; add third parameter to + open for bug #257340 25 Jun 2008; nixnut <nixnut@gentoo.org> toppler-1.1.3.ebuild: Stable on ppc wrt bug 229143 diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest index 21f95ca386a9..919054c941ac 100644 --- a/games-puzzle/toppler/Manifest +++ b/games-puzzle/toppler/Manifest @@ -1,4 +1,5 @@ +AUX toppler-1.1.3-gentoo.patch 2249 RMD160 9d0e5cf19327ccf0d6aec0a7b565d42dba60e1a1 SHA1 f89fd9e5577d7518b734412abb964da17a70f1d4 SHA256 35bf74a265696cbe1d9d9c2427dc477fd8750fb01822b9c9101617b232dccba7 DIST toppler-1.1.3.tar.gz 2085343 RMD160 be14acaa9126d47b25431ee7051e556a92c72d74 SHA1 563839ceec44626574fcb10f677d2ab8f82dba29 SHA256 5db9cff3fe39007e9a80c3b27acfb86692641f2b0de118ef1d5e24ebd35d438b -EBUILD toppler-1.1.3.ebuild 1136 RMD160 6ab419b4e12c3332a706dcb1038d7fc1f928710e SHA1 67ae134339dc69322fbc26d9f3670a9fb267ee2a SHA256 bc63ea693f6d0edab06d54a68090b0f67c4206ffa17b8136d2473e95355fa8dd -MISC ChangeLog 2559 RMD160 239b7600f61b7c8ff0e587fbe87a0a172ee3a7b6 SHA1 558d5028007119ec2d891ab61beae866bc622420 SHA256 69b4e41bc6a50018e3febb467dbec697ae5538f753470aea7e8de573f528d26e +EBUILD toppler-1.1.3.ebuild 834 RMD160 3a3251b0ebc3503c99dc54975c741486ede1166b SHA1 3c5d03274f3515c8c11052922939206b317a905d SHA256 415b34e31daa6b54a0d2073f34561e50640711fa5086ade155ce2831703d6dd5 +MISC ChangeLog 2777 RMD160 7e9d4d593e89c42f24d7fce8515e7008c5b0fc18 SHA1 50d80c95d477a7a868fdcb05749eb929013aa9d3 SHA256 06f3eaca7290ea914c0ac96a379ec7edf3dcf0b8e68ea2b8ea5be92e2252677d MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch b/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch new file mode 100644 index 000000000000..269b0f28e2ea --- /dev/null +++ b/games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch @@ -0,0 +1,56 @@ +diff -ru toppler-1.1.3.orig/Makefile.in toppler-1.1.3/Makefile.in +--- toppler-1.1.3.orig/Makefile.in 2007-07-19 10:27:58.000000000 -0400 ++++ toppler-1.1.3/Makefile.in 2009-02-06 15:44:46.000000000 -0500 +@@ -298,8 +298,8 @@ + txtsys.cc txtsys.h \ + qnxicon.c + +-pixmapsdir = $(datadir)/pixmaps +-applicationsdir = $(datadir)/applications ++pixmapsdir = /usr/share/pixmaps ++applicationsdir = /usr/share/applications + pkgdocdir = $(docdir)/$(PACKAGE) + pkglocalstatedir = $(localstatedir)/$(PACKAGE) + dist_pixmaps_DATA = $(PACKAGE).xpm +@@ -952,7 +952,7 @@ + info-am: + + install-data-am: install-applicationsDATA install-dist_pixmapsDATA \ +- install-dist_pkgdataDATA install-dist_pkgdocDATA \ ++ install-dist_pkgdataDATA \ + install-dist_pkglocalstateDATA install-man + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +@@ -1015,7 +1015,7 @@ + info-am install install-am install-applicationsDATA \ + install-binPROGRAMS install-data install-data-am \ + install-data-hook install-dist_pixmapsDATA \ +- install-dist_pkgdataDATA install-dist_pkgdocDATA \ ++ install-dist_pkgdataDATA \ + install-dist_pkglocalstateDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ +diff -ru toppler-1.1.3.orig/highscore.cc toppler-1.1.3/highscore.cc +--- toppler-1.1.3.orig/highscore.cc 2007-07-19 10:26:35.000000000 -0400 ++++ toppler-1.1.3/highscore.cc 2009-02-06 15:46:06.000000000 -0500 +@@ -139,7 +139,7 @@ + setegid(GameGroupID); + int lockfd; + +- while ((lockfd = open(HISCOREDIR "/" SCOREFNAME ".lck", O_CREAT | O_RDWR | O_EXCL)) == -1) { ++ while ((lockfd = open(HISCOREDIR "/" SCOREFNAME ".lck", O_CREAT | O_RDWR | O_EXCL, 0660)) == -1) { + dcl_wait(); + scr_swap(); + } +diff -ru toppler-1.1.3.orig/po/Makefile.in.in toppler-1.1.3/po/Makefile.in.in +--- toppler-1.1.3.orig/po/Makefile.in.in 2007-07-19 10:27:04.000000000 -0400 ++++ toppler-1.1.3/po/Makefile.in.in 2009-02-06 15:44:46.000000000 -0500 +@@ -21,7 +21,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = @datadir@ +-localedir = $(datadir)/locale ++localedir = /usr/share/locale + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ diff --git a/games-puzzle/toppler/toppler-1.1.3.ebuild b/games-puzzle/toppler/toppler-1.1.3.ebuild index 6ea32b45701b..2f2710d305e9 100644 --- a/games-puzzle/toppler/toppler-1.1.3.ebuild +++ b/games-puzzle/toppler/toppler-1.1.3.ebuild @@ -1,7 +1,8 @@ -# 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/toppler/toppler-1.1.3.ebuild,v 1.4 2008/06/25 19:09:08 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/toppler/toppler-1.1.3.ebuild,v 1.5 2009/02/06 22:31:48 mr_bones_ Exp $ +EAPI=2 inherit games DESCRIPTION="Reimplementation of Nebulous using SDL" @@ -14,31 +15,16 @@ KEYWORDS="amd64 ppc x86" IUSE="nls" RDEPEND="media-libs/libsdl - media-libs/sdl-mixer + media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" S=${WORKDIR}/${P/a/} +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -src_unpack() { - unpack ${A} - cd "${S}" - sed -i \ - -e 's/ install-dist_pkgdocDATA//' \ - -e '/^applicationsdir/ s:$(datadir):/usr/share:' \ - -e '/^pixmapsdir/ s:$(datadir):/usr/share:' \ - Makefile.in \ - || die "sed failed" - sed -i \ - -e '/^localedir/ s:$(datadir):/usr/share:' \ - po/Makefile.in.in \ - || die "sed failed" -} - -src_compile() { - egamesconf $(use_enable nls) || die - emake || die "emake failed" +src_configure() { + egamesconf $(use_enable nls) } src_install() { |