fixup nvidia detection and add fbsd support - patch from Diego Pettenò (bug #149718)

Package-Manager: portage-2.1.2_pre1-r4

5 files changed, 73 insertions, 27 deletions

diff --git a/games-sports/foobillard/ChangeLog b/games-sports/foobillard/ChangeLog
index 8f843d718d4c..d4d4c1630251 100644
--- a/games-sports/foobillard/ChangeLog
+++ b/games-sports/foobillard/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/foobillard
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.10 2006/01/29 08:04:42 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/ChangeLog,v 1.11 2006/10/01 22:24:06 mr_bones_ Exp $
+
+  01 Oct 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/foobillard-3.0a-fbsd.patch, foobillard-3.0a.ebuild:
+  fixup nvidia detection and add fbsd support - patch from Diego Pettenà (bug
+  #149718)
 
   29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   foobillard-3.0a.ebuild:
diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
index ef381a0c2aa8..b0be540360db 100644
--- a/games-sports/foobillard/Manifest
+++ b/games-sports/foobillard/Manifest
@@ -1,15 +1,24 @@
-MD5 3fc7fddaa82c6968d6e632c00560f903 ChangeLog 2321
-RMD160 77f0eadf48f7be0bb5484bb4eaf644ba260d5eaa ChangeLog 2321
-SHA256 fdc995bbf12c651986dfbbb6cb4c47461840ab608ba5abd1bce0660860325c7c ChangeLog 2321
-MD5 11223d31662deec372e491cf27384d31 files/digest-foobillard-3.0a 68
-RMD160 5fe110762c3cfd88a8110ed883ad0b7f4364748b files/digest-foobillard-3.0a 68
-SHA256 c48f07b1fc0deb256e8ffa1cd7f07c3819ae55a6fce3f23253ab44b5047be02e files/digest-foobillard-3.0a 68
+AUX foobillard-3.0a-fbsd.patch 930 RMD160 969f6f25504293892ba9fba212f34e09f77e094f SHA1 a3579166e13f0a085e5e601d6aea54b010cd549a SHA256 c08aa1e217408fee5729e3e4cc407bf183f5232096ffe0092a3949e9ea6bcffa
+MD5 f418c95351e6b6edd956e6d5c826a0e2 files/foobillard-3.0a-fbsd.patch 930
+RMD160 969f6f25504293892ba9fba212f34e09f77e094f files/foobillard-3.0a-fbsd.patch 930
+SHA256 c08aa1e217408fee5729e3e4cc407bf183f5232096ffe0092a3949e9ea6bcffa files/foobillard-3.0a-fbsd.patch 930
+AUX foobillard-3.0a-no_nvidia.patch 770 RMD160 db56ca364d8c18c86bbada17a1d465edd9f9b54d SHA1 0d9904ab49426821febb8bd6457b46c6f462e07e SHA256 d94d36c24b8a7d8629bf028a8fba28ed5cf542c5ec2ccdcbf782373b7b9a928b
 MD5 8eaf137a771395b81cfdbe6796fc612c files/foobillard-3.0a-no_nvidia.patch 770
 RMD160 db56ca364d8c18c86bbada17a1d465edd9f9b54d files/foobillard-3.0a-no_nvidia.patch 770
 SHA256 d94d36c24b8a7d8629bf028a8fba28ed5cf542c5ec2ccdcbf782373b7b9a928b files/foobillard-3.0a-no_nvidia.patch 770
-MD5 fc1626b7a2186b6728c86f8a2170d383 foobillard-3.0a.ebuild 1394
-RMD160 bbaff170611d25a47fa6085b2a10a2302ba8dedb foobillard-3.0a.ebuild 1394
-SHA256 a36dfcb929105c70259c5c47deb1f746ed4600046249a7d18b6e7f1738f12d49 foobillard-3.0a.ebuild 1394
+DIST foobillard-3.0a.tar.gz 1138477 RMD160 9d5a2d271ca270563592c5f6cf23533447c51483 SHA1 1caa51a201b55883640b5c5b1e9fde20fc71a095 SHA256 d05807077bdba32c4ca1d369344ac983675dc859cb7b192fca4196f23b89b137
+EBUILD foobillard-3.0a.ebuild 1376 RMD160 f097d5e79ee1738becacc96cb59df681c5a4fc0a SHA1 b081cac80a51a626d77eeb4be4f3a2f4c5f69fb9 SHA256 8759c9a74b845ba8b2d8842d970e2f0f09f0662071facda0e72fe884f7825a58
+MD5 7a24f55d386d3f9186a33e7ae0c8d5d3 foobillard-3.0a.ebuild 1376
+RMD160 f097d5e79ee1738becacc96cb59df681c5a4fc0a foobillard-3.0a.ebuild 1376
+SHA256 8759c9a74b845ba8b2d8842d970e2f0f09f0662071facda0e72fe884f7825a58 foobillard-3.0a.ebuild 1376
+MISC ChangeLog 2524 RMD160 db429d2076206e4d4f048d9b8164d17d734a178e SHA1 9ab36c57e4c4f9e6371253aa888da4d48a73cf74 SHA256 a17e77d288a216f1c90d5ba7f35ed2498e639e4b86c333498bc8ce2ecbe0ef1c
+MD5 fa1d660e046bcae245047a8d5b9ce713 ChangeLog 2524
+RMD160 db429d2076206e4d4f048d9b8164d17d734a178e ChangeLog 2524
+SHA256 a17e77d288a216f1c90d5ba7f35ed2498e639e4b86c333498bc8ce2ecbe0ef1c ChangeLog 2524
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 23e79b6737d29083caa6eb137e9545d9 files/digest-foobillard-3.0a 250
+RMD160 a47d24c2390cba34cda47b96351a367c6d8749a5 files/digest-foobillard-3.0a 250
+SHA256 eb3cbd6fcbf333e4e9454049ddd3a9061a0c4f9f1a1c0e0b0a855a90357f0429 files/digest-foobillard-3.0a 250
diff --git a/games-sports/foobillard/files/digest-foobillard-3.0a b/games-sports/foobillard/files/digest-foobillard-3.0a
index 124f20c827b6..727d0b80b2de 100644
--- a/games-sports/foobillard/files/digest-foobillard-3.0a
+++ b/games-sports/foobillard/files/digest-foobillard-3.0a
@@ -1 +1,3 @@
 MD5 c2d92edeaaf8bfb18aa26f1c79931b7d foobillard-3.0a.tar.gz 1138477
+RMD160 9d5a2d271ca270563592c5f6cf23533447c51483 foobillard-3.0a.tar.gz 1138477
+SHA256 d05807077bdba32c4ca1d369344ac983675dc859cb7b192fca4196f23b89b137 foobillard-3.0a.tar.gz 1138477
diff --git a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
new file mode 100644
index 000000000000..301260cb8360
--- /dev/null
+++ b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
@@ -0,0 +1,29 @@
+Index: foobillard-3.0a/configure.in
+===================================================================
+--- foobillard-3.0a.orig/configure.in
++++ foobillard-3.0a/configure.in
+@@ -13,7 +13,7 @@ dnl Checks for libraries.
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h ft2build.h)
++AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h ft2build.h endian.h sys/endian.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+Index: foobillard-3.0a/src/billard3d.c
+===================================================================
+--- foobillard-3.0a.orig/src/billard3d.c
++++ foobillard-3.0a/src/billard3d.c
+@@ -24,7 +24,11 @@
+ #include <string.h>
+ #include <math.h>
+ #include <unistd.h>
++#ifdef HAVE_ENDIAN_H
+ #include <endian.h>
++#elif defined(HAVE_SYS_ENDIAN_H)
++#include <sys/endian.h>
++#endif
+ 
+ #ifndef USE_SDL
+ #include <GL/glut.h>
diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild
index 69b160722da6..45938ac3e1ab 100644
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.7 2006/01/29 08:04:42 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.8 2006/10/01 22:24:06 mr_bones_ Exp $
 
-inherit eutils games
+inherit eutils autotools games
 
 DESCRIPTION="8ball, 9ball, snooker and carambol game"
 HOMEPAGE="http://foobillard.sunsite.dk/"
@@ -13,10 +13,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="sdl"
 
-DEPEND="|| ( ( x11-libs/libXaw
-				x11-libs/libXi )
-			virtual/x11
-		)
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXi
 	virtual/opengl
 	>=media-libs/freetype-2.0.9
 	>=media-libs/libpng-1.2.1
