Marking stable for bug #87911.

Package-Manager: portage-2.0.51.19

5 files changed, 10 insertions, 104 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index a2944c3c4665..97c9ad0637d6 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/enemy-territory
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.19 2005/03/22 17:48:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.20 2005/04/04 15:33:41 wolf31o2 Exp $
+
+  04 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -enemy-territory-2.56-r2.ebuild, enemy-territory-2.60.ebuild:
+  Marking stable for bug #87911.
 
 *enemy-territory-2.60 (22 Mar 2005)
 
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 650c8b0e49bf..21d1ce1676de 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,10 +1,8 @@
-MD5 63fd927f58a2fd82be9871c5da959f52 ChangeLog 3421
-MD5 560073405936ed9e3d38fd2a4ca8e64f enemy-territory-2.56-r2.ebuild 2850
+MD5 c9dc11129ca43d710dad1062ab11fe87 enemy-territory-2.60.ebuild 2547
+MD5 c1f656f13fef99f68f18a7389642a565 ChangeLog 3573
 MD5 f414f5eb26874bc33efe3ac1f0beab5d metadata.xml 1049
-MD5 150a5648e6e700b05ed4e595c2fb1119 enemy-territory-2.60.ebuild 2693
-MD5 4923bd56bd1be4356324b1af17f47ac5 files/digest-enemy-territory-2.56-r2 71
 MD5 9706616a064d2425aa5d8d8775995955 files/et 43
 MD5 69d783cd9fed81e4aacd11281d36ebe9 files/et-ded 46
 MD5 51ae531a8796cf809651bae90f744db6 files/et-ded.conf.d 333
-MD5 579bf10dab41adc4d91b9981801e2770 files/et-ded.rc 874
 MD5 7484d2b7db7794a4a7097cbb1096ac9f files/digest-enemy-territory-2.60 69
+MD5 579bf10dab41adc4d91b9981801e2770 files/et-ded.rc 874
diff --git a/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild b/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
deleted file mode 100644
index 64609b9bdc93..000000000000
--- a/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.56-r2.ebuild,v 1.13 2004/12/15 13:25:58 wolf31o2 Exp $
-
-inherit games
-
-DESCRIPTION="Return to Castle Wolfenstein: Enemy Territory - standalone multi-player game based on Return to Castle Wolfenstein"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://3dgamers/pub/3dgamers4/games/wolfensteinet/et-linux-${PV}-2.x86.run
-	mirror://3dgamers/pub/3dgamers/games/wolfensteinet/et-linux-${PV}-2.x86.run"
-
-LICENSE="RTCW-ETEULA"
-SLOT="0"
-# This game is actively maintained by a developer with both x86 and amd64 kit.
-# DO NOT TOUCH THIS EBUILD WITHOUT THE PERMISSION OF wolf31o2!!!
-KEYWORDS="x86 amd64"
-IUSE="dedicated opengl"
-RESTRICT="nomirror nostrip"
-
-DEPEND="virtual/libc"
-RDEPEND="dedicated? ( app-misc/screen )
-	!dedicated? ( virtual/opengl )
-	opengl? ( virtual/opengl )
-	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0-r1 )"
-
-S="${WORKDIR}"
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
-
-pkg_setup() {
-	check_license || die "License check failed"
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack_makeself
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe bin/Linux/x86/* openurl.sh || die "doexe failed"
-	insinto "${dir}"
-	doins CHANGES v1.02_Readme.htm || die "doins failed"
-	insinto /usr/share/pixmaps
-	doins ET.xpm
-
-	cp -r Docs pb etmain "${Ddir}" || die "cp failed"
-
-	dogamesbin "${FILESDIR}/et" || die "dogamesbin failed"
-	dosed "s:GENTOO_DIR:${dir}:" ${GAMES_BINDIR}/et
-
-	if use dedicated ; then
-		dogamesbin "${FILESDIR}/et-ded" || die "dogamesbin failed"
-		dosed "s:GENTOO_DIR:${dir}:" "${GAMES_BINDIR}/et-ded"
-		exeinto /etc/init.d
-		newexe "${FILESDIR}/et-ded.rc" et-ded || die "newexe failed"
-		dosed "s:GAMES_USER_DED:${GAMES_USER_DED}:" /etc/init.d/et-ded
-		dosed "s:GENTOO_DIR:${GAMES_BINDIR}:" /etc/init.d/et-ded
-		insinto /etc/conf.d
-		newins "${FILESDIR}/et-ded.conf.d" et-ded || die "newins failed"
-	fi
-
-	# TODO: move this to /var/ perhaps ?
-	dodir "${dir}/etwolf-homedir"
-	dosym "${dir}/etwolf-homedir" "${GAMES_PREFIX}/.etwolf"
-
-	prepgamesdirs
-	make_desktop_entry et "Enemy Territory" ET.xpm
-	chmod g+rw "${Ddir}" "${Ddir}/etwolf-homedir" "${Ddir}/etmain"
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	einfo "To play the game run:"
-	einfo " et"
-
-	if use dedicated; then
-		echo
-		einfo "To start a dedicated server run:"
-		einfo " /etc/init.d/et-ded start"
-		echo
-		einfo "To run the dedicated server at boot, type:"
-		einfo " rc-update add et-ded default"
-		echo
-		einfo "The dedicated server is started under the ${GAMES_USER_DED} user account"
-	fi
-	if use amd64; then
-		echo
-		einfo "If you are running an amd64 system and using ALSA, you must have"
-		einfo "ALSA 32-bit emulation enabled in your kernel for this to function properly."
-	fi
-}
diff --git a/games-fps/enemy-territory/enemy-territory-2.60.ebuild b/games-fps/enemy-territory/enemy-territory-2.60.ebuild
index 0ff7fb8a7bcc..2e438bbb35bc 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60.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/enemy-territory/enemy-territory-2.60.ebuild,v 1.1 2005/03/22 17:48:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60.ebuild,v 1.2 2005/04/04 15:33:41 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -11,9 +11,7 @@ SRC_URI="mirror://3dgamers/pub/3dgamers4/games/wolfensteinet/et-linux-${PV}.x86.
 
 LICENSE="RTCW-ETEULA"
 SLOT="0"
-# This game is actively maintained by a developer with both x86 and amd64 kit.
-# DO NOT TOUCH THIS EBUILD WITHOUT THE PERMISSION OF wolf31o2!!!
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE="dedicated opengl"
 RESTRICT="nomirror nostrip"
 
diff --git a/games-fps/enemy-territory/files/digest-enemy-territory-2.56-r2 b/games-fps/enemy-territory/files/digest-enemy-territory-2.56-r2
deleted file mode 100644
index bd67a300af6d..000000000000
--- a/games-fps/enemy-territory/files/digest-enemy-territory-2.56-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4dddf1612b9ed5b3fe9d3348ec78c28f et-linux-2.56-2.x86.run 270687706