diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2010-10-13 23:37:48 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2010-10-13 23:37:48 +0000 |
| commit | bebdc7fdf91d9e1532fa0180b238a844130a46ee (patch) | |
| tree | 8af8b045aa8500cb503a60393372d40160d1d7b6 /games-puzzle | |
| parent | Version bump for truecrypt wrt bug 329075. Removed all old versions as upstre... (diff) | |
| download | gentoo-2-bebdc7fdf91d9e1532fa0180b238a844130a46ee.tar.gz gentoo-2-bebdc7fdf91d9e1532fa0180b238a844130a46ee.tar.bz2 gentoo-2-bebdc7fdf91d9e1532fa0180b238a844130a46ee.zip | |
tidy; honor CFLAGS and CC; install desktop files
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/xpired/ChangeLog | 6 | ||||
| -rw-r--r-- | games-puzzle/xpired/files/xpired-1.22-ldflags.patch | 14 | ||||
| -rw-r--r-- | games-puzzle/xpired/xpired-1.22.ebuild | 25 |
3 files changed, 28 insertions, 17 deletions
diff --git a/games-puzzle/xpired/ChangeLog b/games-puzzle/xpired/ChangeLog index b20020a2d068..9b9921dc0b0c 100644 --- a/games-puzzle/xpired/ChangeLog +++ b/games-puzzle/xpired/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/xpired # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpired/ChangeLog,v 1.5 2010/10/13 07:53:56 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpired/ChangeLog,v 1.6 2010/10/13 23:37:47 mr_bones_ Exp $ + + 13 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org> xpired-1.22.ebuild, + files/xpired-1.22-ldflags.patch: + tidy; honor CFLAGS and CC; install desktop files 13 Oct 2010; Tupone Alfredo <tupone@gentoo.org> xpired-1.22.ebuild, +files/xpired-1.22-ldflags.patch: diff --git a/games-puzzle/xpired/files/xpired-1.22-ldflags.patch b/games-puzzle/xpired/files/xpired-1.22-ldflags.patch index 729fcc89c13a..f3a1e6839cf4 100644 --- a/games-puzzle/xpired/files/xpired-1.22-ldflags.patch +++ b/games-puzzle/xpired/files/xpired-1.22-ldflags.patch @@ -1,15 +1,17 @@ ---- Makefile.old 2010-10-13 09:31:42.000000000 +0200 -+++ Makefile 2010-10-13 09:32:02.000000000 +0200 -@@ -1,7 +1,7 @@ +diff -ru src.orig/Makefile src/Makefile +--- src.orig/Makefile 2002-08-01 14:42:51.000000000 -0400 ++++ src/Makefile 2010-10-13 19:31:21.944183145 -0400 +@@ -1,18 +1,17 @@ PREFIX=/usr/local SHARE_PREFIX=$(PREFIX)/share/xpired - CFLAGS=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\" +-CFLAGS=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\" -LDFLAGS=`sdl-config --libs` -lSDL -lSDL_mixer -lSDL_image -lSDL_gfx +-CC=gcc ++CFLAGS+=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\" +LDLIBS=`sdl-config --libs` -lSDL -lSDL_mixer -lSDL_image -lSDL_gfx - CC=gcc BINARIES = xpired xpiredit -@@ -9,10 +9,10 @@ + all: $(BINARIES) xpired: xpired.o diff --git a/games-puzzle/xpired/xpired-1.22.ebuild b/games-puzzle/xpired/xpired-1.22.ebuild index a65683c619fd..09e8f9f89352 100644 --- a/games-puzzle/xpired/xpired-1.22.ebuild +++ b/games-puzzle/xpired/xpired-1.22.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpired/xpired-1.22.ebuild,v 1.10 2010/10/13 07:53:56 tupone Exp $ -EAPI="2" +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xpired/xpired-1.22.ebuild,v 1.11 2010/10/13 23:37:47 mr_bones_ Exp $ +EAPI=2 inherit eutils games DESCRIPTION="A Sokoban-styled puzzle game with lots more action." @@ -14,23 +14,28 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="" -RDEPEND="media-libs/sdl-gfx - media-libs/sdl-image - media-libs/sdl-mixer" -DEPEND="${RDEPEND}" +DEPEND="media-libs/sdl-gfx + media-libs/sdl-image[jpeg] + media-libs/sdl-mixer[mikmod]" S=${WORKDIR}/src PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) src_compile() { - emake PREFIX=/usr/games SHARE_PREFIX=/usr/share/games/xpired || \ - die "emake failed" + emake \ + PREFIX=/usr/games \ + SHARE_PREFIX=/usr/share/games/xpired \ + || die } + src_install() { - make \ + emake \ PREFIX="${D}/usr/games" \ SHARE_PREFIX="${D}/usr/share/games/${PN}" \ - install || die "make install failed" + install || die + newicon img/icon.bmp ${PN}.bmp + make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp + make_desktop_entry xpiredit "Xpired Level Editor" prepgamesdirs } |