EAPI=2; add use-based dep; fixup build process a bit

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28.1 i686

4 files changed, 60 insertions, 17 deletions

diff --git a/games-puzzle/ensemblist/ChangeLog b/games-puzzle/ensemblist/ChangeLog
index 88ea5666ec73..3dfaf5b474be 100644
--- a/games-puzzle/ensemblist/ChangeLog
+++ b/games-puzzle/ensemblist/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/ensemblist
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ChangeLog,v 1.7 2007/02/22 01:08:00 peper Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ChangeLog,v 1.8 2009/01/23 08:32:19 mr_bones_ Exp $
+
+  23 Jan 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/ensemblist-040126-build.patch, ensemblist-040126.ebuild:
+  EAPI=2; add use-based dep; fixup build process a bit
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
index 6b734f2309b3..b6f4ee2c1d0f 100644
--- a/games-puzzle/ensemblist/Manifest
+++ b/games-puzzle/ensemblist/Manifest
@@ -1,4 +1,5 @@
+AUX ensemblist-040126-build.patch 1610 RMD160 af2e2c93a685536b84ce434f163fe57a42aad764 SHA1 3a3b007275a4e8ffd8f84122429a538e75a5e898 SHA256 47f29cc749d3240fdee845391bba58e4fecb6025499594cd1da08999cd3758ac
 DIST ensemblist-040126.tar.gz 1312095 RMD160 7c132f4e82d819e358b46c45a4dba8a0a2a0c741 SHA1 843a1a84fd956fa0deb89f6ebf525b24e54e9016 SHA256 6cfd48b3f62a0853a08609a85841bea400a9fe0eb9d3b8bdf0f62dd5a8aa36be
-EBUILD ensemblist-040126.ebuild 1049 RMD160 1ef82c34ae353e77932377040f0754aeca4c7d91 SHA1 8983cbcf0e910a8e0157f1f9d77f1433874651d6 SHA256 8d7cbfc6fd9b374f6cd59d2e417d5b4a2e13ce8e74eb69fb82f44bfc225ac008
-MISC ChangeLog 1134 RMD160 05debc877a902a3f59b63064e069972df2335b49 SHA1 0776a8936dc1b591664f447156b5480a3791ec84 SHA256 ffef92bbbd6b70ac36b94aed86b8b1e9147e7457f28a2f284f8248dc58d20790
+EBUILD ensemblist-040126.ebuild 994 RMD160 1ac4c84758108852f7c8b56a2d5ec43225991be9 SHA1 5d9f741c4860d40e7771c2562b53e0bce3586545 SHA256 c9406b58adfaae56141c3ec974f443f9cd562e7e8291533065782ce3df7dbb08
+MISC ChangeLog 1315 RMD160 61c64719e046a0d0d11530fbfcd49b6a6f1e715a SHA1 a2a4947edaadcdbeb79a4602c0ccdb17dca73211 SHA256 2f81687d29b2c4946a556d88c8ddf37b7a135fee661a593ddf6edc9b2411901e
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
index f0b11d7a9aba..af8f1cd636f9 100644
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ b/games-puzzle/ensemblist/ensemblist-040126.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2006 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/ensemblist/ensemblist-040126.ebuild,v 1.6 2006/12/06 16:59:33 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/ensemblist/ensemblist-040126.ebuild,v 1.7 2009/01/23 08:32:19 mr_bones_ Exp $
 
-inherit games
+EAPI=2
+inherit eutils games
 
 DESCRIPTION="Put together several primitives to build a given shape. (C.S.G. Game)"
 HOMEPAGE="http://www.nongnu.org/ensemblist/index_en.html"
@@ -18,17 +19,12 @@ DEPEND="x11-libs/libXmu
 	virtual/glut
 	virtual/glu
 	media-libs/libpng
-	media-libs/libmikmod"
+	media-libs/libmikmod[oss]"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e '/^CC/d' \
-		-e '/strip/d' \
-		-e "s:^DATADIR=.*:DATADIR=${GAMES_DATADIR}/${PN}/datas:" \
-		-e "/^COMPILE_FLAGS/s/-Wall -O3 -fomit-frame-pointer/${CFLAGS}/" \
-		Makefile || die "sed failed"
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+src_compile() {
+	emake DATADIR="\"${GAMES_DATADIR}\"/${PN}/datas" || die "emake failed"
 }
 
 src_install() {
@@ -36,5 +32,6 @@ src_install() {
 	insinto "${GAMES_DATADIR}/${PN}"
 	doins -r datas || die "doins failed"
 	dodoc README Changelog
+	make_desktop_entry ${PN} Ensemblist
 	prepgamesdirs
 }
diff --git a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch b/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
new file mode 100644
index 000000000000..42cc04070eef
--- /dev/null
+++ b/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
@@ -0,0 +1,41 @@
+diff -ru ensemblist-040126.orig/Makefile ensemblist-040126/Makefile
+--- ensemblist-040126.orig/Makefile	2004-01-26 10:37:05.000000000 -0500
++++ ensemblist-040126/Makefile	2009-01-23 03:24:05.000000000 -0500
+@@ -1,17 +1,8 @@
+ NAME=ensemblist
+-CC=gcc
+-ifdef DEBUG
+-DATADIR=/home/rixed/src/ensemblist/datas
+-COMPILE_FLAGS=-Wall -fno-builtin -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wredundant-decls -O0 -g `libmikmod-config --cflags` -DDATADIR=$(DATADIR)
+-LINK_FLAGS=-g -lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lefence -lpthread
+-else
+ DATADIR=$(DESTDIR)/usr/share/$(NAME)
+-COMPILE_FLAGS=-Wall -O3 -fomit-frame-pointer `libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR)
+-LINK_FLAGS=-lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread
+-endif
++COMPILE_FLAGS=`libmikmod-config --cflags` -DDATADIR=$(DATADIR)
++LINK_FLAGS=-L/usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread -lm
+ APPLE_FRAMEWORKS=-framework GLUT -framework Cocoa -framework OpenGL
+-#uncomment the following if you want to compile on MacOS/X
+-#LINK_FLAGS=$(LINK_FLAGS) $(APPLE_FRAMEWORKS)
+ CFILES=$(wildcard *.c)
+ OFILES=$(patsubst %.c,%.o,$(CFILES))
+ 
+@@ -22,15 +13,10 @@
+ all: $(NAME)
+ 
+ $(NAME): $(OFILES)
+-	@echo '$(COL)$@$(NORM)'
+-	$(CC) $(COMPILE_FLAGS) $(LINK_FLAGS) $^ -o $@
+-ifndef DEBUG
+-	strip $(NAME)
+-endif
++	$(CC) $(CFLAGSLD) $(COMPILE_FLAGS) $^ -o $@ $(LINK_FLAGS) 
+ 
+ .c.o:
+-	@echo '$(COL)$@$(NORM)'
+-	$(CC) $(COMPILE_FLAGS) -c $<
++	$(CC) $(CFLAGS) $(COMPILE_FLAGS) -c $<
+ 
+ clean:
+ 	@echo '$(COL)$@$(NORM)'