Version bump with new patch. Marking stable on amd64 and x86. Removing older versions. Closing bug #132377.

(Portage version: 2.1_pre10-r4)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 108 deletions

diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 5d58cbb9a041..3f61ae955390 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,12 +1,18 @@
-MD5 be2b9928b7dd3575ae95a59d20d260a6 ChangeLog 5440
-RMD160 7f5faf793c5ede69ccfa480dc3732a12020a4c92 ChangeLog 5440
-SHA256 1bbfc220daca12295934156d5df7ca7ff2e1a564620de6cfa67fb7a84b6a5001 ChangeLog 5440
-MD5 dcf0012c284e6714b3b0af37e6b1fb09 enemy-territory-2.60.ebuild 2944
-RMD160 d184b3c2d9122f4b63d3cdbaaa3897c155738a07 enemy-territory-2.60.ebuild 2944
-SHA256 80754db5fc01a4395aaba567e7e0a40d3c75b4dd5bb31d24747ea92d6e09a07e enemy-territory-2.60.ebuild 2944
-MD5 981f8d318e6696ee4435f0b5df41e8e1 files/digest-enemy-territory-2.60 142
-RMD160 c8a51a69911300d0b2005e2b9c5b8aa06b3eafd6 files/digest-enemy-territory-2.60 142
-SHA256 17fae8d0c290318cf0d8f20ea8951b8084cd21d6851df7f8b7756093059264c7 files/digest-enemy-territory-2.60 142
+DIST ET-2.60b.zip 4143401 RMD160 2d9106ec443920810072b4b6797b9c9f8f2792cf SHA256 6fb77e1ed0314b2da5c2a28807392ac638204faec8ef86361893937f182b22f8 size 4143401
+DIST enemy-territory-all-0.1.tar.bz2 876 RMD160 1fde400fff780d78be731e6b49bf6793287c55af SHA256 8c3466db348eccd34bd108db57bc6fb656a7dcbacd190cc331fd8caf74c7cb64 size 876
+DIST et-linux-2.60.x86.run 270965248 RMD160 1af77cdffb0ff7ac8165b85e643e1efdcea939f8 SHA256 41cbbc1afb8438bc8fc74a64a171685550888856005111cbf9af5255f659ae36 size 270965248
+EBUILD enemy-territory-2.60b.ebuild 3069 RMD160 0d161a256ece8ad098777337c095e136c25f45e0 SHA1 dcfab3680512a333724b1c591a7c89f74731965c SHA256 ed2ed1118223077192506c62e6ef39da00ebfa54ac8ac91b1ca57f0e60585dd6 size 3069
+MD5 8b92b4d852a19f82a901a9f78f4478e8 enemy-territory-2.60b.ebuild 3069
+RMD160 0d161a256ece8ad098777337c095e136c25f45e0 enemy-territory-2.60b.ebuild 3069
+SHA256 ed2ed1118223077192506c62e6ef39da00ebfa54ac8ac91b1ca57f0e60585dd6 enemy-territory-2.60b.ebuild 3069
+MISC ChangeLog 5708 RMD160 75645d39df53ef0878cb411288854c688723690d SHA1 44bdc9c1f8e8f1407120909f24f2cc452999f20a SHA256 7fc5da109633112da1fd60142ba12ecf17783e59b046d9b0637a6e0e8fba21e4 size 5708
+MD5 b0c96a05d45a230561bf95567f4ce476 ChangeLog 5708
+RMD160 75645d39df53ef0878cb411288854c688723690d ChangeLog 5708
+SHA256 7fc5da109633112da1fd60142ba12ecf17783e59b046d9b0637a6e0e8fba21e4 ChangeLog 5708
+MISC metadata.xml 1049 RMD160 7703c5e8256715d943f389ad708b924f825fd286 SHA1 284086943f7a25a3a480216755a529bcea27b5bb SHA256 3e025ac578948e673c67548df50558a51ff672aa77af457b8006a322d1c12368 size 1049
 MD5 f414f5eb26874bc33efe3ac1f0beab5d metadata.xml 1049
 RMD160 7703c5e8256715d943f389ad708b924f825fd286 metadata.xml 1049
 SHA256 3e025ac578948e673c67548df50558a51ff672aa77af457b8006a322d1c12368 metadata.xml 1049
