summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Ospald <hasufell@gentoo.org>2013-11-30 19:48:04 +0000
committerJulian Ospald <hasufell@gentoo.org>2013-11-30 19:48:04 +0000
commita3a7f476b51225b54e20168a0270804f65b4f39f (patch)
treeac95395402cc2545ffe0e00e0bd411987af0209f
parentamd64 stable, bug #478252 (diff)
downloadhistorical-a3a7f476b51225b54e20168a0270804f65b4f39f.tar.gz
historical-a3a7f476b51225b54e20168a0270804f65b4f39f.tar.bz2
historical-a3a7f476b51225b54e20168a0270804f65b4f39f.zip
restrict to dev-lang/python-exec:0 because dev-lang/python-exec:2 is broken wrt #489646
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3
-rw-r--r--games-board/pysolfc/ChangeLog6
-rw-r--r--games-board/pysolfc/Manifest18
-rw-r--r--games-board/pysolfc/pysolfc-2.0-r2.ebuild8
3 files changed, 27 insertions, 5 deletions
diff --git a/games-board/pysolfc/ChangeLog b/games-board/pysolfc/ChangeLog
index 9e033ac8e095..9a114feec677 100644
--- a/games-board/pysolfc/ChangeLog
+++ b/games-board/pysolfc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-board/pysolfc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/ChangeLog,v 1.13 2013/11/22 18:50:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/ChangeLog,v 1.14 2013/11/30 19:47:58 hasufell Exp $
+
+ 30 Nov 2013; Julian Ospald <hasufell@gentoo.org> pysolfc-2.0-r2.ebuild:
+ restrict to dev-lang/python-exec:0 because dev-lang/python-exec:2 is broken
+ wrt #489646
22 Nov 2013; Michael Sterrett <mr_bones_@gentoo.org> pysolfc-2.0-r2.ebuild:
just use dev-python/pillow
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
index 697fb512d862..f4ee0bb36d5f 100644
--- a/games-board/pysolfc/Manifest
+++ b/games-board/pysolfc/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX pysolfc-PIL-imports.patch 1693 SHA256 5a65b6f830fa486ea1c2f70f60a45e088ad84584f669d53b2d2afb466474032f SHA512 663d20457c044cd0376885081a741efd0c8ecc9f91bb7b07625c95ab6261ae4119d58d1c9ae407e25048acc46564ad13531f8c1d84720be82ee1e25a90695c3d WHIRLPOOL 52f012d7204cdc5f780aa1b5c5e745724073393c9833291ca37626cad024f8de19236ff150d3fd56dd07b3a161d7a8d7ae6724730a3000552cd797ccb9ba80de
DIST PySolFC-2.0.tar.bz2 4208776 SHA256 dbcb8e7e6d0479c230745a2be91c0c9b9e8524407cd2075f2dae144e5d441b6c SHA512 ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc WHIRLPOOL 468d595ee1ae0a3a0129f9e822f9985cd0c7c9a00766dc711a5b8d202742bdd26393a676bc7515e39e1ddad71a3ef65d3d27ada0ec339212662126a42a07ad8c
DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 SHA256 c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8 WHIRLPOOL ae779f1838d321e727c0661980c7f40ff368aa958a3fd1043448229d5b2a56ce94799f343b8527666081b043a469760f7f3b0a3e2d58263d69c16cb3456d7df5
EBUILD pysolfc-2.0-r1.ebuild 1772 SHA256 b2ec7731c611577808b93a819c6343a4784bbe5d0a5dc57b80c3224c2ac3398f SHA512 49d1d392f13e9958c35b9722ea98c46b458f21892c9ecb113cd692913458238e8ecd090bf454f4276b521a05fc00e65a1a12302bf0a9be50425f3df349367454 WHIRLPOOL 442bd0b068f39a546f934e0f3c699dd8df0630e919360795be88bd859a7499663989fd80be80a0dbd8d35a6c8be9d61b97e6aac59eb33963203e142c0e6d4f26
-EBUILD pysolfc-2.0-r2.ebuild 1868 SHA256 bca7ec510a6bac78ac6acaa77821912652261f0736e2ae453df03517c055f0d1 SHA512 4ff91230ad50d2897ada805922c3f34908b7d704d173086f8caa002065d0bce0076b26958e1d5174553346c6766fcefc6d4f2eaa25a539190f943b6d2c1ae094 WHIRLPOOL eb3cb2c264cdec735f27b93e67ce8432a53a793889755608e7e33bf42ef3fe6f84b136a762318dbd384d1f73fcc921cc2781dfc165ed1f99d828a328d186c4f1
-MISC ChangeLog 1926 SHA256 0cd7c58a5a3857e8b29fe8b5fea7faf6198dca41184283a0eb6406d57448c7dc SHA512 5c107157882c2ca56f5db739ee7cca96da231ea170ebfb4c22b91fc7bb161fe03b31291c40d91d538a99eadfdcc11fc7a408133414a25624c057f037859f1470 WHIRLPOOL 5dc5ad5e410731fdf7d5216087f56229848d8df82e393de8a19b6ce794dae67bc993a360e02f1aa16a2cf9ff384558a7e9316c86ed2f580aa436207aff3ef674
+EBUILD pysolfc-2.0-r2.ebuild 2004 SHA256 63d941ad1845c0215df2ce2e42d055f82eb9802628c6350ad85e234bfcff7a14 SHA512 ae117efe8745f0fbf011101b1294a7497a0947310ed36ed4e099bfc22ac893060cf9069b8635c7113fbe40a644aa9a0a94e96d2aea776c035265f5e126254830 WHIRLPOOL e3224fe81088fa8ea60f981754046448639ed5bb2cec0b2903afe22bf98cb7390f6542cd855c415389e86bf2cb8e4f32529848b22c8549b429a1316ee768fab3
+MISC ChangeLog 2092 SHA256 02e26f5554bef8cdd6508f68a4b1ae84fbbbea1f96dedd8f7f7921930edae521 SHA512 1da37ba073e000be1ca5e4e1b2a5e721d3e23074b872d4b63592d802e9f5ab6b0b488687398595d1f07ea95898eb48a63d8415f393c9c84a420c6ee155587379 WHIRLPOOL d2fcd4d8fc4dd38cb213959529352ea2790c581cd69ae602fcf6d90129e427452cbd4f712b9976da2e4b2f79c18c39a59632a518925a1579e82810a7da5b02c6
MISC metadata.xml 322 SHA256 5b8f03faf13d94e9bf017c1efa855dda0e0518b2d81b08df1027fb73142ad2d2 SHA512 032916f3e85f249445c0f5e9f005c0dc6e9b7263f1914cd3feb441536ec123435ae482bc7805827cc9c67c830a2e0fd239b0d014a365137bfe08049de7823270 WHIRLPOOL 444bbd40c624955a7014df915987824afe214949dae9ed85af2fbc39e66fb3739b52e3f15bc64c5b9d2dc1ed2b26a6abd3797fd9603727585e383fbe0e608c9d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSmkD0AAoJEFpvPKfnPDWzluUH/3XIlhHVrmLQI1k68cmMYRRZ
+SLmGXFthAuP2T9GgcrtX0cVslxYtA2QpbJo3GjU2WfM/x7Gz2uA+8nf/oI1OwpPJ
+N5zNxujO4ZQQumzuGmE0H1DM5b80jp9+qhcXadUXL7eBD4AmgqKwKNzbQ1mQMLuY
+7zGl/TdJMJLhdUFZqoDswhRc2IJER9kQrs4jXEhqaJxOssvAkAdeY/B//29bVY7S
+oDub8YS/l2NoX5EgeTA8z9CUaKWQertKtMdMmLFodgIcBkdZpdDeoiNe1JZmCt6O
+CUAYmPPtl3N8wtI34vaqHw5SjXZD2kxhgXr+6Tina0AzvqC7112N8yNMiO3kUC0=
+=ye1V
+-----END PGP SIGNATURE-----
diff --git a/games-board/pysolfc/pysolfc-2.0-r2.ebuild b/games-board/pysolfc/pysolfc-2.0-r2.ebuild
index ef3183075963..28c25169f1bd 100644
--- a/games-board/pysolfc/pysolfc-2.0-r2.ebuild
+++ b/games-board/pysolfc/pysolfc-2.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/pysolfc-2.0-r2.ebuild,v 1.3 2013/11/22 18:50:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysolfc/pysolfc-2.0-r2.ebuild,v 1.4 2013/11/30 19:47:58 hasufell Exp $
EAPI=5
@@ -24,10 +24,14 @@ IUSE="extra-cardsets minimal +sound"
S=${WORKDIR}/${MY_PN}-${PV}
-RDEPEND="sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+RDEPEND="dev-lang/python-exec:0[${PYTHON_USEDEP}]
+ sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
dev-tcltk/tktable )"
+# disable python-exec:2 support, because it is broken wrt #489646
+_PYTHON_WANT_PYTHON_EXEC2=0
+
python_prepare_all() {
local PATCHES=(
"${FILESDIR}/${PN}-PIL-imports.patch" #471514