conform to games standards; no setgid install; games herd

(Portage version: 2.0.51.19)

6 files changed, 69 insertions, 94 deletions

diff --git a/games-misc/typespeed/ChangeLog b/games-misc/typespeed/ChangeLog
index d9ba2beac353..2e21cb9a6658 100644
--- a/games-misc/typespeed/ChangeLog
+++ b/games-misc/typespeed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-misc/typespeed
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/typespeed/ChangeLog,v 1.1 2005/01/17 08:36:52 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/typespeed/ChangeLog,v 1.2 2005/03/21 01:49:54 mr_bones_ Exp $
+
+*typespeed-0.4.4-r1 (20 Mar 2005)
+
+  20 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml,
+  +typespeed-0.4.4-r1.ebuild, -typespeed-0.4.4.ebuild:
+  conform to games standards; no setgid install; games herd
 
 *typespeed-0.4.4 (17 Jan 2005)
 
diff --git a/games-misc/typespeed/Manifest b/games-misc/typespeed/Manifest
index 4b0895f6e040..f2b04b170d67 100644
--- a/games-misc/typespeed/Manifest
+++ b/games-misc/typespeed/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a922e7c261e02b91a9aa6a4aa431c480 typespeed-0.4.4.ebuild 2090
-MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 48ddfa316630c8efd3381dc1aa4ec21d ChangeLog 469
-MD5 09490e2cc962578e3cf60ee6d9893fe9 files/digest-typespeed-0.4.4 66
+MD5 19f5bdc3a82d7e808a318ef0750148e5 ChangeLog 626
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 77ad960858d345c16294e71eb06ace9d typespeed-0.4.4-r1.ebuild 1414
 MD5 9818f759fab13af7dcafc9ad329e1af9 files/01_all_statedir-fix.patch 2095
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB64/smdTrptrqvGERAofYAJ9e1m9ehHaIQ+6SxOK1fo+fQV+O9QCfcgp9
-5UIpd27sBQpyHkrqDanTAm8=
-=LpRe
------END PGP SIGNATURE-----
+MD5 09490e2cc962578e3cf60ee6d9893fe9 files/digest-typespeed-0.4.4-r1 66
diff --git a/games-misc/typespeed/files/digest-typespeed-0.4.4 b/games-misc/typespeed/files/digest-typespeed-0.4.4-r1
index 8581f11ee41b..8581f11ee41b 100644
--- a/games-misc/typespeed/files/digest-typespeed-0.4.4
+++ b/games-misc/typespeed/files/digest-typespeed-0.4.4-r1
diff --git a/games-misc/typespeed/metadata.xml b/games-misc/typespeed/metadata.xml
index b9fc2b9c6f11..d3c2cc926f0b 100644
--- a/games-misc/typespeed/metadata.xml
+++ b/games-misc/typespeed/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>dragonheart@gentoo.org</email>
-    <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want 
-it</description>
-</maintainer>
-<longdescription></longdescription>
+<herd>games</herd>
 </pkgmetadata>
diff --git a/games-misc/typespeed/typespeed-0.4.4-r1.ebuild b/games-misc/typespeed/typespeed-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..819ac7541343
--- /dev/null
+++ b/games-misc/typespeed/typespeed-0.4.4-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-misc/typespeed/typespeed-0.4.4-r1.ebuild,v 1.1 2005/03/21 01:49:54 mr_bones_ Exp $
+
+inherit games
+
+DESCRIPTION="Test your typing speed, and get your fingers CPS"
+HOMEPAGE="http://ls.purkki.org/typespeed/"
+SRC_URI="http://ls.purkki.org/typespeed/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+
+src_unpack() {
+	local f
+
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/01_all_statedir-fix.patch"
+	sed -i \
+		-e '/^all:/s/clean//' \
+		-e '/^CC =/d' \
+		-e "s:^CFLAGS =.*:& ${CFLAGS}:" Makefile \
+		|| die "sed failed"
+	make clean
+	for f in words.*
+	do
+		touch high.${f}
+	done
+}
+
+src_install() {
+	dogamesbin typespeed || die "dogamesbin failed"
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp words* "${D}${GAMES_DATADIR}/${PN}/" || die "cp failed"
+	dodoc README TODO Changes BUGS
+	newman typespeed.1 typespeed.6
+	insinto "${GAMES_STATEDIR}/${PN}"
+	doins high.words.* || die "doins failed"
+	prepgamesdirs
+	chmod g+w "${D}${GAMES_STATEDIR}"/${PN}/*
+}
+
+pkg_postrm() {
+	echo
+	einfo "${PN} scorefiles was installed into ${GAMES_STATEDIR}/${PN}"
+	einfo "and haven't been removed."
+	einfo "To get rid of ${PN} completely, you can safely remove"
+	einfo "${GAMES_STATEDIR}/${PN} running:"
+	echo
+	einfo "rm -rf ${GAMES_STATEDIR}/${PN}"
+	echo
+}
diff --git a/games-misc/typespeed/typespeed-0.4.4.ebuild b/games-misc/typespeed/typespeed-0.4.4.ebuild
deleted file mode 100644
index c775a5ef355b..000000000000
--- a/games-misc/typespeed/typespeed-0.4.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/typespeed/typespeed-0.4.4.ebuild,v 1.2 2005/01/17 10:13:57 dragonheart Exp $
-
-inherit games toolchain-funcs
-
-DESCRIPTION="Test your typing speed, and get your fingers CPS"
-HOMEPAGE="http://ls.purkki.org/typespeed/"
-SRC_URI="http://ls.purkki.org/typespeed/${P}.tar.gz"
-
-KEYWORDS="x86 ppc amd64"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/01_all_statedir-fix.patch || die "patch failed"
-	sed -i -e "s:^CFLAGS =.*:& ${CFLAGS}:" Makefile || \
-		die "src_unpack failed"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) || die "src_compile failed"
-}
-
-src_install() {
-	dodir "${GAMES_DATADIR}/${PN}" || die "dodir failed"
-	keepdir "${GAMES_STATEDIR}/${PN}" || die "keepdir failed"
-	dogamesbin typespeed || die "dogamesbin failed"
-
-	cp ${S}/words* "${D}${GAMES_DATADIR}/${PN}/" || die "copying wordfiles failed"
-	dodoc README TODO COPYING Changes BUGS || die "dodoc failed"
-	newman typespeed.1 typespeed.6 || die "doman failed"
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	fperms g+s "$GAMES_BINDIR/${PN}" || die "fperms failed"
-}
-
-pkg_postinst() {
-	cd /var/games/typespeed || die "cd failed"
-	# Backup existing scorefiles
-	mkdir backup_scores || die "mkdir failed"
-	find -maxdepth 1 -name 'high.words.*' -exec mv '{}' backup_scores/ \;
-	echo ""
-	einfo "Generating scorefiles..."
-	echo ""
-	/usr/games/bin/typespeed --makescores > /dev/null || die "make scores failed"
-	find backup_scores -type f -exec mv -f '{}' . \;
-	rmdir backup_scores/ || die "rmdir backup_scores failed"
-	chmod g+rw,o-rwx ${PWD}/high*
-	games_pkg_postinst
-}
-
-pkg_postrm() {
-	echo ""
-	einfo "${PN} scorefiles was installed into ${GAMES_STATEDIR}/${PN}"
-	einfo "and haven't been removed (if this is an uninstall)."
-	einfo "To get rid of ${PN} completely, you can safely remove"
-	einfo "${GAMES_STATEDIR}/${PN} running:"
-	echo ""
-	einfo "rm -rf ${GAMES_STATEDIR}/${PN}"
-	echo ""
-}