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

Package-Manager: portage-2.1.2.2

diff --git a/games-board/pysol/ChangeLog b/games-board/pysol/ChangeLog
index 7365530a4c87c6090ed1a7ca5c06549eed3dd59f..e7d3b1b37fb6ad081e1c1e815f7a76c81e0a13da 100644 (file)
--- 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/Manifest b/games-board/pysol/Manifest
index fb3b186738014a298a73806e5c06d596443161c9..cae7a2b73411a4a45ecc17e9e5c9de422c261202 100644 (file)
--- a/games-board/pysol/Manifest
+++ b/games-board/pysol/Manifest
@@ -1,17 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pysol-4.82-sound-ok.patch 635 RMD160 e3a43fce0433b59d335d2c1f8be35df57d488515 SHA1 45d845f10d478982c8866f30eefd2ef6ef79bac7 SHA256 ac4b0898cc3dc9f6fcf98f29409b2e68c5f4b2e58ebe75f3ceb8542556bd44f4
 MD5 3f8caa1bf12625ec007855239ce99176 files/pysol-4.82-sound-ok.patch 635
 RMD160 e3a43fce0433b59d335d2c1f8be35df57d488515 files/pysol-4.82-sound-ok.patch 635
 SHA256 ac4b0898cc3dc9f6fcf98f29409b2e68c5f4b2e58ebe75f3ceb8542556bd44f4 files/pysol-4.82-sound-ok.patch 635
 DIST pysol-4.82-src.tar.bz2 150515 RMD160 4d799903a7d8ef6600dae6c65333d136faf1fe32 SHA1 f5f1cc553b1eb44eba717494854f06015bae3ba0 SHA256 4f87d2dfbf08dd74a2f2a1fa5ab1f61314e7c86608b93b7280f856fbd7df6a8c
 DIST pysol-4.82.tar.bz2 3586977 RMD160 98c6118339967b23d927f30fac64ccd84dd9eb8c SHA1 606ed86aa2ae70ee5655db961ca05a44755efd84 SHA256 294baeea1da0b8f1c0120b1ee39bb91774c60c2a4050574dd63dc2909f4a562a
+DIST pysol-cardsets_4.40.orig.tar.gz 17811289 RMD160 470009d6b9d204a9928cee8f1ba35d81270eb410 SHA1 7b528e386e338a60648ee9a3f1889560eea6c535 SHA256 d2130adf766aae51a3353b603b6386a743207c2dfd2fad78adbb10105427ff86
 EBUILD pysol-4.82-r1.ebuild 1347 RMD160 e1242acc4802c7eaa4973850bfeb1a239e3024c0 SHA1 4bdc2b1ad7b7c5bc6c03ba8aeb78baa2f155fa3d SHA256 fb3423fed3f91292582732561daa121b1c26dfce9ea450484959a96ab125ae18
 MD5 a63d68b28f88e5eb5efecf4424e414f7 pysol-4.82-r1.ebuild 1347
 RMD160 e1242acc4802c7eaa4973850bfeb1a239e3024c0 pysol-4.82-r1.ebuild 1347
 SHA256 fb3423fed3f91292582732561daa121b1c26dfce9ea450484959a96ab125ae18 pysol-4.82-r1.ebuild 1347
-MISC ChangeLog 1990 RMD160 e427b79d1bc48dd267f541651fdc3f6728e8cb5e SHA1 9dfd7a5fb6880a79f9107fdc32974ce9d30f894c SHA256 13b6bcad951ce646dbda40ed836be2a9bc8ece1117fed5ea12dc4af0c5738e0a
-MD5 9b270e73101fe3956e7ff33d33ccfb52 ChangeLog 1990
-RMD160 e427b79d1bc48dd267f541651fdc3f6728e8cb5e ChangeLog 1990
-SHA256 13b6bcad951ce646dbda40ed836be2a9bc8ece1117fed5ea12dc4af0c5738e0a ChangeLog 1990
+EBUILD pysol-4.82-r2.ebuild 2072 RMD160 bdc6f8f940c2566e29693295bdcc2d40f7d28002 SHA1 300e48a00023aaefd89d4ba977278cef45721389 SHA256 42cad2df47b98ae269f7667df43e6eacfa34f64bee09a86581c47b09f8e6cf90
+MD5 7928485eab18c0f40279162b0ba8c85c pysol-4.82-r2.ebuild 2072
+RMD160 bdc6f8f940c2566e29693295bdcc2d40f7d28002 pysol-4.82-r2.ebuild 2072
+SHA256 42cad2df47b98ae269f7667df43e6eacfa34f64bee09a86581c47b09f8e6cf90 pysol-4.82-r2.ebuild 2072
+MISC ChangeLog 2107 RMD160 0596655cdd943831cd2e3e4e496f4b981f0d1f80 SHA1 6db4f88c43fb709e2fcc87da333b8f39bbfc20e8 SHA256 c52b847b3cd335affd813978771c6a670e87534ad651e150a742c824cb6cf782
+MD5 cdd9a01b5784241ee9b2a999cb294882 ChangeLog 2107
+RMD160 0596655cdd943831cd2e3e4e496f4b981f0d1f80 ChangeLog 2107
+SHA256 c52b847b3cd335affd813978771c6a670e87534ad651e150a742c824cb6cf782 ChangeLog 2107
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -19,3 +27,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 e74e147fe4ba112a396be58f898f77f2 files/digest-pysol-4.82-r1 485
 RMD160 b8a6edf25a4acca1ec6737600d626961fa5343cf files/digest-pysol-4.82-r1 485
 SHA256 bd80c1d11e13d862c974deb2add56cb08bd19898f44d3c5f3a248f64160823fa files/digest-pysol-4.82-r1 485
+MD5 9bcc5081a150b99d63c20725dfab9623 files/digest-pysol-4.82-r2 765
+RMD160 aaf462eda89d68b56b02a71872d8f07c69293465 files/digest-pysol-4.82-r2 765
+SHA256 e3ac857c281d3b76a19669ebfbecfcb30bf35aeabcd5dd8129e366223cc7082c files/digest-pysol-4.82-r2 765
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGEVnbRmMZkarFlIwRAiDaAKDLXafELR/aj9R1+zscp9TdHYzYDgCcCeM9
+t1CZd3JSZMgRey74t2USp2Q=
+=tSmO
+-----END PGP SIGNATURE-----

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 (file)
index 0000000..24e4a4a
--- /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 (file)
index 0000000..ef9a9d3
--- /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}
+}