Cleanup ebuild

(Portage version: 2.1.2_pre3-r5)

3 files changed, 32 insertions, 36 deletions

diff --git a/games-puzzle/pathological/ChangeLog b/games-puzzle/pathological/ChangeLog
index b7c48da6fcee..56bbaea597f3 100644
--- a/games-puzzle/pathological/ChangeLog
+++ b/games-puzzle/pathological/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/pathological
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/ChangeLog,v 1.11 2006/03/16 03:25:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/ChangeLog,v 1.12 2006/10/20 00:23:05 nyhm Exp $
+
+  20 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  pathological-1.1.3-r1.ebuild:
+  Cleanup ebuild
 
   16 Mar 2006; Mike Frysinger <vapier@gentoo.org>
   +files/pathological-1.1.3-build.patch, pathological-1.1.3-r1.ebuild:
diff --git a/games-puzzle/pathological/files/digest-pathological-1.1.3-r1 b/games-puzzle/pathological/files/digest-pathological-1.1.3-r1
index 6e8753cc1e88..0f03991d5188 100644
--- a/games-puzzle/pathological/files/digest-pathological-1.1.3-r1
+++ b/games-puzzle/pathological/files/digest-pathological-1.1.3-r1
@@ -1 +1,3 @@
 MD5 76a446080c0fed12baf39354d8e0ce4a pathological-1.1.3.tar.gz 6995274
+RMD160 3a85804cdc00f8c91a7ea6f219d7f4e128c103a0 pathological-1.1.3.tar.gz 6995274
+SHA256 813ef0812ba6b3218b35c2ddea423c9c6ee912925824497f52d5310bc76f85de pathological-1.1.3.tar.gz 6995274
diff --git a/games-puzzle/pathological/pathological-1.1.3-r1.ebuild b/games-puzzle/pathological/pathological-1.1.3-r1.ebuild
index 06dbad7eb269..f5ce21baba19 100644
--- a/games-puzzle/pathological/pathological-1.1.3-r1.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/pathological-1.1.3-r1.ebuild,v 1.3 2006/03/16 03:25:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/pathological/pathological-1.1.3-r1.ebuild,v 1.4 2006/10/20 00:23:05 nyhm Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
 HOMEPAGE="http://pathological.sourceforge.net/"
@@ -10,18 +10,16 @@ SRC_URI="mirror://sourceforge/pathological/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="doc"
 
-DEPEND="doc? ( media-libs/netpbm )
-	>=sys-apps/sed-4"
-RDEPEND=">=dev-python/pygame-1.5.5
-	dev-lang/python"
+DEPEND="doc? ( media-libs/netpbm )"
+RDEPEND=">=dev-python/pygame-1.5.5"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	gunzip pathological.6.gz
+	unpack ./${PN}.6.gz
 
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-music-py.patch
@@ -31,50 +29,42 @@ src_unpack() {
 			-e '5,$ s/=/ /g' makehtml \
 			|| die "sed makehtml failed"
 	else
-		echo "#!/bin/sh" > makehtml \
-			|| die "clearing makehtml failed"
+		echo "#!/bin/sh" > makehtml
 	fi
 
 	sed -i \
-		-e "/^cd /s:/usr/share/pathological:${GAMES_DATADIR}/${PN}:" \
+		-e "s:/usr/share/games:${GAMES_DATADIR}:" \
 		pathological || die "sed pathological failed"
 
 	sed -i \
-		-e "/^write_highscores /s:/usr/lib/pathological/bin:${GAMES_LIBDIR}/${PN}:" \
+		-e "s:/usr/lib/pathological/bin:${GAMES_LIBDIR}/${PN}:" \
+		-e "s:/var/games:${GAMES_STATEDIR}:" \
 		pathological.py || die "sed pathological.py failed"
 }
 
 src_install() {
-	# executables
-	dogamesbin pathological || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}/${PN}"
-	insopts -m0750
-	doins pathological.py || die "doins failed"
-	exeinto "${GAMES_LIBDIR}/${PN}"
+	dogamesbin ${PN} || die "dogamesbin failed"
+
+	exeinto "${GAMES_LIBDIR}"/${PN}
 	doexe write-highscores || die "doexe failed"
 
-	# removed some unneeded resource files
-	rm -f graphics/*.xcf
-	rm -f sounds/*.orig
-	# "install" resource files
-	# Use cp, not mv so install can be done multiple times (for ebuild devel).
-	cp -R circuits graphics music sounds "${D}/${GAMES_DATADIR}/${PN}" \
-		|| die "cp failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r circuits graphics music sounds ${PN}.py || die "doins data failed"
 
-	# setup high score file
 	insinto "${GAMES_STATEDIR}"
-	insopts -m0664
-	doins pathological_scores || die "doins failed (pathological_scores)"
+	doins ${PN}_scores || die "doins scores failed"
 
-	# documentation
-	dodoc README TODO
-	doman pathological.6
-	use doc && dohtml -r html/
+	dodoc changelog README TODO
+	doman ${PN}.6
+	use doc && dohtml -r html/*
 
-	insinto /usr/share/pixmaps
-	doins pathological.xpm
+	doicon ${PN}.xpm
+	make_desktop_entry ${PN} Pathological ${PN}.xpm
 
-	make_desktop_entry pathological Pathological pathological.xpm
+	# remove some unneeded resource files
+	rm -f "${D}/${GAMES_DATADIR}"/${PN}/graphics/*.xcf
 
+	fperms 660 "${GAMES_STATEDIR}"/${PN}_scores
+	fperms 750 "${GAMES_DATADIR}"/${PN}/${PN}.py
 	prepgamesdirs
 }