menu/manpage/cleanup #76689

diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
index 2110524413db802324cc9d2ca7a599303c350617..48a8bc116a4dc6653bfb94cdd898e7e2ef8ed978 100644 (file)
--- a/games-sports/foobillard/Manifest
+++ b/games-sports/foobillard/Manifest
@@ -1,9 +1,15 @@
-MD5 bc7c41c841840fa7229f58ab6506f99c foobillard-2.9.ebuild 1171
-MD5 207c8c2a548589591ff0c32564ce5399 foobillard-2.8.ebuild 1118
-MD5 6587eed72952c290be58ce861fd4b799 foobillard-3.0a.ebuild 1221
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 bc8b22fed3e37c1cd4597e480d87069b ChangeLog 2200
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 4827c3043c229b4ec77086d4554e7a7a files/digest-foobillard-2.9 67
-MD5 7e9ec0cee63a42f327ed7d5de7127028 files/digest-foobillard-2.8 67
-MD5 8eaf137a771395b81cfdbe6796fc612c files/foobillard-3.0a-no_nvidia.patch 770
+MD5 3add3889f7af472f0e374e626533974d foobillard-3.0a.ebuild 1336
 MD5 11223d31662deec372e491cf27384d31 files/digest-foobillard-3.0a 68
+MD5 8eaf137a771395b81cfdbe6796fc612c files/foobillard-3.0a-no_nvidia.patch 770
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB21V7roRuSHgZdywRAsX+AJ4vckrK7cosd95faiI+J067dQkYCgCgj1pd
+bjwyU9Z1l7avMQesjoLXP00=
+=6FhW
+-----END PGP SIGNATURE-----

diff --git a/games-sports/foobillard/files/digest-foobillard-2.8 b/games-sports/foobillard/files/digest-foobillard-2.8
deleted file mode 100644 (file)
index 077f5b4..0000000
--- a/games-sports/foobillard/files/digest-foobillard-2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 afe2e096743cbf41e0a9537cceb7f857 foobillard-2.8.tar.gz 1098364

diff --git a/games-sports/foobillard/files/digest-foobillard-2.9 b/games-sports/foobillard/files/digest-foobillard-2.9
deleted file mode 100644 (file)
index 99aeed7..0000000
--- a/games-sports/foobillard/files/digest-foobillard-2.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b8b10d7d3ade07a9e0c497165beadbca foobillard-2.9.tar.gz 1136620

diff --git a/games-sports/foobillard/foobillard-2.8.ebuild b/games-sports/foobillard/foobillard-2.8.ebuild
deleted file mode 100644 (file)
index b5d7303..0000000
--- a/games-sports/foobillard/foobillard-2.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-2.8.ebuild,v 1.3 2004/06/24 23:24:19 agriffis Exp $
-
-inherit games
-
-DESCRIPTION="8ball, 9ball, snooker and carambol game"
-HOMEPAGE="http://foobillard.sunsite.dk/"
-SRC_URI="http://foobillard.sunsite.dk/dnl/${P}.tar.gz"
-
-KEYWORDS="x86 ppc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="sdl"
-
-DEPEND="virtual/x11
-       virtual/opengl
-       >=media-libs/freetype-2.0.9
-       >=media-libs/libpng-1.2.1
-       || (
-               sdl? ( media-libs/libsdl )
-               ( virtual/glu virtual/glut )
-       )"
-
-src_compile() {
-       local myconf=""
-       [ "`ls /usr/include/GL/gl.h -al | awk '{print $NF}' | cut -d/ -f5`" == "nvidia" ] \
-               && myconf="--enable-nvidia" \
-               || myconf="--disable-nvidia"
-       myconf="${myconf} `use_enable sdl SDL`"
-       use sdl \
-               && myconf="${myconf} --disable-glut" \
-               || myconf="${myconf} --enable-glut"
-
-       egamesconf \
-               --enable-sound \
-               ${myconf} \
-               || die
-       emake || die
-}
-
-src_install() {
-       make DESTDIR=${D} install || die
-       dodoc README README.FONTS AUTHORS NEWS ChangeLog
-       prepgamesdirs
-}

