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.

Package-Manager: portage-2.1.1_pre2-r2

8 files changed, 167 insertions, 15 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/Manifest b/app-i18n/scim-pinyin/Manifest
index 20b224d53443..5c4e48d1fbe1 100644
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@@ -1,16 +1,41 @@
-DIST scim-pinyin-0.5.91.tar.gz 5492055 size 5492055
-EBUILD scim-pinyin-0.5.91.ebuild 736 RMD160 3f2b148bb1307f614f506488b84ad8f2a99f91fe SHA1 b7e3928f5ca8c48978b7c9c3764d281e15370918 SHA256 a40704809c099910f652a896c82c16db09674fb4012aa1721c0d51daec9dd7e1 size 736
-MD5 7fd3bb41cf1a801efc7328f1071ee7a1 scim-pinyin-0.5.91.ebuild 736
-RMD160 3f2b148bb1307f614f506488b84ad8f2a99f91fe scim-pinyin-0.5.91.ebuild 736
-SHA256 a40704809c099910f652a896c82c16db09674fb4012aa1721c0d51daec9dd7e1 scim-pinyin-0.5.91.ebuild 736
-MISC ChangeLog 1575 RMD160 029dd182729fae1f8c09c14f80eeda729ee53c36 SHA1 582b29ea5e93bb7ee07c669afa005c361835774d SHA256 be4bbb24e350cd8bd88201bc615cb1aea9d603300714d2ba23f07d40b8acc021 size 1575
-MD5 e0ee78314bffd5e8d5462624b29104d5 ChangeLog 1575
-RMD160 029dd182729fae1f8c09c14f80eeda729ee53c36 ChangeLog 1575
-SHA256 be4bbb24e350cd8bd88201bc615cb1aea9d603300714d2ba23f07d40b8acc021 ChangeLog 1575
-MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 size 156
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 RMD160 023f960a61daf53e58104aa7a3baf1a0d0e5726a SHA1 9e36de05c68313e76be60b1a786840a7c7ae95c7 SHA256 1ae66b39fbfaaac4d5e6ea605a07c885699546752b4ca52486740e6eedbe7da5
+MD5 4e1ba4dd29bfd1ce11ce9e64a68ebdf6 files/scim-pinyin-0.5.91-fixconfigure.patch 1313
+RMD160 023f960a61daf53e58104aa7a3baf1a0d0e5726a files/scim-pinyin-0.5.91-fixconfigure.patch 1313
+SHA256 1ae66b39fbfaaac4d5e6ea605a07c885699546752b4ca52486740e6eedbe7da5 files/scim-pinyin-0.5.91-fixconfigure.patch 1313
+AUX scim-pinyin-qt335.patch 1122 RMD160 8a0a700e49060e573b24dd6d355836facead4b9a SHA1 9affc52c5c4d68287f894a68604e79d21029fc66 SHA256 615f4536c1dbf8e95529eff028cb6efaedd5abc4afec8ef5d6ead3ef5eca98a9
+MD5 6b4121c3a32d3cb8cd403a74d4fad9fc files/scim-pinyin-qt335.patch 1122
+RMD160 8a0a700e49060e573b24dd6d355836facead4b9a files/scim-pinyin-qt335.patch 1122
+SHA256 615f4536c1dbf8e95529eff028cb6efaedd5abc4afec8ef5d6ead3ef5eca98a9 files/scim-pinyin-qt335.patch 1122
+DIST scim-pinyin-0.5.91.tar.gz 5492055 RMD160 dbde7b7871c7baf3656cd4c7000196cf99ae15e2 SHA1 58bea437a211b7af8420057541a38933a41841c7 SHA256 9b6b24af841cbf0353b919df7f56be931850fccf3b914172af7a39b6db726653
+EBUILD scim-pinyin-0.5.91-r1.ebuild 1204 RMD160 d7aaba51f06af06a93ebaf8f9805fb0832e62452 SHA1 a8eb9ea722351168933de1062939bf06faf8fc14 SHA256 bda2c97ad94dd369eaac175514ba3cc4a8f61fcb8d428a24edc4a24518f95699
+MD5 030d0abd3caaa908f7a36c7a2cc83c2f scim-pinyin-0.5.91-r1.ebuild 1204
+RMD160 d7aaba51f06af06a93ebaf8f9805fb0832e62452 scim-pinyin-0.5.91-r1.ebuild 1204
+SHA256 bda2c97ad94dd369eaac175514ba3cc4a8f61fcb8d428a24edc4a24518f95699 scim-pinyin-0.5.91-r1.ebuild 1204
+EBUILD scim-pinyin-0.5.91.ebuild 822 RMD160 25683afeacdfc07da8589abd6784f97f588aebd3 SHA1 442c713fe77daf83d7d9049a2ba385fcc1679c55 SHA256 5602919ddb14993f0f4fe1d26096079de215b73517c147dd43245b5bcb8d4242
+MD5 321213e6e24e8be67d99ab4395ef5620 scim-pinyin-0.5.91.ebuild 822
+RMD160 25683afeacdfc07da8589abd6784f97f588aebd3 scim-pinyin-0.5.91.ebuild 822
+SHA256 5602919ddb14993f0f4fe1d26096079de215b73517c147dd43245b5bcb8d4242 scim-pinyin-0.5.91.ebuild 822
+MISC ChangeLog 2016 RMD160 748f382c8ea5c18c8898ed62ef191232c760aa67 SHA1 551922eea964a39c7977036158aef76fad317d48 SHA256 3d1dff49088482145fd8c990024fe5681495d04dfb9c77fe1399fc9321c6a911
+MD5 1dd7dbe4de3ddf1902bb8744e2884846 ChangeLog 2016
+RMD160 748f382c8ea5c18c8898ed62ef191232c760aa67 ChangeLog 2016
+SHA256 3d1dff49088482145fd8c990024fe5681495d04dfb9c77fe1399fc9321c6a911 ChangeLog 2016
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
-MD5 694aaef165dde63a48fef148727c982e files/digest-scim-pinyin-0.5.91 71
-RMD160 9a76a9d29980375eac2ab1af4c5e8cd586398453 files/digest-scim-pinyin-0.5.91 71
-SHA256 904e1fbbb588615ae00c0648d59cf5d5772c5073275e4ea9dfe3ba598581d825 files/digest-scim-pinyin-0.5.91 71
+MD5 544b7e2e0474e3eb5c2bd2daa2938ca1 files/digest-scim-pinyin-0.5.91 259
+RMD160 721400e51ee7a3b33aedcfb8cc2bb192cd8b62ed files/digest-scim-pinyin-0.5.91 259
+SHA256 58388e58cedd09bbdcc5da53910b052367fae8ae52e83785eb1d3a4cd1d621c2 files/digest-scim-pinyin-0.5.91 259
+MD5 544b7e2e0474e3eb5c2bd2daa2938ca1 files/digest-scim-pinyin-0.5.91-r1 259
+RMD160 721400e51ee7a3b33aedcfb8cc2bb192cd8b62ed files/digest-scim-pinyin-0.5.91-r1 259
+SHA256 58388e58cedd09bbdcc5da53910b052367fae8ae52e83785eb1d3a4cd1d621c2 files/digest-scim-pinyin-0.5.91-r1 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEqW/9AiZjviIA2XgRAtgwAJsEbSR8V7wlQIy7bdgECO60jfp8zgCfV2MS
+XApizJjMMyBZk85YminHklI=
+=u3l8
+-----END PGP SIGNATURE-----
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"
+}