Cleanup for bug #92745.

6 files changed, 13 insertions, 72 deletions

diff --git a/games-server/tetrix/ChangeLog b/games-server/tetrix/ChangeLog
index 59d5ad2481e4..67026a9f3148 100644
--- a/games-server/tetrix/ChangeLog
+++ b/games-server/tetrix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-server/tetrix
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/ChangeLog,v 1.4 2005/04/11 21:34:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/ChangeLog,v 1.5 2005/05/17 18:53:27 wolf31o2 Exp $
+
+  17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  files/1.13.16.1.40c-droproot.patch, -tetrix-1.13.16.1.40c-r1.ebuild,
+  tetrix-1.13.16.1.40c-r2.ebuild:
+  Cleanup for bug #92745.
 
   11 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
   tetrix-1.13.16.1.40c-r2.ebuild:
diff --git a/games-server/tetrix/Manifest b/games-server/tetrix/Manifest
index 3e1fff673b01..4f6bf5444dff 100644
--- a/games-server/tetrix/Manifest
+++ b/games-server/tetrix/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2724566aba936eecc9af55f116d4f484 tetrix-1.13.16.1.40c-r2.ebuild 1439
-MD5 5df2d1967b43d9e72493cc86035c6cf8 tetrix-1.13.16.1.40c-r1.ebuild 1162
-MD5 6d2b73317a9a0e75fab74775507f09e0 ChangeLog 971
+MD5 146a6601ddb94bbde37fd73778a8d902 tetrix-1.13.16.1.40c-r2.ebuild 1449
+MD5 9e91867dd78ab3538c0fdb932efa91c5 ChangeLog 1156
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 72a534a4509ce69427ddac26d70f2bf5 files/tetrix.rc 494
-MD5 1c284bd8e5ee48f96a0b2206ab4a59be files/digest-tetrix-1.13.16.1.40c-r1 79
 MD5 1c284bd8e5ee48f96a0b2206ab4a59be files/digest-tetrix-1.13.16.1.40c-r2 79
 MD5 27b5d734fed2236551e85ffce4c47ac5 files/1.13.16.1.40c-paths.patch 2235
-MD5 a0341200b76305698044db11d69148e0 files/1.13.16.1.40c-droproot.patch 5224
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCWu1i06ebR+OMO78RArmFAJsFYqKfmFBClgbOh8/PqFf6zxUqZwCaA3uS
-Ao6pjLbyTpzj2/xneKYLvgU=
-=Cw/+
------END PGP SIGNATURE-----
+MD5 676361e91da2e1fd1abb70e3fb57362d files/1.13.16.1.40c-droproot.patch 5220
diff --git a/games-server/tetrix/files/1.13.16.1.40c-droproot.patch b/games-server/tetrix/files/1.13.16.1.40c-droproot.patch
index f04911f523fb..bfba910cb527 100644
--- a/games-server/tetrix/files/1.13.16.1.40c-droproot.patch
+++ b/games-server/tetrix/files/1.13.16.1.40c-droproot.patch
@@ -163,7 +163,7 @@ Files src.orig/tetrix and src/tetrix differ
  
 +# username/group to switch UID/GID to
 +droproot=1
-+dropuser=games-ded
++dropuser=games
 +dropgroup=games
 +
  # maxchannels [1] - How many channels should be available on server
diff --git a/games-server/tetrix/files/digest-tetrix-1.13.16.1.40c-r1 b/games-server/tetrix/files/digest-tetrix-1.13.16.1.40c-r1
deleted file mode 100644
index 90ab0b9dc712..000000000000
--- a/games-server/tetrix/files/digest-tetrix-1.13.16.1.40c-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32e5306bc26afc9e5acdca9c093947c0 tetrinetx-1.13.16+qirc-1.40c.tar.gz 81447
diff --git a/games-server/tetrix/tetrix-1.13.16.1.40c-r1.ebuild b/games-server/tetrix/tetrix-1.13.16.1.40c-r1.ebuild
deleted file mode 100644
index cb449e77a48d..000000000000
--- a/games-server/tetrix/tetrix-1.13.16.1.40c-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/tetrix-1.13.16.1.40c-r1.ebuild,v 1.5 2005/04/11 21:34:06 luckyduck Exp $
-
-inherit eutils gcc games
-
-MY_SV=${PV#*.*.*.}
-MY_PV=${PV%.${MY_SV}}
-MY_P="tetrinetx-${MY_PV}+qirc-${MY_SV}"
-
-DESCRIPTION="A GNU TetriNET server"
-HOMEPAGE="http://tetrinetx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tetrinetx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="net-libs/adns"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-paths.patch
-	sed -i \
-		-e "s:GENTOO_CONFDIR:${GAMES_SYSCONFDIR}/${PN}:" \
-		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}/${PN}:" \
-		-e "s:GENTOO_LOGDIR:${GAMES_LOGDIR}:" \
-		src/config.h bin/game.conf
-}
-
-src_compile() {
-	cd src
-	$(gcc-getCC) ${CFLAGS} main.c -o tetrix -ladns || die "compile failed"
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README README.qirc.spectators
-
-	dogamesbin src/tetrix
-	insinto ${GAMES_SYSCONFDIR}/${PN}
-	doins bin/*
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/tetrix.rc tetrix
-
-	prepgamesdirs
-}
diff --git a/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild b/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild
index 705d6c9928ef..1130c25d3800 100644
--- a/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild
+++ b/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild,v 1.8 2005/04/11 21:34:06 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-server/tetrix/tetrix-1.13.16.1.40c-r2.ebuild,v 1.9 2005/05/17 18:53:27 wolf31o2 Exp $
 
-inherit eutils gcc games
+inherit eutils toolchain-funcs games
 
 MY_SV=${PV#*.*.*.}
 MY_PV=${PV%.${MY_SV}}
@@ -35,7 +35,7 @@ src_unpack() {
 
 src_compile() {
 	cd src
-	$(gcc-getCC) ${CFLAGS} main.c -o tetrix -ladns || die "compile failed"
+	$(tc-getCC) ${CFLAGS} main.c -o tetrix -ladns || die "compile failed"
 }
 
 src_install() {