Merge with pysol-cardsets, that is being removed from the tree

(Portage version: 2.1.2.2)

3 files changed, 97 insertions, 2 deletions

diff --git a/games-board/pysol/ChangeLog b/games-board/pysol/ChangeLog
index 7365530a4c87..e7d3b1b37fb6 100644
--- a/games-board/pysol/ChangeLog
+++ b/games-board/pysol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-board/pysol
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/ChangeLog,v 1.13 2006/10/05 13:24:18 nyhm Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/ChangeLog,v 1.14 2007/04/02 19:30:24 tupone Exp $
+
+*pysol-4.82-r2 (02 Apr 2007)
+
+  02 Apr 2007; <atupone@gentoo.org> +pysol-4.82-r2.ebuild:
+  Merging pysol-cardsets
 
   05 Oct 2006; Tristan Heaven <nyhm@gentoo.org> pysol-4.82-r1.ebuild:
   Fix .desktop file, bug #149740
diff --git a/games-board/pysol/files/digest-pysol-4.82-r2 b/games-board/pysol/files/digest-pysol-4.82-r2
new file mode 100644
index 000000000000..24e4a4a79cbb
--- /dev/null
+++ b/games-board/pysol/files/digest-pysol-4.82-r2
@@ -0,0 +1,9 @@
+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
+MD5 4878f498bd038884554de9e938a8ab03 pysol-cardsets_4.40.orig.tar.gz 17811289
+RMD160 470009d6b9d204a9928cee8f1ba35d81270eb410 pysol-cardsets_4.40.orig.tar.gz 17811289
+SHA256 d2130adf766aae51a3353b603b6386a743207c2dfd2fad78adbb10105427ff86 pysol-cardsets_4.40.orig.tar.gz 17811289
diff --git a/games-board/pysol/pysol-4.82-r2.ebuild b/games-board/pysol/pysol-4.82-r2.ebuild
new file mode 100644
index 000000000000..ef9a9d3dd1f8
--- /dev/null
+++ b/games-board/pysol/pysol-4.82-r2.ebuild
@@ -0,0 +1,81 @@
+# 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 $
+
+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
+	http://www.pysol.org/download/pysol/${P}-src.tar.bz2
+	extra-cardsets? (
+		http://ftp.debian.org/debian/pool/main/p/${PNX}/${PNX}_${PVX}.orig.tar.gz
+	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 mips ppc ppc64 x86"
+IUSE="extra-cardsets"
+
+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
+	if use extra-cardsets; then
+		mv ../${PNX}-${PVX}/README{,.extra}
+		mv ../${PNX}-${PVX}/NEWS{,.extra}
+		# Removing cardsets already shipped with pysol tar
+		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
+		done
+	fi
+}
+
+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
+
+	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"
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	python_mod_optimize "${GAMES_LIBDIR}"/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${GAMES_LIBDIR}"/${PN}
+}