From: Alfredo Tupone Date: Wed, 28 Apr 2010 09:17:11 +0000 (+0000) Subject: Force pyhton2 fixing bug #312243 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3834999d00b2e967a3829590c059315a7c674d8c;p=gentoo.git Force pyhton2 fixing bug #312243 Package-Manager: portage-2.1.8.3/cvs/Linux i686 --- diff --git a/games-board/scid/ChangeLog b/games-board/scid/ChangeLog index 4f9e61ba9b0d..5ee238f34d63 100644 --- a/games-board/scid/ChangeLog +++ b/games-board/scid/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-board/scid # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.28 2010/03/24 14:09:42 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.29 2010/04/28 09:17:10 tupone Exp $ + + 28 Apr 2010; Tupone Alfredo scid-4.2.2.ebuild, + files/scid-4.2.2-gentoo.patch: + Force pyhton2 fixing bug #312243 by arfrever@gentoo.org 24 Mar 2010; Brent Baude scid-4.2.2.ebuild: stable ppc, bug 306683 diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest index 72e9b57f3e0d..cbbfe0e44f19 100644 --- a/games-board/scid/Manifest +++ b/games-board/scid/Manifest @@ -1,5 +1,5 @@ AUX scid-4.0-gentoo.patch 2780 RMD160 e0332723fd57c8b6908c395dc47e9112ed9dc279 SHA1 1c0dffa6429e95a8136bcbf2e521590957c095d3 SHA256 416b83947faf5d1eebe9df9620c794984ccdd56842c76a33546c8d1fa94f9a0b -AUX scid-4.2.2-gentoo.patch 2780 RMD160 e0332723fd57c8b6908c395dc47e9112ed9dc279 SHA1 1c0dffa6429e95a8136bcbf2e521590957c095d3 SHA256 416b83947faf5d1eebe9df9620c794984ccdd56842c76a33546c8d1fa94f9a0b +AUX scid-4.2.2-gentoo.patch 3300 RMD160 0f4aa8f065d4b6affdd722ec91b594ce43d710f0 SHA1 3fb7a82a596f50c6a88c733297263e8509b5b9ef SHA256 90165f14ab84cf1a95728454307320ff364289f7daaa47fa960f2c0b20163f26 DIST photos2007.zip 2497894 RMD160 32ee0c51ad47d309e875e1a4e73212408fec0d03 SHA1 3d358c2368f19e9286decb460bff0fbaba7bd99f SHA256 e5700e6775eb7c236bd46e2898719c7de417651d6bb5b9760d19ad9519d84415 DIST ratings_2009_01.ssp.zip 6128619 RMD160 415fdb2cf7534aa222cc651d9abbd4d7c0b2da18 SHA1 4097366ff895e8b41e293b8166c388a4d0fd6ebb SHA256 71a37e53752d6daa402a0cca1c00bf8fb7f5f3d56567472cafc6a1f5c693e35b DIST scid-4.0.tar.bz2 13658598 RMD160 6553254ac2053ff09f1c6b1c2c1dc49900d0842a SHA1 f7651148cbac9b9cc0681c80a8cb51c0d9b8b0fa SHA256 aee37b7f0a2a960ebacf773e22e97ede775f5a7f20ea27272953369c4f16e821 @@ -7,6 +7,6 @@ DIST scid-4.2.2.tar.bz2 14045085 RMD160 4f57018b34723628cb2f6bed522dedb1f23dca3e DIST scidlet40k.zip 242632 RMD160 f8303ff4f0106ddbc5e8c19d9cdac69842d991e3 SHA1 2f0f3efe4ee3c8bb78857590b61ff7e449b7b72e SHA256 fbab2a31e37f2d606140144ac1086ece035b991a756eef804a660c8ecb0f56bb DIST spelling_2009_01.ssp.zip 1557246 RMD160 4917158112873b7f7767d943a106dc8c3b42acc5 SHA1 665acbf7c59d29465051a0ee03fb135ec34fc140 SHA256 e828bbdefc6a07f86b1bedf053352f0a0c6de4d3927cb7b8dcac2cb4f2c83563 EBUILD scid-4.0.ebuild 2145 RMD160 5ba09a4fddd087ef29680aec3169cbdd96bf9de3 SHA1 7abe8bd69205fb36b3c778ddd8df4376805d2469 SHA256 42cc158462a32270e1b54b09dcd81a78b2aac01202be0a73555632a1639dd16b -EBUILD scid-4.2.2.ebuild 2214 RMD160 4f277e4477182f9593b16eaf6b6a9a7a73c825f2 SHA1 957a2f513092a00ff65ed25e6d9306eb8d6eaa09 SHA256 284ab832528e5b35c74a29158bdcc5891979e63ef9eca42f5dced5985b9bc527 -MISC ChangeLog 3730 RMD160 794cc09d866be49df2a0f236da8c4baadaccfe8f SHA1 341e0a947004c97e700c8676589cd54dad32de25 SHA256 e3af74f5492c633469f7ae4feaa4bdb28b7c972ac9b6d50c3e043a0971c200ee +EBUILD scid-4.2.2.ebuild 2311 RMD160 7791322c104973e91b7cf2cc4e078ad7d89884e0 SHA1 56792b25cee8f71c949f6a10f85f8ac24b85475d SHA256 2e58080d11481c6f874f6e6eb624a1ac7273ece34114d391a6f450257aeac9b8 +MISC ChangeLog 3891 RMD160 e1f6cf173f93c268584a5d7c9ead4be808d393b7 SHA1 c56bf26bc133896e33ad9c0290c8d1befff48b15 SHA256 9f084d44be36a859d1033d037ba809f16406a96f928fac436452154007d5d2ed MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 diff --git a/games-board/scid/files/scid-4.2.2-gentoo.patch b/games-board/scid/files/scid-4.2.2-gentoo.patch index 81e50cbc8496..0b24f1d7dbde 100644 --- a/games-board/scid/files/scid-4.2.2-gentoo.patch +++ b/games-board/scid/files/scid-4.2.2-gentoo.patch @@ -85,3 +85,14 @@ diff -ru scid.orig/tcl/utils/sound.tcl scid/tcl/utils/sound.tcl set hasSnackPackage 0 ::splash::add " Move speech disabled - Snack sound package not found" return +--- scid/Makefile.conf.old 2010-04-28 11:02:18.000000000 +0200 ++++ scid/Makefile.conf 2010-04-28 11:03:17.000000000 +0200 +@@ -199,7 +199,7 @@ + # Small extra programs. Most are written in Tcl using tcscid, but + # a few contributed ones may be in Python or other languages. + # +-SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix spliteco spf2spi ++SCRIPTS= sc_addmove sc_epgn sc_spell sc_eco sc_import sc_remote sc_tree scidpgn pgnfix eco2pgn spliteco spf2spi + + #################### + diff --git a/games-board/scid/scid-4.2.2.ebuild b/games-board/scid/scid-4.2.2.ebuild index 40ba31d2b72e..6e4e566c0e28 100644 --- a/games-board/scid/scid-4.2.2.ebuild +++ b/games-board/scid/scid-4.2.2.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-4.2.2.ebuild,v 1.5 2010/03/24 14:09:42 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-4.2.2.ebuild,v 1.6 2010/04/28 09:17:11 tupone Exp $ EAPI=2 -inherit eutils toolchain-funcs games +PYTHON_DEPEND="2" +inherit eutils toolchain-funcs python games DESCRIPTION="a free chess database application" HOMEPAGE="http://scid.sourceforge.net/" @@ -23,11 +24,15 @@ DEPEND=">=dev-lang/tk-8.3 app-arch/unzip" RDEPEND="${DEPEND} !games-board/chessdb - x11-libs/libX11 - >=dev-lang/python-2.1" + x11-libs/libX11" S=${WORKDIR}/${PN} +pkg_setup() { + python_set_active_version 2 + games_pkg_setup +} + src_prepare() { epatch "${FILESDIR}"/${P}-gentoo.patch sed -i \ @@ -37,6 +42,7 @@ src_prepare() { src/scidlet.cpp \ || die "sed failed" gzip ../ratings_2009_01.ssp + python_convert_shebangs -r 2 . } src_configure() {