tidy; honor CFLAGS and CC; install desktop files

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 31 insertions, 20 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/Manifest b/games-puzzle/xpired/Manifest
index 6d3ba8400570..751d4e3e089f 100644
--- a/games-puzzle/xpired/Manifest
+++ b/games-puzzle/xpired/Manifest
@@ -1,5 +1,5 @@
-AUX xpired-1.22-ldflags.patch 737 RMD160 bc575a2c621df3ddc6ac383e1bc13ff6e2ec8c50 SHA1 342a8db7ca736bb19660dc84e5b499a64445d6b7 SHA256 ac0ee2f4e055811c8b66903639e3ad503ae27471a05525857a39eb12bbe0874b
+AUX xpired-1.22-ldflags.patch 868 RMD160 0d5e2c0236e5c00fcd30143cf4b2b47f42aa3ab9 SHA1 3c78a6e072c95153e545d3ed8356e36470b1f9a6 SHA256 3c528e9d093c547bf68e77e6d9b9e881deaf4dd6a9c87318ee13c59f60ffc3b7
 DIST xpired-1.22-linux_source.tar.gz 478593 RMD160 840e4cb1d845edfc7d0271d00d6eff2cfee00a53 SHA1 ee41da081233e33fc9e9127dd6095f42c3ed1248 SHA256 7a2c0dd8bab0dc2b937684bbb3d213754921bf2d6bd891d9be00bf2db7bbb505
-EBUILD xpired-1.22.ebuild 902 RMD160 fb82e66020a48f1d6f1607e4b19955bb58f3e801 SHA1 39e6fa387152b2e2c4067ea88a124901354b5303 SHA256 36d0755563d97a440da2ee1b37ca95c541b3a4a570b6b5bfb326ad8713bac873
-MISC ChangeLog 724 RMD160 d3be63ec7cac14fa6faef4fab73e018ca2a7a0fd SHA1 0a29e4c6748a0326979115f368e10f0362005c9b SHA256 89924488b927df8433159a51d96485449486942545da6e7ecb831459edecf2fb
+EBUILD xpired-1.22.ebuild 1015 RMD160 0d7c669fe6c362fb4ac03617718b42cb33f8b4e5 SHA1 728036f6a21dbd0145194ffbc9f04e42c4e6f3d3 SHA256 362ee6cddcd3c58f49bea9338a556aa05f0f83d63189a2da44948563053be71d
+MISC ChangeLog 889 RMD160 05d440190c6f0c0a313839c3d9fb2863f38f66b9 SHA1 5253b6144080a3905fe7383623171416aabe8523 SHA256 cabf656925c9e59fd297d5df7436eb647eaac151673b18410a3daec1f32adeaf
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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
 }