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

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

4 files changed, 110 insertions, 2 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/Manifest b/app-i18n/skim/Manifest
index d9d8cd05ad72..dd7458088955 100644
--- a/app-i18n/skim/Manifest
+++ b/app-i18n/skim/Manifest
@@ -1,11 +1,13 @@
 AUX skim-1.4.5-asneeded.patch 2018 RMD160 e5cac0dbfb9d3994c1aa4b98523919dc1dc72034 SHA1 3a9869cc02564bc0c5a5c0955f9537d3e2345a58 SHA256 e1a51d629d205d9d15e0e95fe629d7421eb4785d9429da3d37b71ae47bbf5528
 AUX skim-1.4.5-kde3.patch 1476 RMD160 0ce8fd146688a171cbc7f461c22d63dab5b32aac SHA1 b22cd34630f00cfd60d1b038988ad329c71ecca4 SHA256 82bbf0dba13bd56663268ef6a1933bf1e60877ecebb12909c41bea88716aedc6
 AUX skim-1.4.5-klineedit.patch 501 RMD160 df7a5f3c28dcfb18cd8109b45da278557d831dee SHA1 9bb5e074f47e20cba192fd90dfe2d7cf17ffc6d3 SHA256 b9e67a57ad12dc83dd1c9bfc703c48d87d0d103d9409560f88168f95502741d7
+AUX skim-1.4.5-python26-2.patch 597 RMD160 d52c10848d3f1d4fdf7da299fddc28f1e0f1a562 SHA1 839dfcc1e66e9d032b65f81024b69104b58da0f7 SHA256 112380ee1ab6f68b9fffb0ca4f11ecef14cf9226fd19b792c957bbc6bb48fef2
 AUX skim-1.4.5-python26.patch 534 RMD160 d5090fe477de31b19296c2d22e223e0c97c2046a SHA1 9e256589b6e1ed81c4b5576f346837a57d936fce SHA256 227b55a23a3f68ee5c38403bff78bb5d795b97ecffc1235be16470b4a922c086
 DIST skim-1.4.5.tar.bz2 1075918 RMD160 0ac73f48233cd85e047039d2942a9b9e2e8f2d86 SHA1 6e0ec92ab13b4d5b57ad42b34d5223c0d453fdb0 SHA256 7c7962d5b2d50a1150c04333e7bd23496cc23d9baa65ffde48f2192c85fde09d
 EBUILD skim-1.4.5-r2.ebuild 2239 RMD160 5efdf404a696ecc083b49e13dd125dc2b29ec7bb SHA1 0f113a68f8f9f7ef19b17a864bdd6c9e0e77d5bf SHA256 31b43d2924763a023efb592018ebe8b377ffb0c8ff1fd5198b2ae81dda5f0d44
 EBUILD skim-1.4.5-r3.ebuild 2345 RMD160 57b1068b055602db5d0f7708d2aefbe06b1058dc SHA1 7799946ee434d21600d1554c0ee08b8764565476 SHA256 3d81d9d5b3379c452f2a6f66dd0f27a63f0b46998f2054704dc0a0dc222e6335
 EBUILD skim-1.4.5-r4.ebuild 2303 RMD160 9c0f492695619de9e4aa9ad814475ba95bcc4e78 SHA1 3e88b0e429aee125017828088778c33d165915bd SHA256 3d0a6049040e20be6f6d0210eeb7668be0017d42a615202a7ed623a768f47720
+EBUILD skim-1.4.5-r5.ebuild 2347 RMD160 fc93d9866b698c5be78bbeb289c516a7726d431d SHA1 06d5bf7cb7829cb15bc397c3db943047af0f0b1f SHA256 e634866dafa317605fe5769a972f592971d3dddfc3ea54621105ce8244e8e9f8
 EBUILD skim-1.4.5.ebuild 2025 RMD160 cfc35810fe9160f813483a227c1a84c3f440cb5e SHA1 9677f7acb7ca4e9a787e024f2fda63aba305fe62 SHA256 f1678c165786d1c2fc2374ae6b3c34b7b9bd4d2c460f15b64867f55b47317465
-MISC ChangeLog 8865 RMD160 ee400a3f62ea6600b90628b427e3bbdcde055c9f SHA1 ac373048338f908674dca61357777a132076e863 SHA256 197b087f956e30efc6e7e3c2d85561d110d5353a408518cdc1c8c54dc8a0f5f3
+MISC ChangeLog 9061 RMD160 077920d3a88505edcc524e37dbabaa04ad760eac SHA1 ffd4054cbb48080b25709fe52c03937e79623593 SHA256 07d60481bd51a501feb1bf1b4b6e6ea65151bab45a7415d2514bb7ebdf2b6635
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
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
+}