Added an env.d file to CONFIG_PROTECT *.cfg files for admins who do not use the etwolf-homedir location and the init script. Closes bug #132795.

Package-Manager: portage-2.1_pre10-r4

4 files changed, 29 insertions, 24 deletions

diff --git a/games-fps/enemy-territory/ChangeLog b/games-fps/enemy-territory/ChangeLog
index b6e9dfca011d..9720cdea0be7 100644
--- a/games-fps/enemy-territory/ChangeLog
+++ b/games-fps/enemy-territory/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/enemy-territory
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.34 2006/05/09 14:21:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/ChangeLog,v 1.35 2006/05/09 19:07:14 wolf31o2 Exp $
+
+  09 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  enemy-territory-2.60b.ebuild:
+  Added an env.d file to CONFIG_PROTECT *.cfg files for admins who do not use
+  the etwolf-homedir location and the init script. Closes bug #132795.
 
 *enemy-territory-2.60b (09 May 2006)
 
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
index 3f61ae955390..6f6784079bbe 100644
--- a/games-fps/enemy-territory/Manifest
+++ b/games-fps/enemy-territory/Manifest
@@ -1,18 +1,18 @@
 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 enemy-territory-all-0.2.tar.bz2 981 RMD160 81d51e3a984d4701cc075a8f72f558bd8d9fd56b SHA256 030ea3ab01227d718004297b31555047d23c9dedc1a6fbde9adb041704e5a21b size 981
 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
+EBUILD enemy-territory-2.60b.ebuild 3130 RMD160 8a9745146664f81e198e0008550eb7b40dca734b SHA1 3621e3b6211cf990504073c6b66a918f883d270f SHA256 98f8e86dc2facfd2e52149d98bbe3eee9cc0038ad005b797c7d32a0685b63314 size 3130
+MD5 806ef9ec2b03a98d9d5f6b187994dc33 enemy-territory-2.60b.ebuild 3130
+RMD160 8a9745146664f81e198e0008550eb7b40dca734b enemy-territory-2.60b.ebuild 3130
+SHA256 98f8e86dc2facfd2e52149d98bbe3eee9cc0038ad005b797c7d32a0685b63314 enemy-territory-2.60b.ebuild 3130
+MISC ChangeLog 5944 RMD160 3e8975371a53ab3762f80320e27f3a20fd694017 SHA1 946524d5a953ed17c2de5724e2dfd4f423e7dd05 SHA256 d16cf665d91fd465eb26e12b81b14542aad77898970c96a74310df11e7e9a0db size 5944
+MD5 35ed9104d75489953d42fdb773b8d8bc ChangeLog 5944
+RMD160 3e8975371a53ab3762f80320e27f3a20fd694017 ChangeLog 5944
+SHA256 d16cf665d91fd465eb26e12b81b14542aad77898970c96a74310df11e7e9a0db ChangeLog 5944
 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
+MD5 5fd0dd1a4712399aa467e756ff48e33e files/digest-enemy-territory-2.60b 738
+RMD160 0d9cef437ce3f724d0879e91d53576c24395eb9f files/digest-enemy-territory-2.60b 738
+SHA256 800db81e649cbee030d5fa196291337578fe4146a882b4b74de4c08ccd4d5828 files/digest-enemy-territory-2.60b 738
diff --git a/games-fps/enemy-territory/enemy-territory-2.60b.ebuild b/games-fps/enemy-territory/enemy-territory-2.60b.ebuild
index b2e51444fe17..20eed79c84f2 100644
--- a/games-fps/enemy-territory/enemy-territory-2.60b.ebuild
+++ b/games-fps/enemy-territory/enemy-territory-2.60b.ebuild
@@ -1,6 +1,6 @@
 # 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.60b.ebuild,v 1.1 2006/05/09 14:21:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/enemy-territory/enemy-territory-2.60b.ebuild,v 1.2 2006/05/09 19:07:14 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -11,8 +11,8 @@ SRC_URI="mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run
 	ftp://ftp.red.telefonica-wholesale.net/GAMES/ET/linux/et-linux-2.60.x86.run
 	mirror://idsoftware/et/ET-${PV}.zip
 	dedicated? (
-		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.1.tar.bz2
-		mirror://gentoo/${PN}-all-0.1.tar.bz2 )"
+		http://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.2.tar.bz2
+		mirror://gentoo/${PN}-all-0.2.tar.bz2 )"
 
 LICENSE="RTCW-ETEULA"
 SLOT="0"
@@ -36,7 +36,7 @@ Ddir="${D}/${dir}"
 src_unpack() {
 	unpack_makeself et-linux-2.60.x86.run
 	if use dedicated; then
-		unpack ${PN}-all-0.1.tar.bz2 || die
+		unpack ${PN}-all-0.2.tar.bz2 || die
 	fi
 	unpack ET-${PV}.zip
 }
@@ -60,12 +60,12 @@ src_install() {
 		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"
+		newenvd ${S}/et-ded.env.d et-ded || die "newenvd failed"
+		# TODO: move this to /var/ perhaps ?
+		dodir "${dir}/etwolf-homedir"
+		dosym "${dir}/etwolf-homedir" "${GAMES_PREFIX}/.etwolf"
 	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
diff --git a/games-fps/enemy-territory/files/digest-enemy-territory-2.60b b/games-fps/enemy-territory/files/digest-enemy-territory-2.60b
index 7d611c469ff0..387c45952064 100644
--- a/games-fps/enemy-territory/files/digest-enemy-territory-2.60b
+++ b/games-fps/enemy-territory/files/digest-enemy-territory-2.60b
@@ -1,9 +1,9 @@
 MD5 fb83b8732fc7373c277180b663debf57 ET-2.60b.zip 4143401
 RMD160 2d9106ec443920810072b4b6797b9c9f8f2792cf ET-2.60b.zip 4143401
 SHA256 6fb77e1ed0314b2da5c2a28807392ac638204faec8ef86361893937f182b22f8 ET-2.60b.zip 4143401
-MD5 579373e28984be9e9f86d6e0730473d5 enemy-territory-all-0.1.tar.bz2 876
-RMD160 1fde400fff780d78be731e6b49bf6793287c55af enemy-territory-all-0.1.tar.bz2 876
-SHA256 8c3466db348eccd34bd108db57bc6fb656a7dcbacd190cc331fd8caf74c7cb64 enemy-territory-all-0.1.tar.bz2 876
+MD5 003b5b7f66a5e7ec7a2c04afec849494 enemy-territory-all-0.2.tar.bz2 981
+RMD160 81d51e3a984d4701cc075a8f72f558bd8d9fd56b enemy-territory-all-0.2.tar.bz2 981
+SHA256 030ea3ab01227d718004297b31555047d23c9dedc1a6fbde9adb041704e5a21b enemy-territory-all-0.2.tar.bz2 981
 MD5 2d2373f29f02e18d365d7f1860eee435 et-linux-2.60.x86.run 270965248
 RMD160 1af77cdffb0ff7ac8165b85e643e1efdcea939f8 et-linux-2.60.x86.run 270965248
 SHA256 41cbbc1afb8438bc8fc74a64a171685550888856005111cbf9af5255f659ae36 et-linux-2.60.x86.run 270965248