Fixed doc/de/docbook issue, bug #211493. Fixed #246223.

(Portage version: 2.2_rc13/cvs/Linux 2.6.27-gentoo x86_64)

3 files changed, 104 insertions, 7 deletions

diff --git a/app-i18n/skim/ChangeLog b/app-i18n/skim/ChangeLog
index 7370616f7ff8..6cd452142937 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.57 2008/04/21 15:36:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/skim/ChangeLog,v 1.58 2008/11/12 00:41:15 matsuu Exp $
+
+*skim-1.4.5-r1 (12 Nov 2008)
+
+  12 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  files/skim-1.4.5-asneeded.patch, +skim-1.4.5-r1.ebuild:
+  Fixed doc/de/docbook issue, bug #211493. Fixed #246223.
 
   21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/skim-1.4.5-asneeded.patch, skim-1.4.5.ebuild:
diff --git a/app-i18n/skim/files/skim-1.4.5-asneeded.patch b/app-i18n/skim/files/skim-1.4.5-asneeded.patch
index 597b06897c67..555fc62dc7a3 100644
--- a/app-i18n/skim/files/skim-1.4.5-asneeded.patch
+++ b/app-i18n/skim/files/skim-1.4.5-asneeded.patch
@@ -1,8 +1,7 @@
-Index: skim-1.4.5/src/SConscript
-===================================================================
---- skim-1.4.5.orig/src/SConscript
-+++ skim-1.4.5/src/SConscript
-@@ -7,8 +7,6 @@ srcenv.Add_define('VERSION')
+diff -Naur skim-1.4.5.orig/src/SConscript skim-1.4.5/src/SConscript
+--- skim-1.4.5.orig/src/SConscript	2006-06-04 11:03:36.000000000 +0900
++++ skim-1.4.5/src/SConscript	2008-11-12 08:45:35.000000000 +0900
+@@ -7,8 +7,6 @@
  srcenv.Add_define('PACKAGE')
  srcenv.Add_define('SCIM_VERSION')
  srcenv.AppendUnique(CCFLAGS = env['SCIM_CFLAGS'] )
@@ -11,7 +10,7 @@ Index: skim-1.4.5/src/SConscript
  srcenv.KDEaddlibs( "qt-mt kdecore kdeui kutils" )
  
  libskim=srcenv.Copy()
-@@ -23,13 +21,13 @@ libskim.KDEaddpaths_includes( "#/ #/src"
+@@ -23,13 +21,13 @@
  #libskim.KDEaddlibs( "qt-mt kdecore kdeui kutils" )
  libskim.Add_define('SCIM_BINARY_VERSION')
  libskim.Add_define('SCIM_LIBDIR')
@@ -27,3 +26,15 @@ Index: skim-1.4.5/src/SConscript
  skim_includes = '#/ #/src'
  skim.KDEprogram(
  		target      = 'skim',
+diff -Naur skim-1.4.5.orig/utils/SConscript skim-1.4.5/utils/SConscript
+--- skim-1.4.5.orig/utils/SConscript	2006-06-04 11:03:36.000000000 +0900
++++ skim-1.4.5/utils/SConscript	2008-11-12 08:52:49.000000000 +0900
+@@ -4,7 +4,7 @@
+ 
+ utils=env.Copy()
+ utils_sources='scimkdesettings.kcfgc scimmovehandle.cpp scimdragableframe.cpp scimxmlguibuilder.cpp scimactions.cpp scimtoolbar.cpp kautocmodule.cpp skimplugininfo.cpp'
+-utils.KDEshlib( 'libscim-kdeutils', utils_sources, kdelib=1, vnum=utils.libskim_version() )
++utils.KDEshlib( 'libscim-kdeutils', utils_sources, kdelib=1, vnum=utils.libskim_version(), globallibs=(env['SCIM_LIBS'] + env['SCIM_X11_LIBS']))
+ utils.KDEaddpaths_includes( "#/ #/src" )
+ utils.KDEaddlibs( "qt-mt kdecore kdeui" )
+ 
diff --git a/app-i18n/skim/skim-1.4.5-r1.ebuild b/app-i18n/skim/skim-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..61ee6b95bcf2
--- /dev/null
+++ b/app-i18n/skim/skim-1.4.5-r1.ebuild
@@ -0,0 +1,80 @@
+# 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-r1.ebuild,v 1.1 2008/11/12 00:41:15 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
+	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
+#	sed -i \
+#		-e "/c_compilers=/s:\[:\['$(tc-getCC)',:" \
+#		-e "/cxx_compilers=/s:\[:\['$(tc-getCXX)',:" \
+#		scons-local-0.96.1/SCons/Tool/__init__.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
+}