Fixed python-2.6 issue again and again, bug #255210.

(Portage version: 2.1.6.11/cvs/Linux x86_64)

3 files changed, 107 insertions, 1 deletions

diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index d8ed8c9f5104..036210e63b2e 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/skim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.65 2009/02/14 01:22:00 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.66 2009/04/30 23:46:37 matsuu Exp $
+
+*skim-1.4.5-r5 (30 Apr 2009)
+
+  30 Apr 2009; MATSUU Takuto <matsuu@gentoo.org>
+  +files/skim-1.4.5-python26-2.patch, +skim-1.4.5-r5.ebuild:
+  Fixed python-2.6 issue again and again, bug #255210.
 
 *skim-1.4.5-r4 (14 Feb 2009)
 
diff --git a/app-i18n/skim/files/skim-1.4.5-python26-2.patch b/app-i18n/skim/files/skim-1.4.5-python26-2.patch
new file mode 100644
index 000000000000..2898e5c86ee0
--- /dev/null
+++ b/app-i18n/skim/files/skim-1.4.5-python26-2.patch
@@ -0,0 +1,13 @@
+--- skim-1.4.5.orig/scons-local-0.96.1/SCons/Util.py	2009-04-29 12:49:05.000000000 +1000
++++ skim-1.4.5/scons-local-0.96.1/SCons/Util.py	2009-04-29 12:49:41.000000000 +1000
+@@ -696,6 +696,10 @@
+ class CLVar(UserList.UserList):
+     def __init__(self, seq=[]):
+         UserList.UserList.__init__(self, Split(seq))
++    def __add__(self, other):
++        return UserList.UserList.__add__(self, CLVar(other))
++    def __radd__(self, other):
++        return UserList.UserList.__radd__(self, CLVar(other))
+     def __coerce__(self, other):
+         return (self, CLVar(other))
+     def __str__(self):
diff --git a/app-i18n/skim/skim-1.4.5-r5.ebuild b/app-i18n/skim/skim-1.4.5-r5.ebuild
new file mode 100644
index 000000000000..b40324d61a4a
--- /dev/null
+++ b/app-i18n/skim/skim-1.4.5-r5.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2000-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/skim-1.4.5-r5.ebuild,v 1.1 2009/04/30 23:46:37 matsuu Exp $
+
+inherit kde-functions multilib toolchain-funcs eutils
+
+DESCRIPTION="Smart Common Input Method (SCIM) optimized for KDE"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
+	http://freedesktop.org/~cougar/skim/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-i18n/scim-1.4.4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+need-kde 3.2
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	# bug #211493
+	epatch "${FILESDIR}/${P}-kde3.patch"
+	#
+	epatch "${FILESDIR}/${P}-klineedit.patch"
+
+	sed -i -e "/^env =/s:(:(CXX='$(tc-getCXX)', :" SConstruct || die
+
+	sed -i -e "s:/opt/kde3:${KDEDIR}:g" doc/de/index.docbook || die
+
+	# bug #246223
+	ln -s libscim-kdeutils.so.0.1.0 utils/libscim-kdeutils.so || die
+
+	# bug #255210
+	tar xjf bksys/scons-mini.tar.bz2 || die
+	epatch "${FILESDIR}/${P}-python26.patch"
+	epatch "${FILESDIR}/${P}-python26-2.patch"
+}
+
+src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
+	[ "${MAKEOPTS/-s/}" != "${MAKEOPTS}" ] && sconsopts="${sconsopts} -s"
+	./scons ${sconsopts} || die
+}
+
+src_install() {
+	DESTDIR="${D}" ./scons prefix=/usr install || die
+
+	# Install the .desktop file in FDO's suggested directory
+	dodir /usr/share/applications/kde
+	mv "${D}/usr/share/applnk/Utilities/skim.desktop" \
+		"${D}/usr/share/applications/kde"
+
+	dodoc ChangeLog AUTHORS NEWS README TODO
+	mv "${D}/usr/share/doc/HTML" "${D}/usr/share/doc/${PF}/html"
+}
+
+pkg_postinst() {
+	elog
+	elog "If you want to use Chinese interface, edit your startup script"
+	elog "such as .xinitrc to incorporate"
+	elog
+	elog '	export XMODIFIERS=@im=SCIM'
+	elog ' export QT_IM_MODULE=scim'
+	elog ' export GTK_IM_MODULE=scim'
+	elog '	export LANG="zh_CN.GBK"'
+	elog '	startkde'
+	elog
+	elog "or if you prefer English interface,"
+	elog
+	elog '	export XMODIFIERS=@im=SCIM'
+	elog ' export QT_IM_MODULE=scim'
+	elog ' export GTK_IM_MODULE=scim'
+	elog '	export LC_CTYPE="zh_CN.GBK"'
+	elog '	startkde'
+	elog
+	elog "and start skim and SCIM by"
+	elog
+	elog "	% skim -d"
+	elog
+}