Ebuild cleanup as per bug #121258. Allow parallel build, remove arts and add debug useflags.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 81 insertions, 25 deletions

diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index 6de8119faf89..3d2e7ed2bad1 100644
--- a/app-i18n/scim-qtimm/ChangeLog
+++ b/app-i18n/scim-qtimm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/scim-qtimm
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.29 2005/09/03 21:05:24 hansmi Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.30 2006/03/09 17:01:24 flameeyes Exp $
+
+  09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/scim-qtimm-0.9.4-qtimm-check.patch, scim-qtimm-0.9.4.ebuild:
+  Ebuild cleanup as per bug #121258. Allow parallel build, remove arts and add
+  debug useflags.
 
   03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
   scim-qtimm-0.9.3.ebuild:
diff --git a/app-i18n/scim-qtimm/Manifest b/app-i18n/scim-qtimm/Manifest
index e02014f1cc2f..a47c5bd90298 100644
--- a/app-i18n/scim-qtimm/Manifest
+++ b/app-i18n/scim-qtimm/Manifest
@@ -1,8 +1,37 @@
-MD5 ba5d1329cd91f6733ab7aec1488e4082 scim-qtimm-0.9.4.ebuild 1507
-MD5 1857723054b38305c1db3832865d0d1c scim-qtimm-0.9.3.ebuild 1502
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 28506fc0957e6e489c69157537fbdb6b ChangeLog 4592
-MD5 e1612d44a75fa0ec21b5a758a1b480ca scim-qtimm-0.8.95.ebuild 1550
-MD5 65b857afb5bf101609e24ff5c0d0b645 files/digest-scim-qtimm-0.9.4 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aed91dcadc5feb16a7bb06d1404e8c0f ChangeLog 4816
+RMD160 f6e2a30c1b4ced52b69195a4d10b4dcb07e51d0d ChangeLog 4816
+SHA256 0e47852d6f46c7658484ce08c0958832b430d2a48b7e3074eded06431d251f50 ChangeLog 4816
 MD5 ca25d0f0af2f019b21e0153c1f1b50aa files/digest-scim-qtimm-0.8.95 70
+RMD160 40d22170e41a6bb04356d2b44d7d5faab05c6ddf files/digest-scim-qtimm-0.8.95 70
+SHA256 221bf2698bee3cd06a232a06bf35852a0ad967f4bb49b71cd397c5df57a43f65 files/digest-scim-qtimm-0.8.95 70
 MD5 49e66ba94592a548a5812cf2eb90e05e files/digest-scim-qtimm-0.9.3 69
