Fix building with autoconf 2.60, change the pkg_setup with a check built_with_use that respects ${ROOT} and remove nls useflag, as this package does not allow disabling it.

(Portage version: 2.1.1_pre2-r2)

3 files changed, 25 insertions, 11 deletions

diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index 3d2e7ed2bad1..5aa5cff8bcb7 100644
--- a/app-i18n/scim-qtimm/ChangeLog
+++ b/app-i18n/scim-qtimm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-qtimm
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.31 2006/07/03 23:57:41 flameeyes Exp $
+
+  03 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  scim-qtimm-0.9.4.ebuild:
+  Fix building with autoconf 2.60, change the pkg_setup with a check
+  built_with_use that respects ${ROOT} and remove nls useflag, as this package
+  does not allow disabling it.
 
   09 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/scim-qtimm-0.9.4-qtimm-check.patch, scim-qtimm-0.9.4.ebuild:
diff --git a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4 b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4
index bed8b6db8aae..58bde82086dd 100644
--- a/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4
+++ b/app-i18n/scim-qtimm/files/digest-scim-qtimm-0.9.4
@@ -1 +1,3 @@
 MD5 a58e8e7c18c27a20b3e9d953b1c75d94 scim-qtimm-0.9.4.tar.bz2 536983
+RMD160 68656066013975f4cca8816f016443ccd22cf7ee scim-qtimm-0.9.4.tar.bz2 536983
+SHA256 11bafccea5dcb7160d5bb407275eac4eb2b1a8edf2cbc87053df8502c69d8daa scim-qtimm-0.9.4.tar.bz2 536983
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 5efc49cca579..18ed523f02c0 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.9.4.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-qtimm/scim-qtimm-0.9.4.ebuild,v 1.2 2006/03/09 17:01:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.4.ebuild,v 1.3 2006/07/03 23:57:41 flameeyes Exp $
 
 inherit kde-functions eutils
 
@@ -12,39 +12,45 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls debug"
+IUSE="debug"
 
 RDEPEND="|| ( >=app-i18n/scim-1.4.2 >=app-i18n/scim-cvs-1.4.2 )
-	nls? ( virtual/libintl )
+	virtual/libintl
 	$(qt_min_version 3.3.4)"
 
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	sys-devel/gettext
+	dev-util/pkgconfig"
 
 pkg_setup() {
-	if [ ! -e /usr/qt/3/plugins/inputmethods/libqimsw-none.so ] ; then
+	if ! built_with_use =x11-libs/qt-3* immqt-bc && ! built_with_use =x11-libs/qt-3* immqt; then
 		die "You need to rebuild >=x11-libs/qt-3.3.4 with immqt-bc(recommended) or immqt USE flag enabled."
 	fi
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-qtimm-check.patch"
 
-	make -f admin/Makefile.common || die "reautotooling failed"
+	# Fix for autoconf 2.60
+	sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \
+		admin/cvs.sh
+
+	emake -j1 -f admin/Makefile.common || die "reautotooling failed"
 }
 
 src_compile() {
 	econf \
-		$(use_enable nls) \
-		$(use_enable debug scim-debug) || die
+		$(use_enable debug scim-debug) \
+		--disable-static \
+		--disable-dependency-tracking || die "econf failed"
 	emake || die "make failed."
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 
 	dodoc AUTHORS ChangeLog README NEWS TODO
 }