From c9d3a50c0baa32b79ae50771986b26ae555e9384 Mon Sep 17 00:00:00 2001 From: Alfredo Tupone Date: Mon, 13 Feb 2006 22:16:11 +0000 Subject: modular X dep fix and Bug 106706 Package-Manager: portage-2.1_pre4-r1 --- games-fps/fuhquake-bin/ChangeLog | 8 +++-- games-fps/fuhquake-bin/Manifest | 24 ++++++------- .../fuhquake-bin/files/digest-fuhquake-bin-0.31 | 6 ++++ games-fps/fuhquake-bin/fuhquake-bin-0.31.ebuild | 40 +++++++++++++++++----- 4 files changed, 54 insertions(+), 24 deletions(-) (limited to 'games-fps') diff --git a/games-fps/fuhquake-bin/ChangeLog b/games-fps/fuhquake-bin/ChangeLog index 6386bcabfb77..5a6846e29656 100644 --- a/games-fps/fuhquake-bin/ChangeLog +++ b/games-fps/fuhquake-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/fuhquake-bin -# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/fuhquake-bin/ChangeLog,v 1.1 2004/12/28 05:25:34 vapier Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/fuhquake-bin/ChangeLog,v 1.2 2006/02/13 22:16:11 tupone Exp $ + + 13 Feb 2006; fuhquake-bin-0.31.ebuild: + Respect use flags Bug 106706 (thanks to Adrian Fruehwirth) + Modular X dependency fix *fuhquake-bin-0.31 (28 Dec 2004) diff --git a/games-fps/fuhquake-bin/Manifest b/games-fps/fuhquake-bin/Manifest index 17f665fc6e5c..7159daa485fb 100644 --- a/games-fps/fuhquake-bin/Manifest +++ b/games-fps/fuhquake-bin/Manifest @@ -1,14 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 abd4ff108a47ce60557d07da7fa38981 ChangeLog 357 -MD5 073dc58c3b27fc65dbeafdf60586cb34 files/digest-fuhquake-bin-0.31 204 -MD5 08e2a5c52f2df8e38273c71c814edf69 fuhquake-bin-0.31.ebuild 1344 +MD5 540205b77734c3236200d0da60fd135f ChangeLog 507 +RMD160 70e90daa4607d1252daa6e9c54eec31abda974f4 ChangeLog 507 +SHA256 0848ec3d2c7dddf99d4a8bd1c744cf1244791932b1cbc161a8bf601c703962e7 ChangeLog 507 +MD5 f02cb9769f03cdec0c9cbd39ba477203 files/digest-fuhquake-bin-0.31 750 +RMD160 b43e25db3452bca70109b73da02eb8b597342a4c files/digest-fuhquake-bin-0.31 750 +SHA256 9af261339d7881e9c5a644bd97c6c76a311d723eede21df32081e90036ee8450 files/digest-fuhquake-bin-0.31 750 +MD5 c51d2e516e78a4f4b96c07a35e33b7c0 fuhquake-bin-0.31.ebuild 1633 +RMD160 56205634b4a1e839f1feae062c6d8dd342f23ef3 fuhquake-bin-0.31.ebuild 1633 +SHA256 e5cfda36815bdc4e95c599ff35604b480599cf3a62800c1863035db81cd74be6 fuhquake-bin-0.31.ebuild 1633 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDbTbLgIKl8Uu19MoRAkUrAJ9tSgd/J6pW2frF/sd9gVoCPvB9FgCeMtpg -t0xbHq5uc5mKiRQJi8yxAYk= -=lL68 ------END PGP SIGNATURE----- +RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 +SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 diff --git a/games-fps/fuhquake-bin/files/digest-fuhquake-bin-0.31 b/games-fps/fuhquake-bin/files/digest-fuhquake-bin-0.31 index 43f7edac0d50..8ee4570c78ec 100644 --- a/games-fps/fuhquake-bin/files/digest-fuhquake-bin-0.31 +++ b/games-fps/fuhquake-bin/files/digest-fuhquake-bin-0.31 @@ -1,3 +1,9 @@ MD5 479a6f8dad1174333819e850b3aca8c1 fuhquake-linux-v0.31.zip 4520020 +RMD160 79fabc60f3834c5bc3024848b68e023355fb1180 fuhquake-linux-v0.31.zip 4520020 +SHA256 f9a9bce98a2a8f76f75c344b14a338b33ebc9d0e9b018e0965a1080586b9cda4 fuhquake-linux-v0.31.zip 4520020 MD5 eb2a89c0f89b945705f1bc81124642b6 fuhquake-security-v0.31.zip 161267 +RMD160 47773963baf694636823d325cd68a05050f37375 fuhquake-security-v0.31.zip 161267 +SHA256 b157bf8c4cff9ce2da812bc7643b72745a81230a6cc5c0d31390bfe2043247c2 fuhquake-security-v0.31.zip 161267 MD5 6426eed6e49a25230eacd2db73b40cbe fuhquake_locs.zip 239163 +RMD160 ed3a26f223b4258b9c47d218e566bddf9e41e4f3 fuhquake_locs.zip 239163 +SHA256 e7228995cc285c1c4a3d4cb98b0c71be733c7c2b53e92780982c25dc21d559ec fuhquake_locs.zip 239163 diff --git a/games-fps/fuhquake-bin/fuhquake-bin-0.31.ebuild b/games-fps/fuhquake-bin/fuhquake-bin-0.31.ebuild index 62f21a0cfa01..92352010a4d0 100644 --- a/games-fps/fuhquake-bin/fuhquake-bin-0.31.ebuild +++ b/games-fps/fuhquake-bin/fuhquake-bin-0.31.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/fuhquake-bin/fuhquake-bin-0.31.ebuild,v 1.3 2005/11/05 22:47:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/fuhquake-bin/fuhquake-bin-0.31.ebuild,v 1.4 2006/02/13 22:16:11 tupone Exp $ inherit games @@ -13,12 +13,24 @@ SRC_URI="http://www.fuhquake.net/files/releases/v${PV}/fuhquake-linux-v${PV}.zip LICENSE="GPL-2" SLOT="0" KEYWORDS="x86" -IUSE="opengl svga X" +IUSE="opengl svga" -DEPEND="app-arch/unzip" -RDEPEND="virtual/x11 +RDEPEND="!svga? ( + || ( + x11-libs/libXext + virtual/x11 + ) + ) svga? ( media-libs/svgalib ) - opengl? ( virtual/opengl )" + opengl? ( + virtual/opengl + || ( + x11-libs/libXext + virtual/x11 + ) + )" +DEPEND="${RDEPEND} + app-arch/unzip" S=${WORKDIR} @@ -30,15 +42,25 @@ src_unpack() { } src_install() { - local dir=${GAMES_PREFIX_OPT}/${PN} + local dir=${GAMES_PREFIX_OPT}/${PN} BINS dodir "${dir}" exeinto "${dir}" - doexe fuhquake-gl.glx fuhquake.svga fuhquake.x11 fuhquake-security.so || die "doexe" + if use opengl; then + BINS="fuhquake-gl.glx fuhquake.x11" + elif ! use svga; then + # X will be built if neither opengl nor svga + BINS="fuhquake.x11" + fi + if use svga; then + BINS="${BINS} fuhquake.svga" + fi + + doexe ${BINS} fuhquake-security.so || die "doexe" cp -r fuhquake qw "${D}/${dir}"/ || die "cp data" dosym "${GAMES_DATADIR}"/quake1/id1 "${dir}"/id1 - for x in fuhquake-gl.glx fuhquake.svga fuhquake.x11 ; do + for x in ${BINS}; do games_make_wrapper ${x} ./${x} "${dir}" done -- cgit v1.2.3-65-gdbad