summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-04-28 09:17:11 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-04-28 09:17:11 +0000
commit37231dae6d531b278b124b11d96695d4ea275983 (patch)
tree6c99b78bfa7b77b5817044859a1c6729b91c8d7c /games-board
parentFix building with USE="-lirc" when lirc is installed wrt #317605. (diff)
downloadgentoo-2-37231dae6d531b278b124b11d96695d4ea275983.tar.gz
gentoo-2-37231dae6d531b278b124b11d96695d4ea275983.tar.bz2
gentoo-2-37231dae6d531b278b124b11d96695d4ea275983.zip
Force pyhton2 fixing bug #312243
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'games-board')
-rw-r--r--games-board/scid/ChangeLog6
-rw-r--r--games-board/scid/files/scid-4.2.2-gentoo.patch11
-rw-r--r--games-board/scid/scid-4.2.2.ebuild14
3 files changed, 26 insertions, 5 deletions
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 <tupone@gentoo.org> 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 <ranger@gentoo.org> scid-4.2.2.ebuild:
stable ppc, bug 306683
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() {