quake2-data -> quake2 #111622

Package-Manager: portage-2.0.53_rc7

5 files changed, 18 insertions, 38 deletions

diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
index c7c0b9afda10..a1484b978c0e 100644
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ b/games-fps/aaquake2/aaquake2-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/aaquake2-0.1.ebuild,v 1.6 2005/09/26 18:07:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/aaquake2-0.1.ebuild,v 1.7 2005/11/05 22:50:48 vapier Exp $
 
 inherit eutils games
 
@@ -20,11 +20,11 @@ RDEPEND="media-libs/aalib"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S="${WORKDIR}/quake2-3.21/linux"
+S=${WORKDIR}/quake2-3.21/linux
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${PV}-gentoo.patch
+	epatch "${FILESDIR}"/${PV}-gentoo.patch
 	cd quake2-3.21/linux
 	sed -i \
 		-e "s:GENTOO_DIR:${GAMES_LIBDIR}/${PN}:" sys_linux.c
@@ -36,7 +36,7 @@ src_compile() {
 	mkdir -p releasei386-glibc/ref_soft
 	make \
 		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_DATADIR=${GAMES_DATADIR}/quake2-data/baseq2/ \
+		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
 		build_release || die
 }
 
@@ -44,15 +44,15 @@ src_install() {
 	cd release*
 
 	exeinto ${GAMES_LIBDIR}/${PN}
-	doexe gamei386.so ref_softaa.so
+	doexe gamei386.so ref_softaa.so || die
 	dosym ref_softaa.so ${GAMES_LIBDIR}/${PN}/ref_softx.so
 	dosym ref_softaa.so ${GAMES_LIBDIR}/${PN}/ref_soft.so
 	exeinto ${GAMES_LIBDIR}/${PN}/ctf
-	doexe ctf/gamei386.so
+	doexe ctf/gamei386.so || die
 
-	newgamesbin quake2 aaquake2
+	newgamesbin quake2 aaquake2 || die
 
-	dodir ${GAMES_DATADIR}/quake2-data
+	dodir ${GAMES_DATADIR}/quake2
 
 	insinto ${GAMES_SYSCONFDIR}
 	echo ${GAMES_LIBDIR}/${PN} > ${PN}.conf
diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest
index fc3fc4ae3a2f..8512a7ec4d4b 100644
--- a/games-fps/quake1-data/Manifest
+++ b/games-fps/quake1-data/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 16f0bd0e9793a52fec9a0fc74940496e ChangeLog 343
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-quake1-data-2.40 0
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 a425b878490c85976249d8272d160d08 quake1-data-2.40.ebuild 1271
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbTLJgIKl8Uu19MoRAtI/AJ9OJju+vVpKRj8Z3H9SwPOtyFPfLwCfXSgz
-zxhHBrhW8ssIkHo0C5At0bk=
-=2lUJ
------END PGP SIGNATURE-----
+MD5 71514d3b735974d74667463707ce9dbf quake1-data-2.40.ebuild 1278
diff --git a/games-fps/quake1-rally/Manifest b/games-fps/quake1-rally/Manifest
index d8cc99559737..5fea3e024f5a 100644
--- a/games-fps/quake1-rally/Manifest
+++ b/games-fps/quake1-rally/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 46e163b49151686e8d28898073ea45e5 ChangeLog 466
 MD5 e053b7b67887b99e7f3e70754c9b4450 files/digest-quake1-rally-1.2 109
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 5cdaea1d5821537053827432ff5e8f4b quake1-rally-1.2.ebuild 964
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbTVjgIKl8Uu19MoRAleNAJ9YP3sAM0RKVtKfx2HQx0y2n+4+fQCfRVrp
-qDdHA1OIqyctJ8hvVujMoZ0=
-=Uzzi
------END PGP SIGNATURE-----
+MD5 c70175ae77c222fda2bbdf69c9fb3f2b quake1-rally-1.2.ebuild 971
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
index c136d35e54b8..2bac9664d429 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.9 2005/11/03 18:30:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.1.ebuild,v 1.10 2005/11/05 22:51:49 vapier Exp $
 
 inherit eutils games
 
@@ -97,7 +97,7 @@ src_compile() {
 			BUILD_ARTS=$(yesno arts) \
 			BUILD_ALSA=$(yesno alsa) \
 			SDLDIR=/usr/lib \
-			DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2-data" \
+			DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \
 			DEFAULT_LIBDIR="${GAMES_LIBDIR}/${PN}${libsuffix}" \
 			OPT_CFLAGS="${CFLAGS}" \
 			|| die "make failed"
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
index 04c089f48a6c..713c2ff682ea 100644
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.6 2005/09/26 18:09:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild,v 1.7 2005/11/05 22:53:08 vapier Exp $
 
 inherit eutils games
 
@@ -34,7 +34,7 @@ src_compile() {
 	mkdir -p releasei386-glibc/ref_soft
 	make \
 		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_DATADIR=${GAMES_DATADIR}/quake2-data/baseq2/ \
+		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
 		build_release || die
 }
 
@@ -42,12 +42,12 @@ src_install() {
 	cd release*
 
 	exeinto ${GAMES_LIBDIR}/${PN}
-	doexe gamei386.so ref_softx.so
+	doexe gamei386.so ref_softx.so || die
 	exeinto ${GAMES_LIBDIR}/${PN}/ctf
-	doexe ctf/gamei386.so
-	newgamesbin quake2 red-blue-quake2
+	doexe ctf/gamei386.so || die
+	newgamesbin quake2 red-blue-quake2 || die
 
-	dodir ${GAMES_DATADIR}/quake2-data
+	dodir ${GAMES_DATADIR}/quake2
 
 	insinto ${GAMES_SYSCONFDIR}
 	echo ${GAMES_LIBDIR}/${PN} > ${PN}.conf