summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2006-11-04 04:56:55 +0000
committerTristan Heaven <nyhm@gentoo.org>2006-11-04 04:56:55 +0000
commitb328b6320748f0278390cf52669704de4419a205 (patch)
treeb76bc00e374c4a77775990aee470304a975f7c70 /games-puzzle
parentInitial ebuild for swing-layout. Contributed by ali_bush, ty :) (diff)
downloadgentoo-2-b328b6320748f0278390cf52669704de4419a205.tar.gz
gentoo-2-b328b6320748f0278390cf52669704de4419a205.tar.bz2
gentoo-2-b328b6320748f0278390cf52669704de4419a205.zip
Add nls dependencies and cleanup ebuild
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'games-puzzle')
-rw-r--r--games-puzzle/pingus/ChangeLog8
-rw-r--r--games-puzzle/pingus/files/pingus-0.6.0-build.patch192
-rw-r--r--games-puzzle/pingus/pingus-0.6.0-r1.ebuild33
3 files changed, 212 insertions, 21 deletions
diff --git a/games-puzzle/pingus/ChangeLog b/games-puzzle/pingus/ChangeLog
index d30698c46740..ecced3e3cc13 100644
--- a/games-puzzle/pingus/ChangeLog
+++ b/games-puzzle/pingus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-puzzle/pingus
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.10 2005/10/08 13:56:52 blubb Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/ChangeLog,v 1.11 2006/11/04 04:56:55 nyhm Exp $
+
+ 04 Nov 2006; Tristan Heaven <nyhm@gentoo.org>
+ +files/pingus-0.6.0-build.patch, pingus-0.6.0-r1.ebuild:
+ Add nls dependencies and cleanup ebuild
08 Oct 2005; Simon Stelling <blubb@gentoo.org> pingus-0.6.0-r1.ebuild:
remove amd64 keyword till bug #85454 is fixed
diff --git a/games-puzzle/pingus/files/pingus-0.6.0-build.patch b/games-puzzle/pingus/files/pingus-0.6.0-build.patch
new file mode 100644
index 000000000000..232b6634887a
--- /dev/null
+++ b/games-puzzle/pingus/files/pingus-0.6.0-build.patch
@@ -0,0 +1,192 @@
+--- configure.ac
++++ configure.ac
+@@ -64,6 +64,8 @@
+ dnl -- Static Libaries --
+ AC_PROG_RANLIB
+
++CPPFLAGS="$CPPFLAGS `clanlib0.6-config --cflags`"
++LIBS="$LIBS `clanlib0.6-config --libs`"
+ AC_CHECK_HEADER(ClanLib/core.h,, [echo "Please get ClanLib from http://www.clanlib.org"; exit])
+
+ dnl FIXME: we don't need pthread, but some system might need it to succeed at the final link
+@@ -274,11 +276,11 @@
+ AC_CHECK_FUNCS(select strdup)
+
+ dnl Checking for the install prefix and then use it to define PINGUS_DATADIR
+-PINGUS_EXPAND_DIR(pingus_datadir, "$datadir/games/$PACKAGE")
++PINGUS_EXPAND_DIR(pingus_datadir, "$datadir/$PACKAGE")
+ AC_DEFINE_UNQUOTED(PINGUS_DATADIR, "$pingus_datadir", [Location of Pingus data files])
+
+ dnl -- Define the localedir, needed for gettext --
+-PINGUS_EXPAND_DIR(localedir, "$datadir/locale")
++PINGUS_EXPAND_DIR(localedir, "/usr/share/locale")
+ AC_DEFINE_UNQUOTED(LOCALEDIR, "$localedir", [Location of gettext files])
+
+ # po/Makefile.in intl/Makefile <- this must be in one line, if its not
+--- data/controller/Makefile.am
++++ data/controller/Makefile.am
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-pkgdatadir = $(datadir)/games/@PACKAGE@/controller
++pkgdatadir = $(datadir)/@PACKAGE@/controller
+ EXTRA_DIST = default.xml gamepad.xml
+ pkgdata_DATA = $(EXTRA_DIST)
+
+--- data/data/Makefile.am
++++ data/data/Makefile.am
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-pkgdatadir = $(datadir)/games/@PACKAGE@/data
++pkgdatadir = $(datadir)/@PACKAGE@/data
+
+ EXTRA_DIST = \
+ pingus.scr \
+--- data/demos/Makefile.am
++++ data/demos/Makefile.am
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-pkgdatadir = $(datadir)/games/@PACKAGE@/demos
++pkgdatadir = $(datadir)/@PACKAGE@/demos
+
+ pkgdata_DATA = level1.pde
+
+--- data/images/Makefile.am
++++ data/images/Makefile.am
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-pkgdatadir = $(datadir)/games/@PACKAGE@/images
++pkgdatadir = $(datadir)/@PACKAGE@/images
+
+ nobase_pkgdata_DATA = backgrounds/large_star.png \
+ backgrounds/middle_star.png \
+--- data/levels/Makefile.am
++++ data/levels/Makefile.am
+@@ -18,7 +18,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ ## Override automake so that "make install" puts these in proper place:
+-pkgdatadir = $(datadir)/games/@PACKAGE@/levels
++pkgdatadir = $(datadir)/@PACKAGE@/levels
+
+ nobase_pkgdata_DATA = \
+ $(wildcard tutorial/*.xml) \
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -18,9 +18,8 @@
+ SUBDIRS = controller images levels demos data music sounds worldmaps themes prefabs
+
+ # Tweaking the `datadir' to install the files in the correct location
+-pkgdatadir = $(datadir)/games/@PACKAGE@
++pkgdatadir = $(datadir)/@PACKAGE@
+
+ EXTRA_DIST = README
+-pkgdata_DATA = $(EXTRA_DIST)
+
+ # EOF #
+--- data/music/Makefile.am
++++ data/music/Makefile.am
+@@ -15,7 +15,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-pkgdatadir = $(datadir)/games/@PACKAGE@/music
++pkgdatadir = $(datadir)/@PACKAGE@/music
+ EXTRA_DIST = gd-giirm.s3m pingus-5.it rough_journey.it \
+ gd-ite.it pingus-1.it pingus-6.it success_1.it \
+ README gd-matth.it pingus-2.it pingus-7.it success_2.it \
+@@ -23,4 +23,4 @@
+ gd-cancn.it goin_march.it pingus-4.it pingus-9.it
+ pkgdata_DATA = $(EXTRA_DIST)
+
+-# EOF #
+\ No newline at end of file
++# EOF #
+--- data/prefabs/Makefile.am
++++ data/prefabs/Makefile.am
+@@ -16,7 +16,7 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ ## Override automake so that "make install" puts these in proper place:
+-pkgdatadir = $(datadir)/games/@PACKAGE@/prefabs
++pkgdatadir = $(datadir)/@PACKAGE@/prefabs
+
+ EXTRA_DIST = water.xml snow-entrance.xml
+ pkgdata_DATA = $(EXTRA_DIST)
+--- data/sounds/Makefile.am
++++ data/sounds/Makefile.am
+@@ -15,9 +15,9 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-pkgdatadir = $(datadir)/games/@PACKAGE@/sounds
++pkgdatadir = $(datadir)/@PACKAGE@/sounds
+ EXTRA_DIST = chink.wav goodidea.wav plop.wav splash.wav ting.wav \
+ digger.wav ohno.wav plop2.wav tick.wav yipee.wav
+ pkgdata_DATA = $(EXTRA_DIST)
+
+-# EOF #
+\ No newline at end of file
++# EOF #
+--- data/themes/Makefile.am
++++ data/themes/Makefile.am
+@@ -18,9 +18,9 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ # Tweaking the `datadir' to install the files in the correct location
+-pkgdatadir = $(datadir)/games/@PACKAGE@/themes
++pkgdatadir = $(datadir)/@PACKAGE@/themes
+
+ EXTRA_DIST = $(wildcard *.xml)
+ pkgdata_DATA = $(EXTRA_DIST)
+
+-# EOF #
+\ No newline at end of file
++# EOF #
+--- data/worldmaps/Makefile.am
++++ data/worldmaps/Makefile.am
+@@ -16,9 +16,9 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ # Tweaking the `datadir' to install the files in the correct location
+-pkgdatadir = $(datadir)/games/@PACKAGE@/worldmaps
++pkgdatadir = $(datadir)/@PACKAGE@/worldmaps
+
+ EXTRA_DIST = volcano.xml pacman.xml tutorial.xml
+ pkgdata_DATA = $(EXTRA_DIST)
+
+-# EOF #
+\ No newline at end of file
++# EOF #
+--- po/Makefile.in.in
++++ po/Makefile.in.in
+@@ -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@
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -17,10 +17,9 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+-bindir=$(prefix)/games
+
+ # The next lines are for gettext
+-localedir = $(datadir)/locale
++localedir = /usr/share/locale
+ # DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ # INCLUDES = -I$(srcdir) -I.. -I$(top_srcdir)/lib -I../intl -I$(top_srcdir)/intl
+
diff --git a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
index df154a3a639f..68e14e21bf1c 100644
--- a/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
+++ b/games-puzzle/pingus/pingus-0.6.0-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.16 2006/01/20 08:26:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pingus/pingus-0.6.0-r1.ebuild,v 1.17 2006/11/04 04:56:55 nyhm Exp $
-inherit eutils flag-o-matic games
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+inherit autotools eutils flag-o-matic games
DESCRIPTION="free Lemmings clone"
HOMEPAGE="http://pingus.seul.org/"
@@ -13,24 +15,24 @@ SLOT="0"
KEYWORDS="-amd64 x86"
IUSE="nls opengl"
-DEPEND=">=media-libs/hermes-1.3.2-r2
+RDEPEND="media-libs/hermes
=dev-games/clanlib-0.6.5*
- >=dev-libs/libxml2-2.5.6"
+ dev-libs/libxml2
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-gcc.patch #28281 #63773
- autoconf || die "failed to update configure file in order to respect CFLAGS/LDFLAGS"
+ epatch "${FILESDIR}"/${P}-build.patch
+ AT_M4DIR=m4 eautoreconf
}
src_compile() {
- append-flags $(clanlib0.6-config --cflags)
- append-ldflags $(clanlib0.6-config --libs)
replace-flags -Os -O2
egamesconf \
- --with-bindir="${GAMES_BINDIR}" \
- --with-datadir="${GAMES_DATADIR_BASE}" \
$(use_enable nls) \
$(use_with opengl clanGL) \
|| die
@@ -38,15 +40,8 @@ src_compile() {
}
src_install() {
- make DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install || die "emake install failed"
dodoc AUTHORS NEWS README TODO
- # pos install process ... FIXME
- mv "${D}/usr/games/games" "${D}/usr/games/bin"
- cd "${D}/usr/share/games"
- use nls && mv locale ../
- mv games/pingus .
- rm -rf games
- # end pos install process
- make_desktop_entry pingus "Pingus"
+ make_desktop_entry pingus Pingus
prepgamesdirs
}