Install python files into games libdir

Package-Manager: portage-2.1.4.4

4 files changed, 70 insertions, 51 deletions

diff --git a/games-puzzle/jools/ChangeLog b/games-puzzle/jools/ChangeLog
index 62c6ff05b75f..258a9f4c2534 100644
--- a/games-puzzle/jools/ChangeLog
+++ b/games-puzzle/jools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-puzzle/jools
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jools/ChangeLog,v 1.2 2008/02/29 19:30:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jools/ChangeLog,v 1.3 2008/03/28 19:54:53 nyhm Exp $
+
+*jools-0.20-r1 (28 Mar 2008)
+
+  28 Mar 2008; Tristan Heaven <nyhm@gentoo.org> -jools-0.20.ebuild,
+  +jools-0.20-r1.ebuild:
+  Install python files into games libdir
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> jools-0.20.ebuild:
   Remove icon extension from desktop entry to match Icon Theme Specification.
diff --git a/games-puzzle/jools/Manifest b/games-puzzle/jools/Manifest
index 9ea4db17b1ae..af7f54c2806a 100644
--- a/games-puzzle/jools/Manifest
+++ b/games-puzzle/jools/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jools-0.20.tar.gz 1710143 RMD160 c9689549b6f73ca6cc43a7e840d1f7555df24df8 SHA1 3832e22cbee8d2cc7f13030ea0b1caf09a185179 SHA256 50f5c23491e45b4658baecdb774ba071000f4c9a1164b77c95cbfe711f3e36c8
 DIST jools-musicpack-1.0.tar.gz 4447501 RMD160 e2b084bbea972c42b79fa8e56ee9fcc9b1e34f05 SHA1 52982a438e7bc6ed4691e63838f92f7aa919bf54 SHA256 baf3bd24a65508868b13b6224a0661dc4b8616eb8d70fab04a9e732d32983c84
-EBUILD jools-0.20.ebuild 1242 RMD160 98fcc4347ce4332c43bc1b82c5b72b323c2a8461 SHA1 15880d2618ccbdc5294ec3187e86109032a23b49 SHA256 2b64450f0ff808434e93ea5e585234a9756e3461358861b433ee995d7e54ead3
-MISC ChangeLog 480 RMD160 d618c896b14137e88c98046447a9e39d94de88d6 SHA1 b4c9369702b87bec7cf797a6da8ec419b6fa7aa6 SHA256 4710ffb70ff0a277a97acbb62c3243511bd2394e736b9ada3870226f645aca92
+EBUILD jools-0.20-r1.ebuild 1362 RMD160 880325016565400c21266fb7617f7ee4ae3a1be2 SHA1 8367aead97ce61073d994ceba94f5ae94c00504a SHA256 1e23633872541ca2f8cf343ca340414a5defe9040a26be0d89b8a00d0517ebb2
+MISC ChangeLog 644 RMD160 7cf767b971101b0971a91e58bd9b2a6e4a142e62 SHA1 fb5d437e7b0a3de85b6e3215d48e5c9dd073da15 SHA256 beed4ed19b53bbe352705d976f4eef6f14994da5af334066e6de5d79ade5112c
 MISC metadata.xml 580 RMD160 e6b0dd9e0ae3e6e6d8bfa294e7aa8db82e5a745e SHA1 07a986344634de8f41008723fc07d468a9667f9f SHA256 99ea28a2292a9b3fae00d7a12b4b707e521029fe8a4708b2cd639206b24002d1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkftTRIACgkQdz7hIScOURF2QACfeftEeuGsY5A8Z9PcbL3Vqgxg
+/CkAoOvFHOoBNFWWLck9DySMMV+tHKPy
+=qNfe
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/jools/jools-0.20-r1.ebuild b/games-puzzle/jools/jools-0.20-r1.ebuild
new file mode 100644
index 000000000000..003535677ce0
--- /dev/null
+++ b/games-puzzle/jools/jools-0.20-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jools/jools-0.20-r1.ebuild,v 1.1 2008/03/28 19:54:53 nyhm Exp $
+
+inherit eutils python games
+
+MUS_P=${PN}-musicpack-1.0
+DESCRIPTION="clone of Bejeweled, a popular pattern-matching game"
+HOMEPAGE="http://www.eecs.umich.edu/~pelzlpj/jools/"
+SRC_URI="http://www.eecs.umich.edu/~pelzlpj/jools/${P}.tar.gz
+	 http://www.eecs.umich.edu/~pelzlpj/jools/${MUS_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pygame"
+DEPEND=""
+
+S=${WORKDIR}/${P}/jools
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	echo "MEDIAROOT = \"${GAMES_DATADIR}/${PN}\"" > config.py
+	cd music
+	unpack ${MUS_P}.tar.gz
+}
+
+src_install() {
+	games_make_wrapper ${PN} "python ./__init__.py" "$(games_get_libdir)"/${PN}
+	insinto "$(games_get_libdir)"/${PN}
+	doins *.py || die "doins py failed"
+	insinto "${GAMES_DATADIR}"/${PN}
+	doins -r fonts images music sounds || die "doins data failed"
+	newicon images/ruby/0001.png ${PN}.png
+	make_desktop_entry ${PN} Jools
+	dodoc ../{ChangeLog,doc/{POINTS,TODO}}
+	dohtml ../doc/manual.html
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}$(games_get_libdir)"/${PN}
+	games_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup "$(games_get_libdir)"/${PN}
+}
diff --git a/games-puzzle/jools/jools-0.20.ebuild b/games-puzzle/jools/jools-0.20.ebuild
deleted file mode 100644
index fa257902b1da..000000000000
--- a/games-puzzle/jools/jools-0.20.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/jools/jools-0.20.ebuild,v 1.2 2008/02/29 19:30:56 carlo Exp $
-
-inherit eutils python games
-
-MUS_URI=${PN}-musicpack-1.0.tar.gz
-
-DESCRIPTION="clone of Bejeweled, a popular pattern-matching game."
-HOMEPAGE="http://www.eecs.umich.edu/~pelzlpj/jools/"
-SRC_URI="http://www.eecs.umich.edu/~pelzlpj/jools/${P}.tar.gz
-	 http://www.eecs.umich.edu/~pelzlpj/jools/${MUS_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=dev-python/pygame-1.4"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/jools/music
-	unpack ${MUS_URI}
-	cd "${S}"
-	echo "MEDIAROOT = \"${GAMES_DATADIR}/${PN}\"" > ${PN}/config.py
-}
-
-src_install() {
-	dogamesbin ${PN}/${PN} || die "dogamesbin failed"
-
-	python_version
-
-	insinto /usr/lib/python${PYVER}/site-packages/${PN}
-	doins ${PN}/*.py || die "Installing python files failed"
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ${PN}/{fonts,images,music,sounds} \
-		|| die "Installing data file failed"
-
-	dodoc ChangeLog doc/{POINTS,TODO}
-	dohtml doc/manual.html
-
-	newicon ${PN}/images/ruby/0001.png ${PN}.png
-	make_desktop_entry ${PN} "Jools" ${PN}
-
-	prepgamesdirs
-}