+MD5 ab2ff3c23c850fdd9433b3c7019b5413 files/digest-enemy-territory-2.60b 738
+RMD160 a09fb715d878b7b45c536a3536edae3e978b5038 files/digest-enemy-territory-2.60b 738
+SHA256 b8311b3ab7ab025f49bf1d0637b87af21f0ae54ad8e9d7929ee61ce1a29f8469 files/digest-enemy-territory-2.60b 738
diff --git a/games-fps/enemy-territory/enemy-territory-2.60.ebuild b/games-fps/enemy-territory/enemy-territory-2.60.ebuild
deleted file mode 100644
index 17afc66a897d..000000000000
--- a/games-fps/enemy-territory/enemy-territory-2.60.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2006 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.16 2006/04/13 20:41:59 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="standalone multi-player game based on Return to Castle Wolfenstein"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://3dgamers/wolfensteinet/et-linux-${PV}.x86.run
-	mirror://idsoftware/et/linux/et-linux-${PV}.x86.run
-	ftp://ftp.red.telefonica-wholesale.net/GAMES/ET/linux/et-linux-${PV}.x86.run
-	dedicated? (
-		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.1.tar.bz2
-		mirror://gentoo/${PN}-all-0.1.tar.bz2 )"
-
-LICENSE="RTCW-ETEULA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dedicated opengl"
-RESTRICT="mirror strip"
-
-DEPEND="sys-libs/glibc"
-RDEPEND="dedicated? ( app-misc/screen )
-	!dedicated? ( virtual/opengl )
-	opengl? ( virtual/opengl )
-	amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.0-r1 )"
-
-S="${WORKDIR}"
-
-GAMES_CHECK_LICENSE="yes"
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
-
-src_unpack() {
-	unpack_makeself et-linux-${PV}.x86.run
-	if use dedicated; then
-		unpack ${PN}-all-0.1.tar.bz2 || die
-	fi
-}
-
-src_install() {
-	exeinto ${dir}
-	doexe bin/Linux/x86/et.x86 openurl.sh || die "doexe failed"
-	insinto ${dir}
-	dodoc CHANGES README || die "doins failed"
-	doicon ET.xpm
-
-	cp -r Docs pb etmain "${Ddir}" || die "cp failed"
-
-	games_make_wrapper et ./et.x86 "${dir}" "${dir}"
-
-	if use dedicated ; then
-		doexe bin/Linux/x86/etded.x86 || die "doexe failed"
-		games_make_wrapper et-ded ./etded.x86 ${dir}
-		newinitd ${S}/et-ded.rc et-ded || die "newinitd 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
-		newconfd ${S}/et-ded.conf.d et-ded || die "newconfd failed"
-	fi
-
-	# TODO: move this to /var/ perhaps ?
-	dodir "${dir}/etwolf-homedir"
-	dosym "${dir}/etwolf-homedir" "${GAMES_PREFIX}/.etwolf"
-
-	make_desktop_entry et "Enemy Territory" ET.xpm
-
-	prepgamesdirs
-	chmod g+rw "${Ddir}" "${Ddir}/etwolf-homedir" "${Ddir}/etmain"
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	ewarn "There are two possible security bugs in this package, both causing a"
-	ewarn "denial of service.  One affects the game when running a server, the"
-	ewarn "other when running as a client.  For more information, see"
-	ewarn "bug #82149."
-	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/files/digest-enemy-territory-2.60 b/games-fps/enemy-territory/files/digest-enemy-territory-2.60
deleted file mode 100644
index 691611102125..000000000000
--- a/games-fps/enemy-territory/files/digest-enemy-territory-2.60
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2d2373f29f02e18d365d7f1860eee435 et-linux-2.60.x86.run 270965248
-MD5 579373e28984be9e9f86d6e0730473d5 enemy-territory-all-0.1.tar.bz2 876