fix install #53715

7 files changed, 28 insertions, 77 deletions

diff --git a/games-server/halflife-adminmod/ChangeLog b/games-server/halflife-adminmod/ChangeLog
index 17020355f53c..52c43d5d9a00 100644
--- a/games-server/halflife-adminmod/ChangeLog
+++ b/games-server/halflife-adminmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-server/halflife-adminmod
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/halflife-adminmod/ChangeLog,v 1.4 2004/04/16 18:30:09 vapier Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-server/halflife-adminmod/ChangeLog,v 1.5 2004/06/22 04:07:43 vapier Exp $
+
+*halflife-adminmod-2.50.59-r1 (22 Jun 2004)
+
+  22 Jun 2004; Mike Frysinger <vapier@gentoo.org> -files/2.50.58-adminmod.cfg,
+  halflife-adminmod-2.50.58.ebuild, +halflife-adminmod-2.50.59-r1.ebuild,
+  -halflife-adminmod-2.50.59.ebuild:
+  Version bump to fix install #53715 by James Le Cuirot.
 
 *halflife-adminmod-2.50.59 (16 Apr 2004)
 
diff --git a/games-server/halflife-adminmod/Manifest b/games-server/halflife-adminmod/Manifest
index 4e108004ca67..3457fd7e5749 100644
--- a/games-server/halflife-adminmod/Manifest
+++ b/games-server/halflife-adminmod/Manifest
@@ -1,9 +1,16 @@
-MD5 981870db3d1f2c58a70083f5c4a72088 halflife-adminmod-2.50.58.ebuild 1188
-MD5 4d1a0768bb2a463b9e4503b3625e5118 halflife-adminmod-2.50.59.ebuild 1191
-MD5 247fed3fe8bf7ed3c9076aa07d0c0340 ChangeLog 959
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea8a66707b1f5c5dfa26d0302b60456d ChangeLog 1252
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 071bdef76af0f6d1f79b1ce972827787 files/modsetup 1719
+MD5 ba38ebdb09ee4e76c455c48ccb9c4539 halflife-adminmod-2.50.59-r1.ebuild 1270
+MD5 0de921717db784a8e64346ce9b36844b files/digest-halflife-adminmod-2.50.59-r1 75
+MD5 87ffbad9f9383c561e035af369b203e5 files/modsetup 1720
 MD5 c70c7ef6d70e05e6a986d2d24e96d161 files/2.50.59-adminmod.cfg 817
-MD5 c70c7ef6d70e05e6a986d2d24e96d161 files/2.50.58-adminmod.cfg 817
-MD5 04a2bdd779b0628c2dc19e991d4bad75 files/digest-halflife-adminmod-2.50.58 75
-MD5 0de921717db784a8e64346ce9b36844b files/digest-halflife-adminmod-2.50.59 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA17CbHTu7gpaalycRAhQ2AKCrGsW1IBlmM9aivVCyFRIfdaIwYwCgoO/d
+nngEoGcTTZ5BL2yS49qspbI=
+=JN4/
+-----END PGP SIGNATURE-----
diff --git a/games-server/halflife-adminmod/files/2.50.58-adminmod.cfg b/games-server/halflife-adminmod/files/2.50.58-adminmod.cfg
deleted file mode 100644
index 83be51a21823..000000000000
--- a/games-server/halflife-adminmod/files/2.50.58-adminmod.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
---- config/adminmod.cfg.orig	2003-08-12 10:47:26.000000000 -0400
-+++ config/adminmod.cfg	2003-08-12 10:51:55.000000000 -0400
-@@ -17 +17 @@
--admin_connect_msg "Welcome to the Real World..."
-+admin_connect_msg "Welcome to the Real World w/Gentoo Linux..."
-@@ -62 +62 @@
--admin_plugin_file "addons/adminmod/config/plugin.ini"
-+admin_plugin_file "plugin.ini"
-@@ -70 +70 @@
--admin_reject_msg  "You do not have access to this command."
-+admin_reject_msg  "Larry the Cow says you do not have access to this command."
-@@ -79 +79 @@
--admin_repeat_msg  "This server is using Admin Mod"
-+admin_repeat_msg  "Running Admin Mod on Gentoo Linux"
-@@ -90 +90 @@
--admin_vault_file  "addons/adminmod/config/vault.ini"
-+admin_vault_file  "vault.ini"
-@@ -222 +222 @@
--users_file "addons/adminmod/config/users.ini"
-+users_file "users.ini"
diff --git a/games-server/halflife-adminmod/files/digest-halflife-adminmod-2.50.58 b/games-server/halflife-adminmod/files/digest-halflife-adminmod-2.50.58
deleted file mode 100644
index fcb8f8b24982..000000000000
--- a/games-server/halflife-adminmod/files/digest-halflife-adminmod-2.50.58
+++ /dev/null
@@ -1 +0,0 @@
-MD5 15ca1c9200373b312b07d70a08be6eaa halflife-admin-2.50.58.tar.gz 1544942
diff --git a/games-server/halflife-adminmod/files/digest-halflife-adminmod-2.50.59 b/games-server/halflife-adminmod/files/digest-halflife-adminmod-2.50.59-r1
index 5192369d0d6d..5192369d0d6d 100644
--- a/games-server/halflife-adminmod/files/digest-halflife-adminmod-2.50.59
+++ b/games-server/halflife-adminmod/files/digest-halflife-adminmod-2.50.59-r1
diff --git a/games-server/halflife-adminmod/halflife-adminmod-2.50.58.ebuild b/games-server/halflife-adminmod/halflife-adminmod-2.50.59-r1.ebuild
index f50bf095a964..62fa9ba894a2 100644
--- a/games-server/halflife-adminmod/halflife-adminmod-2.50.58.ebuild
+++ b/games-server/halflife-adminmod/halflife-adminmod-2.50.59-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/halflife-adminmod/halflife-adminmod-2.50.58.ebuild,v 1.3 2004/06/19 04:35:12 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/halflife-adminmod/halflife-adminmod-2.50.59-r1.ebuild,v 1.1 2004/06/22 04:07:43 vapier Exp $
 
 inherit games eutils
 
