Fix building with Qt 3.3.5, as per bug #139042, thanks to Wai Ling for reporting. Remove old version, and make skim support conditional to kde useflag in last version.

(Portage version: 2.1.1_pre2-r2)

7 files changed, 101 insertions, 11 deletions

diff --git a/app-i18n/scim-tables/ChangeLog b/app-i18n/scim-tables/ChangeLog
index 717ff87fc513..2cbe2971357d 100644
--- a/app-i18n/scim-tables/ChangeLog
+++ b/app-i18n/scim-tables/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/scim-tables
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/ChangeLog,v 1.37 2006/02/10 19:29:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/ChangeLog,v 1.38 2006/07/03 18:59:44 flameeyes Exp $
+
+  03 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/scim-tables-qt335.patch,
+  +files/scim-tables-0.5.6-fixconfigure.patch, scim-tables-0.5.3.ebuild,
+  -scim-tables-0.5.4.ebuild, scim-tables-0.5.6.ebuild:
+  Fix building with Qt 3.3.5, as per bug #139042, thanks to Wai Ling for
+  reporting. Remove old version, and make skim support conditional to kde
+  useflag in last version.
 
 *scim-tables-0.5.6 (10 Feb 2006)
 
diff --git a/app-i18n/scim-tables/files/digest-scim-tables-0.5.3 b/app-i18n/scim-tables/files/digest-scim-tables-0.5.3
index 547662dbdfe3..7bbd99a2660f 100644
--- a/app-i18n/scim-tables/files/digest-scim-tables-0.5.3
+++ b/app-i18n/scim-tables/files/digest-scim-tables-0.5.3
@@ -1 +1,3 @@
 MD5 0e4c216af80e6a7d40d3d0224f84b22a scim-tables-0.5.3.tar.gz 5539832
+RMD160 8bd835dd9973106f436f178155f79b76f0e1e01c scim-tables-0.5.3.tar.gz 5539832
+SHA256 3a5b0736d66687dfae24d95a4d3ed62b36f8135d0c304a4aeb5d9d586c1fd00f scim-tables-0.5.3.tar.gz 5539832
diff --git a/app-i18n/scim-tables/files/digest-scim-tables-0.5.6 b/app-i18n/scim-tables/files/digest-scim-tables-0.5.6
index 1dd4ba72575a..135643ee8e14 100644
--- a/app-i18n/scim-tables/files/digest-scim-tables-0.5.6
+++ b/app-i18n/scim-tables/files/digest-scim-tables-0.5.6
@@ -1,3 +1,6 @@
+MD5 122f8bcc6b7eb5805df46461ed48bf2c kde-admindir-3.5.3.tar.bz2 187248
+RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 kde-admindir-3.5.3.tar.bz2 187248
+SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b kde-admindir-3.5.3.tar.bz2 187248
 MD5 ff8d59e8f3dedb7dd7c6d87c8fc408db scim-tables-0.5.6.tar.gz 7058913
 RMD160 768b298cd9359742eedf1297f73a5be6eee3361e scim-tables-0.5.6.tar.gz 7058913
 SHA256 408cddeed4f5f9105f61822388fcd8947b1f2ba2d66bdabfa2be4e4f1d9393d0 scim-tables-0.5.6.tar.gz 7058913
diff --git a/app-i18n/scim-tables/files/scim-tables-0.5.6-fixconfigure.patch b/app-i18n/scim-tables/files/scim-tables-0.5.6-fixconfigure.patch
new file mode 100644
index 000000000000..c4663ef6e116
--- /dev/null
+++ b/app-i18n/scim-tables/files/scim-tables-0.5.6-fixconfigure.patch
@@ -0,0 +1,33 @@
+Index: scim-tables-0.5.6/configure.ac
+===================================================================
+--- scim-tables-0.5.6.orig/configure.ac
++++ scim-tables-0.5.6/configure.ac
+@@ -65,11 +65,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])
+@@ -176,7 +172,7 @@ AC_CONFIG_FILES([Makefile  intl/Makefile
+ 		 tables/additional/LaTeX.txt
+ 		 tables/additional/IPA-X-SAMPA.txt])
+ 
+-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`
+@@ -205,5 +201,6 @@ PKG_CHECK_MODULES(SCIM_KDEUTILS,[scim_kd
+ fi
+ 
+ AM_CONDITIONAL(SCIM_TABLES_ENABLE_SKIM_SUPPORT, [test "$HAS_KDEUTILS" = "yes"])
++AM_CONDITIONAL(SCIM_BUILD_SKIM_SETUP, [test "$HAS_SKIM" = "yes"])
+ AC_SUBST(SCIM_TABLES_ENABLE_SKIM_SUPPORT)
+ AC_OUTPUT
diff --git a/app-i18n/scim-tables/files/scim-tables-qt335.patch b/app-i18n/scim-tables/files/scim-tables-qt335.patch
new file mode 100644
index 000000000000..40e7ed9ae5cb
--- /dev/null
+++ b/app-i18n/scim-tables/files/scim-tables-qt335.patch
@@ -0,0 +1,21 @@
+Index: scim-tables-0.5.6/skim/setupui/generictableui.ui
+===================================================================
+--- scim-tables-0.5.6.orig/skim/setupui/generictableui.ui
++++ scim-tables-0.5.6/skim/setupui/generictableui.ui
+@@ -336,16 +336,4 @@
+     </connection>
+ </connections>
+ <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>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>skimeditshortcutbutton.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-</includehints>
+ </UI>
diff --git a/app-i18n/scim-tables/scim-tables-0.5.3.ebuild b/app-i18n/scim-tables/scim-tables-0.5.3.ebuild
index ec25cce4dd6e..395f7164582a 100644
--- a/app-i18n/scim-tables/scim-tables-0.5.3.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.3.ebuild,v 1.6 2006/02/10 19:29:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.3.ebuild,v 1.7 2006/07/03 18:59:44 flameeyes Exp $
 
-inherit kde-functions
+inherit kde-functions eutils
 
 DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
 HOMEPAGE="http://www.scim-im.org/"
@@ -16,6 +16,12 @@ IUSE="arts"
 DEPEND="|| ( x11-libs/libXt virtual/x11 )
 	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-qt335.patch"
+}
+
 src_compile() {
 	econf $(use_with arts) || die "econf failed"
 	emake || die "make failed"
diff --git a/app-i18n/scim-tables/scim-tables-0.5.6.ebuild b/app-i18n/scim-tables/scim-tables-0.5.6.ebuild
index 0e06f91082db..52306cd0450a 100644
--- a/app-i18n/scim-tables/scim-tables-0.5.6.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.6.ebuild
@@ -1,27 +1,44 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.6.ebuild,v 1.1 2006/02/10 19:29:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.6.ebuild,v 1.2 2006/07/03 18:59:44 flameeyes Exp $
 
-inherit kde-functions
+inherit kde-functions autotools
 
 DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
 HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz
+	mirror://gentoo/kde-admindir-3.5.3.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="arts"
+IUSE="kde"
 
-DEPEND="|| ( x11-libs/libXt virtual/x11 )
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )"
+RDEPEND="|| ( x11-libs/libXt virtual/x11 )
+	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
+	!alpha? ( !sparc? ( kde? ( app-i18n/skim ) ) )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+RESTRICT="confcache"
+
+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_with arts) || die "econf failed"
+	econf \
+		$(use_enable kde skim-support) \
+		--without-arts || die "econf failed"
 	emake || die "make failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc README ChangeLog AUTHORS
 }