use games_get_libdir

(Portage version: 2.1.2.3)

3 files changed, 8 insertions, 75 deletions

diff --git a/games-board/pysol/files/digest-pysol-4.82-r1 b/games-board/pysol/files/digest-pysol-4.82-r1
deleted file mode 100644
index 3fb03accaf3f..000000000000
--- a/games-board/pysol/files/digest-pysol-4.82-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 be0fd45c016fe2dcacb03fb29871aff4 pysol-4.82-src.tar.bz2 150515
-RMD160 4d799903a7d8ef6600dae6c65333d136faf1fe32 pysol-4.82-src.tar.bz2 150515
-SHA256 4f87d2dfbf08dd74a2f2a1fa5ab1f61314e7c86608b93b7280f856fbd7df6a8c pysol-4.82-src.tar.bz2 150515
-MD5 31a3ed96c6feb54717c6bce9ddd82b24 pysol-4.82.tar.bz2 3586977
-RMD160 98c6118339967b23d927f30fac64ccd84dd9eb8c pysol-4.82.tar.bz2 3586977
-SHA256 294baeea1da0b8f1c0120b1ee39bb91774c60c2a4050574dd63dc2909f4a562a pysol-4.82.tar.bz2 3586977
diff --git a/games-board/pysol/pysol-4.82-r1.ebuild b/games-board/pysol/pysol-4.82-r1.ebuild
deleted file mode 100644
index a22dfa028084..000000000000
--- a/games-board/pysol/pysol-4.82-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/pysol-4.82-r1.ebuild,v 1.10 2006/10/05 13:24:18 nyhm Exp $
-
-inherit eutils python games
-
-DESCRIPTION="An exciting collection of more than 200 solitaire card games"
-HOMEPAGE="http://www.pysol.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://www.pysol.org/download/pysol/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 mips ppc ppc64 x86"
-IUSE=""
-
-DEPEND="virtual/python"
-RDEPEND="virtual/python
-	>=games-board/pysol-sound-server-3.0
-	>=dev-lang/tk-8.0"
-
-pkg_setup() {
-	python_tkinter_exists
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm -f Makefile data/*.pyc
-	epatch "${FILESDIR}"/${P}-sound-ok.patch #94234
-}
-
-src_install() {
-	insinto "${GAMES_LIBDIR}"/${PN}
-	doins -r src/* || die "src failed"
-	fperms 750 "${GAMES_LIBDIR}"/${PN}/pysol.py
-	games_make_wrapper ${PN} "${GAMES_LIBDIR}"/${PN}/pysol.py
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data/* || die "data failed"
-
-	doicon data/pysol.xpm
-	make_desktop_entry pysol PySol pysol.xpm 'Game;CardGame'
-
-	doman pysol.6
-	dodoc NEWS README
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	python_mod_optimize "${GAMES_LIBDIR}"/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup "${GAMES_LIBDIR}"/${PN}
-}
diff --git a/games-board/pysol/pysol-4.82-r2.ebuild b/games-board/pysol/pysol-4.82-r2.ebuild
index ef9a9d3dd1f8..69368153b0f1 100644
--- a/games-board/pysol/pysol-4.82-r2.ebuild
+++ b/games-board/pysol/pysol-4.82-r2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/pysol-4.82-r2.ebuild,v 1.1 2007/04/02 19:30:24 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/pysol-4.82-r2.ebuild,v 1.2 2007/04/05 01:20:53 nyhm Exp $
 
 inherit eutils python games
 
 PNX=pysol-cardsets
 PVX=4.40
-
 DESCRIPTION="An exciting collection of more than 200 solitaire card games"
 HOMEPAGE="http://www.pysol.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -39,19 +38,19 @@ src_unpack() {
 		mv ../${PNX}-${PVX}/README{,.extra}
 		mv ../${PNX}-${PVX}/NEWS{,.extra}
 		# Removing cardsets already shipped with pysol tar
+		local cardset
 		for cardset in cardset-2000 cardset-colossus cardset-hard-a-port \
 			cardset-hexadeck cardset-kintengu cardset-oxymoron \
 			cardset-tuxedo cardset-vienna-2k ; do
-			rm -rf ../${PNX}-${PVX}/data/$cardset
+			rm -rf ../${PNX}-${PVX}/data/${cardset}
 		done
 	fi
 }
 
 src_install() {
-	insinto "${GAMES_LIBDIR}"/${PN}
+	insinto "$(games_get_libdir)"/${PN}
 	doins -r src/* || die "src failed"
-	fperms 750 "${GAMES_LIBDIR}"/${PN}/pysol.py
-	games_make_wrapper ${PN} "${GAMES_LIBDIR}"/${PN}/pysol.py
+	games_make_wrapper ${PN} "python ./pysol.py" "$(games_get_libdir)"/${PN}
 
 	insinto "${GAMES_DATADIR}"/${PN}
 	doins -r data/* || die "data failed"
@@ -64,8 +63,7 @@ src_install() {
 
 	if use extra-cardsets; then
 		doins -r ../${PNX}-${PVX}/data/* || die "Installing extra cardsets failed"
-		dodoc ../${PNX}-${PVX}/{NEWS,README}.extra \
-			|| die "Extra cardsets doc installation failed"
+		dodoc ../${PNX}-${PVX}/{NEWS,README}.extra
 	fi
 
 	prepgamesdirs
@@ -73,9 +71,9 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	python_mod_optimize "${GAMES_LIBDIR}"/${PN}
+	python_mod_optimize "${ROOT}$(games_get_libdir)"/${PN}
 }
 
 pkg_postrm() {
-	python_mod_cleanup "${GAMES_LIBDIR}"/${PN}
+	python_mod_cleanup "${ROOT}$(games_get_libdir)"/${PN}
 }