Migrate to EAPI 2 to get rid of built_with_use for bug #261562.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 31 insertions, 35 deletions

diff --git a/app-i18n/scim-bridge/ChangeLog b/app-i18n/scim-bridge/ChangeLog
index df4d703074e1..446b23ef4509 100644
--- a/app-i18n/scim-bridge/ChangeLog
+++ b/app-i18n/scim-bridge/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-bridge
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.26 2009/05/09 16:36:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/ChangeLog,v 1.27 2009/08/15 13:20:59 betelgeuse Exp $
+
+  15 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  scim-bridge-0.4.16.ebuild:
+  Migrate to EAPI 2 to get rid of built_with_use for bug #261562.
 
   09 May 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   scim-bridge-0.4.16.ebuild, +files/scim-bridge-0.4.16+gcc-4.4.patch:
diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
index 166825510f78..a39c196f2e87 100644
--- a/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
+++ b/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild,v 1.2 2009/05/09 16:36:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-bridge/scim-bridge-0.4.16.ebuild,v 1.3 2009/08/15 13:20:59 betelgeuse Exp $
+
+EAPI="2"
 
-EAPI="1"
 inherit autotools eutils qt3
 
 DESCRIPTION="Yet another IM-client of SCIM"
@@ -22,7 +23,10 @@ RDEPEND=">=app-i18n/scim-1.4.6
 		>=x11-libs/pango-1.1
 	)
 	qt3? (
-		x11-libs/qt:3
+		|| (
+			x11-libs/qt:3[immqt-bc]
+			x11-libs/qt:3[immqt]
+		)
 		>=x11-libs/pango-1.1
 	)
 	qt4? (
@@ -43,15 +47,7 @@ get_gtk_confdir() {
 	fi
 }
 
-pkg_setup() {
-	if use qt3 && ! 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}"
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.4.15.2-qt4.patch"
 	epatch "${FILESDIR}/${PN}-0.4.15.2-gcc43.patch"
 	epatch "${FILESDIR}/${P}+gcc-4.4.patch"
@@ -61,19 +57,18 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf \
 		$(use_enable gtk gtk2-immodule) \
 		$(use_enable qt3 qt3-immodule) \
 		$(use_enable qt4 qt4-immodule) \
 		$(use_enable doc documents) || die
-	emake || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README || die
 }
 
 pkg_postinst() {
diff --git a/app-i18n/scim-qtimm/ChangeLog b/app-i18n/scim-qtimm/ChangeLog
index 6d4900c5f9f8..691b04084e0a 100644
--- a/app-i18n/scim-qtimm/ChangeLog
+++ b/app-i18n/scim-qtimm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/scim-qtimm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.48 2008/07/27 19:54:45 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/ChangeLog,v 1.49 2009/08/15 13:21:02 betelgeuse Exp $
+
+  15 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  scim-qtimm-0.9.4-r1.ebuild:
+  Migrate to EAPI 2 to get rid of built_with_use for bug #261562.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> scim-qtimm-0.9.4.ebuild,
   scim-qtimm-0.9.4-r1.ebuild:
diff --git a/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild b/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild
index d1d10f0b2551..45f316104fa9 100644
--- a/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild
+++ b/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r1.ebuild,v 1.2 2008/07/27 19:54:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-qtimm/scim-qtimm-0.9.4-r1.ebuild,v 1.3 2009/08/15 13:21:02 betelgeuse Exp $
 
-EAPI=1
+EAPI="2"
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="latest"
@@ -22,22 +22,16 @@ IUSE="debug"
 
 RDEPEND=">=app-i18n/scim-1.4.2
 	virtual/libintl
-	x11-libs/qt:3"
+	|| (
+		x11-libs/qt:3[immqt-bc]
+		x11-libs/qt:3[immqt]
+	)"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig"
 
-pkg_setup() {
-	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}"
-
+src_prepare() {
 	rm -rf "${S}/admin"
 	ln -sf "${WORKDIR}/admin" "${S}/admin"
 
@@ -57,7 +51,7 @@ src_unpack() {
 	emake -j1 -f admin/Makefile.common || die "reautotooling failed"
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	if use debug; then
@@ -70,13 +64,12 @@ src_compile() {
 		--disable-static \
 		--disable-dependency-tracking \
 		${myconf} || die "econf failed"
-	emake || die "make failed."
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
-	dodoc AUTHORS ChangeLog README NEWS TODO
+	dodoc AUTHORS ChangeLog README NEWS TODO || die
 }
 
 pkg_postinst() {