@@ -26,18 +24,24 @@ DEPEND="|| ( ( x11-libs/libXaw
 			virtual/glu
 			virtual/glut )
 	)"
+DEPEND="${RDEPEND}
+	app-admin/eselect"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-no_nvidia.patch
+	epatch \
+		"${FILESDIR}"/${P}-no_nvidia.patch \
+		"${FILESDIR}"/${P}-fbsd.patch
+
+	eautoreconf
 }
 
 src_compile() {
-	local myconf=""
-	[ "$(ls /usr/include/GL/gl.h -al | awk '{print $NF}' | cut -d/ -f5)" == "nvidia" ] \
-		&& myconf="--enable-nvidia=yes" \
-		|| myconf="--enable-nvidia=no"
+	local myconf
+	[[ "$(eselect opengl show)" == 'nvidia' ]] \
+		&& myconf='--enable-nvidia=yes' \
+		|| myconf='--enable-nvidia=no'
 
 	egamesconf \
 		--enable-sound \
@@ -49,13 +53,10 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README README.FONTS
 	doman foobillard.6
-
-	insinto /usr/share/pixmaps
-	newins data/full_symbol.png foobillard.png
-	make_desktop_entry foobillard Foobillard foobillard.png
-
+	newicon data/full_symbol.png foobillard.png
+	make_desktop_entry foobillard Foobillard
 	prepgamesdirs
 }