From 6c799336d34efc7cb389a01ff918fe9c6d4b749e Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Fri, 6 Feb 2009 22:31:49 +0000 Subject: EAPI=2; add use-based dep; replace seds with patch; add third parameter to open for bug #257340 (Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686) --- games-puzzle/toppler/ChangeLog | 9 +++- .../toppler/files/toppler-1.1.3-gentoo.patch | 56 ++++++++++++++++++++++ games-puzzle/toppler/toppler-1.1.3.ebuild | 28 +++-------- 3 files changed, 70 insertions(+), 23 deletions(-) create mode 100644 games-puzzle/toppler/files/toppler-1.1.3-gentoo.patch (limited to 'games-puzzle/toppler') 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 + +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 toppler-1.1.3.ebuild: Stable on ppc wrt bug 229143 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() { -- cgit v1.2.3-65-gdbad