Some more build fixes.

(Portage version: 2.1.2_pre1)

6 files changed, 159 insertions, 13 deletions

diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog
index 30ebbb216afb..0553566741e1 100644
--- a/games-puzzle/fish-fillets/ChangeLog
+++ b/games-puzzle/fish-fillets/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-puzzle/fish-fillets
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.20 2006/09/20 07:37:57 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.21 2006/09/20 23:06:58 vapier Exp $
+
+  20 Sep 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/fish-fillets-0.7.3-check-for-X.patch,
+  +files/fish-fillets-0.7.3-custom-datadir.patch,
+  -files/fish-fillets-0.7.3-gcc4.patch,
+  +files/fish-fillets-0.7.3-no-local-paths.patch,
+  +files/fish-fillets-0.7.3-use-lua-pkg-config.patch,
+  fish-fillets-0.7.3.ebuild:
+  Some more build fixes.
 
   20 Sep 2006; Michael Sterrett <mr_bones_@gentoo.org>
   +files/fish-fillets-0.7.3-gcc4.patch, fish-fillets-0.7.3.ebuild:
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-check-for-X.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-check-for-X.patch
new file mode 100644
index 000000000000..741c4d8f833e
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-check-for-X.patch
@@ -0,0 +1,56 @@
+--- configure.in
++++ configure.in
+@@ -89,21 +91,31 @@ AC_CHECK_LIB([SDL_ttf], [TTF_OpenFont],
+ 
+ ###################################################
+ # Test X11
+-OLD_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+-AC_TRY_COMPILE([
+-    #include "SDL.h"
+-    #include "SDL_syswm.h"
+-    #include <X11/Xutil.h>
+-    ], [
+-    SDL_SysWMinfo info;
+-    info.subsystem = SDL_SYSWM_X11;
+-    ], [have_x11="yes"], [have_x11="no"])
+-CPPFLAGS="$OLD_CPPFLAGS"
+-if test "x$have_x11" = xyes; then
+-    AC_DEFINE(HAVE_X11)
++X_LIBS=""
++AC_ARG_WITH(X,
++	[AC_HELP_STRING([--with-x],[enable X window manager support [default=detect]])],
++	[with_x11=$withval],[with_x11="maybe"])
++if test "x$with_x11" != "xno" ; then
++	AC_CHECK_LIB([X11], [Xutf8TextListToTextProperty], [with_x11="yes"], [with_x11="no"])
++	if test "x$with_x11" != "xno" ; then
++		OLD_CPPFLAGS="$CPPFLAGS"
++		CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
++		AC_TRY_COMPILE([
++		    #include "SDL.h"
++		    #include "SDL_syswm.h"
++		    #include <X11/Xutil.h>
++		    ], [
++		    SDL_SysWMinfo info;
++		    info.subsystem = SDL_SYSWM_X11;
++		    ], [have_x11="yes"], [have_x11="no"])
++		CPPFLAGS="$OLD_CPPFLAGS"
++		if test "x$have_x11" = xyes; then
++		    AC_DEFINE(HAVE_X11)
++			X_LIBS="-lX11"
++		fi
++	fi
+ fi
+-
++AC_SUBST(X_LIBS)
+ 
+ ###################################################
+ # Test FriBidi
+--- src/game/Makefile.am
++++ src/game/Makefile.am
+@@ -18,4 +18,4 @@ ICON_LIBS =
+ endif
+ 
+ 
+-fillets_LDADD = $(ICON_LIBS) ../menu/libmenu.a ../level/liblevel.a ../state/libstate.a ../option/liboption.a ../plan/libplan.a ../widget/libwidget.a ../effect/libeffect.a ../gengine/libgengine.a $(SDL_GFX_LIBS) $(SDL_LIBS) $(LUA_LIBS) $(BOOST_LIBS) $(FRIBIDI_LIBS)
++fillets_LDADD = $(ICON_LIBS) ../menu/libmenu.a ../level/liblevel.a ../state/libstate.a ../option/liboption.a ../plan/libplan.a ../widget/libwidget.a ../effect/libeffect.a ../gengine/libgengine.a $(SDL_GFX_LIBS) $(SDL_LIBS) $(LUA_LIBS) $(BOOST_LIBS) $(FRIBIDI_LIBS) $(X_LIBS)
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-custom-datadir.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-custom-datadir.patch
new file mode 100644
index 000000000000..3965d9a36c84
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-custom-datadir.patch
@@ -0,0 +1,24 @@
+--- configure.in
++++ configure.in
+@@ -151,6 +160,11 @@ case "$target" in
+         ;;
+ esac
+ 
++###################################################
++# Mung up datadir if need be
++if test "${datadir}" = '${datarootdir}' ; then
++	datadir='${datarootdir}/games/${PACKAGE}'
++fi
+ 
+ ###################################################
+ # Debug on/off
+--- src/gengine/Makefile.am
++++ src/gengine/Makefile.am
+@@ -1,6 +1,6 @@
+ 
+ INCLUDES = $(SDL_CFLAGS) $(LUA_CFLAGS) $(BOOST_CFLAGS)
+-AM_CPPFLAGS = -DSYSTEM_DATA_DIR=\""$(datadir)/games/@PACKAGE@"\"
++AM_CPPFLAGS = -DSYSTEM_DATA_DIR=\""@datadir@"\"
+ 
+ if WITH_BOOST
+ FSPATH_IMPL = FsPath_boost.cpp
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-no-local-paths.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-no-local-paths.patch
new file mode 100644
index 000000000000..72b7c1f410b9
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-no-local-paths.patch
@@ -0,0 +1,12 @@
+--- configure.in
++++ configure.in
+@@ -13,9 +13,6 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-CPPFLAGS="-I/usr/local/include $CPPFLAGS"
+-LIBS="-L/usr/local/lib $LIBS"
+-
+ ###################################################
+ # Check for libm
+ AC_CHECK_LIB(m, sin, LIBS="$LIBS -lm")
diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-use-lua-pkg-config.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-use-lua-pkg-config.patch
new file mode 100644
index 000000000000..374045899d91
--- /dev/null
+++ b/games-puzzle/fish-fillets/files/fish-fillets-0.7.3-use-lua-pkg-config.patch
@@ -0,0 +1,43 @@
+--- configure.in
++++ configure.in
+@@ -36,22 +36,24 @@ dnl Debian, and possibly other systems, 
+         LUA_CFLAGS="`[$LUACONFIG --include]`"
+         LUA_LIBS="`[$LUACONFIG --static]`"
+     else dnl ...otherwise, attempt to guess
+-        LUA_CFLAGS=""
+-        LUA_LIBS=""
+-        AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua",
+-        [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50",
+-        [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0",
+-            [AC_MSG_ERROR([*** Lua5 is required.
+-             Try --with-lua=PREFIX
+-             You can download lua from http://www.lua.org])],
+-             $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
+-
+-        AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib",
+-        [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50",
+-        [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0",
+-            [AC_MSG_ERROR([*** Lualib5 is required.
+-             You can download lua from http://www.lua.org])],
+-             $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
++        PKG_CHECK_MODULES(LUA, lua, [], [
++            LUA_CFLAGS=""
++            LUA_LIBS=""
++            AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua",
++            [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50",
++            [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0",
++                [AC_MSG_ERROR([*** Lua5 is required.
++                 Try --with-lua=PREFIX
++                 You can download lua from http://www.lua.org])],
++                 $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
++
++            AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib",
++            [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50",
++            [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0",
++                [AC_MSG_ERROR([*** Lualib5 is required.
++                 You can download lua from http://www.lua.org])],
++                 $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
++        ])
+    fi
+ fi
+ AC_SUBST(LUA_CFLAGS)
diff --git a/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
index 9207523a0f3d..f88daa7d885d 100644
--- a/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild,v 1.3 2006/09/20 07:37:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.7.3.ebuild,v 1.4 2006/09/20 23:06:58 vapier Exp $
 
 inherit autotools eutils games
 
 DATA_PV="0.7.1"
 DESCRIPTION="Underwater puzzle game - find a safe way out"
-HOMEPAGE="http://fillets.sf.net"
+HOMEPAGE="http://fillets.sourceforge.net/"
 SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
 	mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+IUSE="X"
 
 DEPEND=">=media-libs/libsdl-1.2
 	>=media-libs/sdl-mixer-1.2.5
 	>=media-libs/sdl-image-1.2.2
+	X? ( x11-libs/libX11 )
 	media-libs/sdl-ttf
 	>=dev-lang/lua-5"
 
@@ -26,24 +27,25 @@ S=${WORKDIR}/fillets-ng-${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}"/${P}-check-for-X.patch
+	epatch "${FILESDIR}"/${P}-custom-datadir.patch
+	epatch "${FILESDIR}"/${P}-no-local-paths.patch
+	epatch "${FILESDIR}"/${P}-use-lua-pkg-config.patch
 	eautoreconf
 }
 
 src_compile() {
-	CPPFLAGS="-DSYSTEM_DATA_DIR=\"\\\"${GAMES_DATADIR}/${PN}\\\"\"" \
-	egamesconf \
-		--with-lua="/usr" || die
+	egamesconf $(use_with X) || die
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
-	dodir "${GAMES_DATADIR}/${PN}"
-	cd ../fillets-ng-data-${DATA_PV}
-	cp -r font music sound doc images script "${D}${GAMES_DATADIR}/${PN}" \
-		|| die "cp failed"
+	insinto "${GAMES_DATADIR}/${PN}"
+	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
+	rm -f COPYING
+	doins -r * || die "doins failed"
 	newicon images/icon.png fillets.png
 	make_desktop_entry fillets FishFillets fillets.png
 	prepgamesdirs