Fix building with Qt 3.3.5, thanks to Wai Ling for reporting. Make skim support conditional to kde useflag in last version (drop alpha, sparc, ppc64 keywords). Don't use gnome2 eclass if unneeded.

(Portage version: 2.1.1_pre2-r2)

7 files changed, 129 insertions, 2 deletions

diff --git a/app-i18n/scim-pinyin/ChangeLog b/app-i18n/scim-pinyin/ChangeLog
index 54441a235c99..02952a6bafb3 100644
--- a/app-i18n/scim-pinyin/ChangeLog
+++ b/app-i18n/scim-pinyin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-i18n/scim-pinyin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/ChangeLog,v 1.12 2006/04/30 11:49:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/ChangeLog,v 1.13 2006/07/03 19:28:42 flameeyes Exp $
+
+*scim-pinyin-0.5.91-r1 (03 Jul 2006)
+
+  03 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/scim-pinyin-0.5.91-fixconfigure.patch,
+  +files/scim-pinyin-qt335.patch, scim-pinyin-0.5.91.ebuild,
+  +scim-pinyin-0.5.91-r1.ebuild:
+  Fix building with Qt 3.3.5, thanks to Wai Ling for reporting. Make skim
+  support conditional to kde useflag in last version (drop alpha, sparc, ppc64
+  keywords). Don't use gnome2 eclass if unneeded.
 
   30 Apr 2006; Simon Stelling <blubb@gentoo.org> scim-pinyin-0.5.91.ebuild:
   stable on amd64
diff --git a/app-i18n/scim-pinyin/files/digest-scim-pinyin-0.5.91 b/app-i18n/scim-pinyin/files/digest-scim-pinyin-0.5.91
index 9209acbb6ed1..31645798bd77 100644
--- a/app-i18n/scim-pinyin/files/digest-scim-pinyin-0.5.91
+++ b/app-i18n/scim-pinyin/files/digest-scim-pinyin-0.5.91
@@ -1 +1,3 @@
 MD5 fb96d3545090d7681ea03edaced4eccb scim-pinyin-0.5.91.tar.gz 5492055
+RMD160 dbde7b7871c7baf3656cd4c7000196cf99ae15e2 scim-pinyin-0.5.91.tar.gz 5492055
+SHA256 9b6b24af841cbf0353b919df7f56be931850fccf3b914172af7a39b6db726653 scim-pinyin-0.5.91.tar.gz 5492055
diff --git a/app-i18n/scim-pinyin/files/digest-scim-pinyin-0.5.91-r1 b/app-i18n/scim-pinyin/files/digest-scim-pinyin-0.5.91-r1
new file mode 100644
index 000000000000..31645798bd77
--- /dev/null
+++ b/app-i18n/scim-pinyin/files/digest-scim-pinyin-0.5.91-r1
@@ -0,0 +1,3 @@
+MD5 fb96d3545090d7681ea03edaced4eccb scim-pinyin-0.5.91.tar.gz 5492055
+RMD160 dbde7b7871c7baf3656cd4c7000196cf99ae15e2 scim-pinyin-0.5.91.tar.gz 5492055
+SHA256 9b6b24af841cbf0353b919df7f56be931850fccf3b914172af7a39b6db726653 scim-pinyin-0.5.91.tar.gz 5492055
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-fixconfigure.patch b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-fixconfigure.patch
new file mode 100644
index 000000000000..e91b084f3211
--- /dev/null
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-fixconfigure.patch
@@ -0,0 +1,33 @@
+Index: scim-pinyin-0.5.91/configure.ac
+===================================================================
+--- scim-pinyin-0.5.91.orig/configure.ac
++++ scim-pinyin-0.5.91/configure.ac
+@@ -73,11 +73,7 @@ AC_ARG_ENABLE(debug,
+ 	      enable_debug=no)
+ 
+ AC_ARG_ENABLE(skim-support,
+-              [  --disable-skim-support  Enable skim Setup UI],
+-              skim_support=no,
+-              skim_support=yes)
+-
+-AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$skim_support" = "yes"])
++              [  --disable-skim-support  Enable skim Setup UI])
+ 
+ if test "$enable_debug" = "yes"; then
+   AC_DEFINE(ENABLE_DEBUG,1,[Define this to enable the debug facility in libscim])
+@@ -126,7 +122,7 @@ AC_CONFIG_FILES([Makefile
+                  po/Makefile.in
+                  scim-pinyin.spec])
+ 
+-if test "$skim_support" = "yes"; then
++if test "x$enable_skim_support" != "xno"; then
+ REQUIRED_SKIM_VERSION=1.2.1
+ dnl skim probably has been installed under prefix=$KDEDIR, so add it to search path of pkgconfig
+ kde_libsuffix=`kde-config --libsuffix`
+@@ -155,5 +151,6 @@ PKG_CHECK_MODULES(SCIM_KDEUTILS,[scim_kd
+ fi
+ 
+ AM_CONDITIONAL(SCIM_PINYIN_ENABLE_SKIM_SUPPORT, [test "$HAS_KDEUTILS" = "yes"])
++AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$HAS_SKIM" = "yes"])
+ AC_SUBST(SCIM_PINYIN_ENABLE_SKIM_SUPPORT)
+ AC_OUTPUT
diff --git a/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch b/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
new file mode 100644
index 000000000000..c7c0c595c0d1
--- /dev/null
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
@@ -0,0 +1,25 @@
+Index: scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
+===================================================================
+--- scim-pinyin-0.5.91.orig/skim/setupui/smartpinyinui.ui
++++ scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
+@@ -863,20 +863,4 @@
+     <tabstop>kcfg__IMEngine_Pinyin_DisablePhraseKey</tabstop>
+ </tabstops>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-</includehints>
+ </UI>
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r1.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r1.ebuild
new file mode 100644
index 000000000000..6c006ceb4c22
--- /dev/null
+++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r1.ebuild,v 1.1 2006/07/03 19:28:42 flameeyes Exp $
+
+inherit kde-functions eutils autotools
+
+DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+IUSE="kde nls"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="|| ( x11-libs/libXt virtual/x11 )
+	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
+	kde? ( app-i18n/skim )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fixconfigure.patch"
+	epatch "${FILESDIR}/${PN}-qt335.patch"
+
+	AT_NO_RECURSIVE=yes eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable kde skim-support) \
+		--without-arts \
+		--disable-static \
+		--disable-depedency-tracking \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHROS NEWS README ChangeLog
+}
diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild
index 93e367f024f8..3717c6570b5f 100644
--- a/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild
+++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild,v 1.7 2006/04/30 11:49:25 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91.ebuild,v 1.8 2006/07/03 19:28:42 flameeyes Exp $
 
 inherit kde-functions gnome2
 
@@ -21,3 +21,9 @@ SCROLLKEEPER_UPDATE="0"
 G2CONF="--disable-static $(use_with arts)"
 DOCS="AUTHORS NEWS README ChangeLog"
 USE_DESTDIR=1
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-qt335.patch"
+}