Added kde3 patch, bug #211493.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo x86_64

4 files changed, 120 insertions, 2 deletions

diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index 6cd452142937..551e96007c64 100644
--- a/app-i18n/skim/ChangeLog
+++ b/app-i18n/skim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/skim
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.58 2008/11/12 00:41:15 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.59 2008/11/16 06:16:14 matsuu Exp $
+
+*skim-1.4.5-r2 (16 Nov 2008)
+
+  16 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/skim-1.4.5-kde3.patch, +skim-1.4.5-r2.ebuild:
+  Added kde3 patch, bug #211493.
 
 *skim-1.4.5-r1 (12 Nov 2008)
 
diff --git a/app-i18n/skim/Manifest b/app-i18n/skim/Manifest
index ef2ab4c34f31..0c7bd9df446e 100644
--- a/app-i18n/skim/Manifest
+++ b/app-i18n/skim/Manifest
@@ -1,8 +1,10 @@
 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
 DIST skim-1.4.2.tar.bz2 1062345 RMD160 89a3025943e36df1e56861a7cc70e45ae895fe69 SHA1 700df6e558265d8e6128b728fc1803cf4eed3dbb SHA256 b199e48ea240171f511ead4ec0926d7d111d822320121f9dc0fd5a1970b8a826
 DIST skim-1.4.5.tar.bz2 1075918 RMD160 0ac73f48233cd85e047039d2942a9b9e2e8f2d86 SHA1 6e0ec92ab13b4d5b57ad42b34d5223c0d453fdb0 SHA256 7c7962d5b2d50a1150c04333e7bd23496cc23d9baa65ffde48f2192c85fde09d
 EBUILD skim-1.4.2.ebuild 1640 RMD160 86343e3b585604cb4a57bbc3e1b3057deb7ae096 SHA1 e34783595ee618f4989981fa4ba55b85f4855a45 SHA256 5227d7e30925102d9f323e00bdb473aab87443cafaceff65406de3b055e44b24
 EBUILD skim-1.4.5-r1.ebuild 2280 RMD160 41fecb128d4b7481892167c089f9c552ea4fa71e SHA1 3beca5817f72fa69874a8954454cd28c7ce6859d SHA256 b1266db97253dfe52645bd49435cf29bdc2cc3884a2d512294f957d80b0578f2
+EBUILD skim-1.4.5-r2.ebuild 2160 RMD160 28f847d2549b7c700f4fb374936e1bf4493a549b SHA1 21a5bff95e13cfc75cd34a2f60515145edcccb2b SHA256 6a8c293c4750da429abbcb5024dbf2c995f673c99801ee3c4fa2435e3dda75e3
 EBUILD skim-1.4.5.ebuild 2025 RMD160 cfc35810fe9160f813483a227c1a84c3f440cb5e SHA1 9677f7acb7ca4e9a787e024f2fda63aba305fe62 SHA256 f1678c165786d1c2fc2374ae6b3c34b7b9bd4d2c460f15b64867f55b47317465
-MISC ChangeLog 7810 RMD160 bdbe5d8ba9b5ee03ff15834c32c2ec8cb39fbc3e SHA1 28dc537c934e3e0c3cefd55690506d318792340d SHA256 fa32e586cc367c98782ee64df149878570c4ab7222d5ae8836f941bdaf711bd4
+MISC ChangeLog 7978 RMD160 c5f2ea53cd5004d2d2dcdf5bb8c0f1fcfbcd779c SHA1 fb8e32e30b973404152c6f33e295c3c42d3902a2 SHA256 69d4e29785b0d17a47ecb7d922565af6ddb3d959def91ed270888be38b335f56
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/skim/files/skim-1.4.5-kde3.patch b/app-i18n/skim/files/skim-1.4.5-kde3.patch
new file mode 100644
index 000000000000..b3d4a7dd62b8
--- /dev/null
+++ b/app-i18n/skim/files/skim-1.4.5-kde3.patch
@@ -0,0 +1,33 @@
+diff -U3 -r skim-1.4.5.orig/bksys/kde.py skim-1.4.5.mod/bksys/kde.py
+--- skim-1.4.5.orig/bksys/kde.py	2006-06-04 04:03:36.000000000 +0200
++++ skim-1.4.5.mod/bksys/kde.py	2008-11-15 15:54:16.000000000 +0100
+@@ -368,7 +368,7 @@
+ 	env['BUILDERS']['Uic']=Builder(action=uic_processing,emitter=uicEmitter,suffix='.h',src_suffix='.ui')
+ 
+ 	def kcfg_buildit(target, source, env):
+-		comp='kconfig_compiler -d%s %s %s' % (str(source[0].get_dir()), source[1].path, source[0].path)
++		comp=env['KDEDIR']+'/bin/kconfig_compiler -d%s %s %s' % (str(source[0].get_dir()), source[1].path, source[0].path)
+ 		return env.Execute(comp)
+ 	def kcfg_stringit(target, source, env):
+ 		print "processing %s to get %s and %s" % (source[0].name, target[0].name, target[1].name)
+diff -U3 -r skim-1.4.5.orig/src/skimpluginmanager.cpp skim-1.4.5.mod/src/skimpluginmanager.cpp
+--- skim-1.4.5.orig/src/skimpluginmanager.cpp	2006-06-04 04:03:36.000000000 +0200
++++ skim-1.4.5.mod/src/skimpluginmanager.cpp	2008-11-15 15:41:47.000000000 +0100
+@@ -65,7 +65,7 @@
+             f.close();
+         }
+ #endif
+-        ScimKdeSettings::writeConfig();
++        ScimKdeSettings::self()->writeConfig();
+         return true;
+     }
+ 
+@@ -286,7 +286,7 @@
+ #endif
+     //check whether the configure is already saved when logout the session
+     if(!m_sm->dataCommitted())
+-        ScimKdeSettings::writeConfig();
++        ScimKdeSettings::self()->writeConfig();
+ 
+     delete m_sm;
+     delete ScimKdeSettings::self();
diff --git a/app-i18n/skim/skim-1.4.5-r2.ebuild b/app-i18n/skim/skim-1.4.5-r2.ebuild
new file mode 100644
index 000000000000..a8e28b830780
--- /dev/null
+++ b/app-i18n/skim/skim-1.4.5-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2000-2008 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-r2.ebuild,v 1.1 2008/11/16 06:16:14 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"
+	sed -i -e "s:/opt/kde3:${KDEDIR}:g" doc/de/index.docbook || die
+}
+
+src_compile() {
+	local sconsopts=$(echo "${MAKEOPTS}" | sed -e "s/.*\(-j[0-9]\+\).*/\1/")
+	[ "${MAKEOPTS/-s/}" != "${MAKEOPTS}" ] && sconsopts="${sconsopts} -s"
+
+	./configure prefix=/usr libdir=/usr/$(get_libdir) || die
+	sed -i -e "/^compilers/s:\[:\['$(tc-getCXX)',:" scons-local-0.96.1/SCons/Tool/g++.py || die
+	./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
+}