Added library patch and opengl USE flag as requested by flameeyes. Closing bug #126835.

Package-Manager: portage-2.1_pre6-r2

4 files changed, 71 insertions, 13 deletions

diff --git a/games-puzzle/flobopuyo/ChangeLog b/games-puzzle/flobopuyo/ChangeLog
index 58094f4ba0e8..6f1d07769c1f 100644
--- a/games-puzzle/flobopuyo/ChangeLog
+++ b/games-puzzle/flobopuyo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-puzzle/flobopuyo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/ChangeLog,v 1.7 2006/03/12 04:31:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/ChangeLog,v 1.8 2006/03/20 20:18:17 wolf31o2 Exp $
+
+  20 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/flobopuyo-0.20-libs.patch, flobopuyo-0.20.ebuild:
+  Added library patch and opengl USE flag as requested by flameeyes. Closing
+  bug #126835.
 
   12 Mar 2006; Michael Sterrett <mr_bones_@gentoo.org>
   flobopuyo-0.20.ebuild:
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
index c965c353f566..81be8af34656 100644
--- a/games-puzzle/flobopuyo/Manifest
+++ b/games-puzzle/flobopuyo/Manifest
@@ -1,6 +1,6 @@
-MD5 3f68c66f97ed9a90877a2765ca3bdfc8 ChangeLog 1247
-RMD160 baf8e73bbc67daf9f646376e7e5f3976d04a199a ChangeLog 1247
-SHA256 bb72353e53cd55773c546924e65c1a18ac9f1f99e2fc6df1f5a77b732be243b1 ChangeLog 1247
+MD5 efbcca11c06914c1eda704b6098b4f28 ChangeLog 1452
+RMD160 ba0d07919de640bbfda9995289fba7c009ca6104 ChangeLog 1452
+SHA256 29cf2ef160a87a54938b011d79b173fb64356db33f61672e82d5e04f7310da87 ChangeLog 1452
 MD5 be0bda1e61a418231b438f1d8ac57d2a files/digest-flobopuyo-0.20 64
 RMD160 ba05e9366060b4c27a6f62fc6024ff52f3a56884 files/digest-flobopuyo-0.20 64
 SHA256 b58145d77d76ae811f45bda793698f438f082987d221a4505d744b33378be685 files/digest-flobopuyo-0.20 64
@@ -10,9 +10,12 @@ SHA256 fa0a34621cd7700109fb317ab394eaf4860646ef776d291318e759173d7e5f80 files/fl
 MD5 caf0add0ab8db33915b0e5f39f7a83cc files/flobopuyo-0.20-gcc41.patch 447
 RMD160 e084e5ba8cde247fa17687d8bcaea3ca50b801c6 files/flobopuyo-0.20-gcc41.patch 447
 SHA256 a3cbc69a50dcdbe810353afbba1eaab3dc44341ddccff9f913ff1cb70d079da2 files/flobopuyo-0.20-gcc41.patch 447
-MD5 cd133eb61fce23edb0e099635158b3bd flobopuyo-0.20.ebuild 1142
-RMD160 9d7edcd859b3ad46c5b433b0000174fbf08eb5aa flobopuyo-0.20.ebuild 1142
-SHA256 4295a3bcd2267ac182f1b83bc485fd08d9fe9a3a6f0dfb03122e5aae688d1b2b flobopuyo-0.20.ebuild 1142
+MD5 9ebc7b7f7dd4085ca3dd01bb2b43eed4 files/flobopuyo-0.20-libs.patch 1763
+RMD160 18223569555d9223f1027ce8ebf09a43f814fa72 files/flobopuyo-0.20-libs.patch 1763
+SHA256 6b33ec6f589e62faa5e2340034041576228357c32278522bde50f35417c3cb72 files/flobopuyo-0.20-libs.patch 1763
+MD5 e99b93e71c5e20cd216b37fdb8b859dd flobopuyo-0.20.ebuild 1347
+RMD160 c93dae498349e7311fb51a718bf458ca2b4b203d flobopuyo-0.20.ebuild 1347
+SHA256 09ec811b85250026936b2a046300f59faa47c4ea317150438fb152c6b439c207 flobopuyo-0.20.ebuild 1347
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
new file mode 100644
index 000000000000..f7e787e02df5
--- /dev/null
+++ b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
@@ -0,0 +1,43 @@
+Index: flobopuyo-0.20/Makefile
+===================================================================
+--- flobopuyo-0.20.orig/Makefile
++++ flobopuyo-0.20/Makefile
+@@ -49,7 +49,8 @@ LDFLAGS=
+ 
+ ifneq ($(PLATFORM), $(CYGWIN_VERSION))
+ CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
+-LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
++LDFLAGS:=$(LDFLAGS)
++LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
+ endif
+ 
+ HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
+@@ -78,7 +79,8 @@ endif
+ # Win32
+ ifeq ($(PLATFORM), $(CYGWIN_VERSION))
+ CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
+-LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
++LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
++LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
+ endif
+ 
+ ifeq ($(ENABLE_AUDIO), true)
+@@ -90,7 +92,8 @@ ifeq ($(ENABLE_OPENGL), true)
+ CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
+ OBJFILES:=$(OBJFILES) glSDL.o
+ ifeq ($(PLATFORM), Linux)
+-LDFLAGS:=$(LDFLAGS) -lGL
++LDFLAGS:=$(LDFLAGS)
++LIBS:=$(LIBS) -lGL
+ endif
+ endif
+ 
+@@ -110,7 +113,7 @@ CXXFLAGS=${CFLAGS}
+ all: prelude flobopuyo
+ 
+ flobopuyo: ${OBJFILES}
+-	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
++	@echo "[flobopuyo]" && $(CXX) $(CFLAGS) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image
+ 	@echo "--------------------------------------"
+ 	@echo " Compilation finished"
+ 	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild
index 923528327bbd..4fc194046592 100644
--- a/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild
+++ b/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild,v 1.8 2006/03/12 04:31:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/flobopuyo/flobopuyo-0.20.ebuild,v 1.9 2006/03/20 20:18:17 wolf31o2 Exp $
 
 inherit toolchain-funcs eutils games
 
@@ -11,12 +11,12 @@ SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
-IUSE=""
+IUSE="opengl"
 
 DEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-mixer
-	virtual/opengl"
+	opengl? ( virtual/opengl )"
 
 src_unpack() {
 	unpack ${A}
@@ -24,19 +24,26 @@ src_unpack() {
 
 	epatch \
 		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-gcc41.patch
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-libs.patch
 
 	find . -type f -name ".*" -exec rm -f \{\} \;
 	sed -i \
 		-e "/strip/d" \
 		-e "s:^DATADIR=.*:DATADIR=\"${GAMES_DATADIR}/${PN}\":" \
 		-e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:${GAMES_BINDIR}:" \
-		-e "/^CC=/s/g++/$(tc-getCXX)/" \
-		-e "/^CXX=/s/g++/$(tc-getCXX)/" \
+		-e "s:^CFLAGS=:CFLAGS+=:" \
+		-e "/^LDFLAGS=/d" \
 		Makefile \
 		|| die "sed failed"
 }
 
+src_compile() {
+	use opengl && want_opengl=true || want_opengl=false
+	emake CC="$(tc-getCXX)" CXX="$(tc-getCXX)" \
+		ENABLE_OPENGL="${want_opengl}" || die "emake failed"
+}
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc Changelog TODO