+RMD160 a2064d040d32a3a71d3ae13c44f9e01f8745e73e files/digest-scim-qtimm-0.9.3 69
+SHA256 3c1475a58a5a39533dfd2787895e1c5b43790bbeb1990e42e1de52c28d4a775f files/digest-scim-qtimm-0.9.3 69
+MD5 65b857afb5bf101609e24ff5c0d0b645 files/digest-scim-qtimm-0.9.4 69
+RMD160 fbc2979f336d9a6e69757bd0fadb771ca41ad7b6 files/digest-scim-qtimm-0.9.4 69
+SHA256 40508f639df2d65bba1dc3c8d52ca1cfa3dae1f0ce494bc40697302eb2c8abed files/digest-scim-qtimm-0.9.4 69
+MD5 3569dd7804d5fd79ee69cdf330906677 files/scim-qtimm-0.9.4-qtimm-check.patch 718
+RMD160 b9a5068dd9e7057831778d7db27627b74bb7c874 files/scim-qtimm-0.9.4-qtimm-check.patch 718
+SHA256 1bcbb489de6721d9c62356cc583309130254d3210f2a823f51ee2828b5b4ec64 files/scim-qtimm-0.9.4-qtimm-check.patch 718
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 e1612d44a75fa0ec21b5a758a1b480ca scim-qtimm-0.8.95.ebuild 1550
+RMD160 26eb04f1eb0fb15bb985a7c2e80c87a72a9accee scim-qtimm-0.8.95.ebuild 1550
+SHA256 e6ab17d4324c43bc3df0945b4965ce5acc8677ed01aab5df03a51761f8c40ee3 scim-qtimm-0.8.95.ebuild 1550
+MD5 1857723054b38305c1db3832865d0d1c scim-qtimm-0.9.3.ebuild 1502
+RMD160 87d8f515822e88938e9a36d4535c036b9d8696ee scim-qtimm-0.9.3.ebuild 1502
+SHA256 60ccc8caa8f98f40621bdd4d132de1da57888180fe1b41b35bcffd1b3dac15df scim-qtimm-0.9.3.ebuild 1502
+MD5 262e55d1dda8806e50d22beb25b09360 scim-qtimm-0.9.4.ebuild 1496
+RMD160 d8c3187d49f98c7eaad86dca1eceef3397e69dcb scim-qtimm-0.9.4.ebuild 1496
+SHA256 70472fc7438b187aea93bfe66bd903e98dc459101b64301ce64b48648f3d323b scim-qtimm-0.9.4.ebuild 1496
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEEF+EAiZjviIA2XgRApj1AKCIhBXOvsn6FIie+9xRSpoUUAFbWgCghWkG
+S8UkUwhp7d33C0wroPraOtA=
+=BYwJ
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-qtimm-check.patch b/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-qtimm-check.patch
new file mode 100644
index 000000000000..dcfaa3b8d937
--- /dev/null
+++ b/app-i18n/scim-qtimm/files/scim-qtimm-0.9.4-qtimm-check.patch
@@ -0,0 +1,19 @@
+Index: work/scim-qtimm-0.9.4/configure.in.in
+===================================================================
+--- work.orig/scim-qtimm-0.9.4/configure.in.in
++++ work/scim-qtimm-0.9.4/configure.in.in
+@@ -131,12 +131,12 @@ INPUTMETHODSDIR=$QTDIR_LOCAL/plugins/inp
+ AC_SUBST(INPUTMETHODSDIR)
+ 
+ if test "$kde_qtver" = "3"; then
+-if test ! -e $qt_incdir/qinputcontext.h -o ! -e $qt_incdir/qinputcontextplugin.h; then
++KDE_CHECK_HEADERS([qinputcontext.h qinputcontextplugin.h], , [
+   AC_MSG_ERROR([
+     The Qt library was not compiled with the qt-immodule patch
+     applied please download it from
+     http://immodule-qt.freedesktop.org/Software/ImmoduleQtDownload and recompile Qt.])
+-fi
++])
+ fi
+ 
+ AC_MSG_RESULT([
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild
index 0f5e680b9b9c..5efc49cca579 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild,v 1.1 2005/08/17 10:27:30 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild,v 1.2 2006/03/09 17:01:24 flameeyes Exp $
 
-inherit kde-functions
+inherit kde-functions eutils
 
 DESCRIPTION="Qt immodules input method framework plugin for SCIM"
 HOMEPAGE="http://scim.freedesktop.org/"
@@ -12,32 +12,35 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls arts"
+IUSE="nls debug"
 
-DEPEND="|| ( >=app-i18n/scim-1.4.2 >=app-i18n/scim-cvs-1.4.2 )
-	nls? ( sys-devel/gettext )
-	arts? ( kde-base/arts )
+RDEPEND="|| ( >=app-i18n/scim-1.4.2 >=app-i18n/scim-cvs-1.4.2 )
+	nls? ( virtual/libintl )
 	$(qt_min_version 3.3.4)"
 
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
 pkg_setup() {
 	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
 		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
 	fi
 }
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-	# bug #84369
-	if which kde-config >/dev/null 2>&1 ; then
-		export KDEDIR=$(kde-config --prefix)
-		export kde_kcfgdir=/usr/share/config.kcfg
-		export kde_servicesdir=/usr/share/services
-	fi
+	epatch "${FILESDIR}/${P}-qtimm-check.patch"
 
-	econf --enable-mt \
+	make -f admin/Makefile.common || die "reautotooling failed"
+}
+
+src_compile() {
+	econf \
 		$(use_enable nls) \
-		$(use_with arts) || die
-	emake -j1 || die "make failed."
+		$(use_enable debug scim-debug) || die
+	emake || die "make failed."
 }
 
 src_install() {