diff --git a/games-sports/foobillard/foobillard-2.9.ebuild b/games-sports/foobillard/foobillard-2.9.ebuild
deleted file mode 100644 (file)
index bd1c5b5..0000000
--- a/games-sports/foobillard/foobillard-2.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-2.9.ebuild,v 1.5 2004/06/24 23:24:19 agriffis Exp $
-
-inherit games
-
-DESCRIPTION="8ball, 9ball, snooker and carambol game"
-HOMEPAGE="http://foobillard.sunsite.dk/"
-SRC_URI="http://foobillard.sunsite.dk/dnl/${P}.tar.gz"
-
-KEYWORDS="x86 ppc amd64"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="sdl"
-
-DEPEND="virtual/x11
-       virtual/opengl
-       >=media-libs/freetype-2.0.9
-       >=media-libs/libpng-1.2.1
-       || (
-               sdl? ( media-libs/libsdl )
-               (
-                       virtual/glu
-                       virtual/glut )
-       )"
-
-src_compile() {
-       local myconf=""
-       [ "$(ls /usr/include/GL/gl.h -al | awk '{print $NF}' | cut -d/ -f5)" == "nvidia" ] \
-               && myconf="--enable-nvidia" \
-               || myconf="--disable-nvidia"
-       myconf="${myconf} $(use_enable sdl SDL)"
-       use sdl \
-               && myconf="${myconf} --disable-glut" \
-               || myconf="${myconf} --enable-glut"
-
-       egamesconf \
-               --enable-sound \
-               ${myconf} \
-               || die
-       emake || die "emake failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
-       dodoc README README.FONTS AUTHORS NEWS ChangeLog
-       prepgamesdirs
-}

diff --git a/games-sports/foobillard/foobillard-3.0a.ebuild b/games-sports/foobillard/foobillard-3.0a.ebuild
index 78692582989dd7c8c98db0d4df4d45e72cb71cd1..7b345174fe994a70eb7705f803898193b291986f 100644 (file)
--- a/games-sports/foobillard/foobillard-3.0a.ebuild
+++ b/games-sports/foobillard/foobillard-3.0a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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.5 2004/06/24 23:24:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/foobillard/foobillard-3.0a.ebuild,v 1.6 2005/01/05 02:48:21 vapier Exp $
 
 inherit eutils games
 
@@ -8,9 +8,9 @@ DESCRIPTION="8ball, 9ball, snooker and carambol game"
 HOMEPAGE="http://foobillard.sunsite.dk/"
 SRC_URI="http://foobillard.sunsite.dk/dnl/${P}.tar.gz"
 
-KEYWORDS="x86 ppc amd64"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE="sdl"
 
 DEPEND="virtual/x11
@@ -24,19 +24,22 @@ DEPEND="virtual/x11
                        virtual/glut )
        )"
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-no_nvidia.patch
+}
+
 src_compile() {
-       epatch ${FILESDIR}/${P}-no_nvidia.patch
        local myconf=""
        [ "$(ls /usr/include/GL/gl.h -al | awk '{print $NF}' | cut -d/ -f5)" == "nvidia" ] \
                && myconf="--enable-nvidia=yes" \
                || myconf="--enable-nvidia=no"
-       myconf="${myconf} $(use_enable sdl SDL)"
-       use sdl \
-               && myconf="${myconf} --disable-glut" \
-               || myconf="${myconf} --enable-glut"
 
        egamesconf \
                --enable-sound \
+               $(use_enable sdl SDL) \
+               $(use_enable !sdl glut) \
                ${myconf} \
                || die
        emake || die "emake failed"
@@ -45,5 +48,11 @@ src_compile() {
 src_install() {
        make DESTDIR="${D}" install || die "make 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
+
        prepgamesdirs
 }