@@ -32,12 +32,14 @@ src_unpack() {
 src_install() {
 	local dir=${GAMES_PREFIX_OPT}/halflife/addons/adminmod
 
-	dodoc HISTORY NEWS README docs/*
+	dodoc HISTORY NEWS README docs/*.txt
 	dohtml -r docs/html/*
 	rm -rf HISTORY LICENSE NEWS README docs dlls/metamod_i386.so
 
 	dodir ${dir}
-	cp -rf ${S}/* ${FILESDIR}/modsetup ${D}/${dir}/
+	cp -a ${S} ${D}/${dir}
+	cp ${FILESDIR}/modsetup ${D}/${dir}/
+	dosed "s:GENTOO_CFGDIR:${GAMES_SYSCONFDIR}:" ${dir}/modsetup
 	dosym /usr/share/doc/${PF} ${dir}/docs
 
 	prepgamesdirs
diff --git a/games-server/halflife-adminmod/halflife-adminmod-2.50.59.ebuild b/games-server/halflife-adminmod/halflife-adminmod-2.50.59.ebuild
deleted file mode 100644
index ed58bbfe8401..000000000000
--- a/games-server/halflife-adminmod/halflife-adminmod-2.50.59.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/halflife-adminmod/halflife-adminmod-2.50.59.ebuild,v 1.2 2004/06/01 20:09:35 mr_bones_ Exp $
-
-inherit games eutils
-
-MY_P=${P/mod/}
-DESCRIPTION="give people admin access (and a looooooot more)"
-HOMEPAGE="http://www.adminmod.org/"
-SRC_URI="mirror://sourceforge/halflifeadmin/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-RDEPEND="games-server/halflife-metamod"
-PDEPEND="games-server/halflife-modsetup"
-
-S=${WORKDIR}/Adminmod
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# fix default values
-	sed -i "s:addons:../addons:" config/{metamod,plugin}.ini
-	sed -i "/^[^/]/s:^://:" config/Samples/{ips,users}.ini
-	sed -i "/^[^/h]/s:^://:" config/Samples/models.ini
-	epatch ${FILESDIR}/${PV}-adminmod.cfg
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/halflife/addons/adminmod
-
-	dodoc HISTORY NEWS README docs/*
-	dohtml -r docs/html/*
-	rm -rf HISTORY LICENSE NEWS README docs dlls/metamod_i386.so
-
-	dodir ${dir}
-	cp -rf ${S}/* ${FILESDIR}/modsetup ${D}/${dir}/
-	dosym /usr/share/doc/${PF} ${dir}/docs
-
-	prepgamesdirs
-}