Migrate to EAPI 2 in order to remove built_with_use calls for bug #261562.

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 40 insertions, 55 deletions

diff --git a/app-i18n/multiskkserv/ChangeLog b/app-i18n/multiskkserv/ChangeLog
index b9dce752e7d6..4d80913950c7 100644
--- a/app-i18n/multiskkserv/ChangeLog
+++ b/app-i18n/multiskkserv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/multiskkserv
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.11 2007/08/16 16:12:55 matsuu Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/ChangeLog,v 1.12 2009/08/15 13:08:34 betelgeuse Exp $
+
+  15 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  multiskkserv-20020201.ebuild, multiskkserv-20051220.ebuild:
+  Migrate to EAPI 2 in order to remove built_with_use calls for bug #261562.
 
   16 Aug 2007; MATSUU Takuto <matsuu@gentoo.org>
   multiskkserv-20020201.ebuild, multiskkserv-20051220.ebuild:
diff --git a/app-i18n/multiskkserv/multiskkserv-20020201.ebuild b/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
index 3e1d163b6dc8..0c65e1564b3b 100644
--- a/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20020201.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 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/multiskkserv/multiskkserv-20020201.ebuild,v 1.13 2007/08/16 16:12:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20020201.ebuild,v 1.14 2009/08/15 13:08:33 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils fixheadtails
 
@@ -18,59 +20,48 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 IUSE=""
 
-DEPEND="virtual/libc
+DEPEND="
 	|| (
-		>=app-i18n/skk-jisyo-200705
+		>=app-i18n/skk-jisyo-200705[cdb]
 		app-i18n/skk-jisyo-cdb
 	)"
 PROVIDE="virtual/skkserv"
 
-pkg_setup() {
-	if has_version '>=app-i18n/skk-jisyo-200705' && ! built_with_use '>=app-i18n/skk-jisyo-200705' cdb ; then
-		eerror "multiskkserv requires skk-jisyo to be built with cdb support. Please add"
-		eerror "'cdb' to your USE flags, and re-emerge app-i18n/skk-jisyo."
-		die "Missing cdb USE flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${WORKDIR}/${CDB_P}
-	epatch ${FILESDIR}/${CDB_P}-errno.diff
+src_prepare() {
+	cd "${WORKDIR}/${CDB_P}" || die
+	epatch "${FILESDIR}/${CDB_P}-errno.diff"
 	ht_fix_all
 
-	cd ${S}
+	cd "${S}" || die
 	ht_fix_all
 
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-gcc34.diff
+	cd "${S}/src" || die
+	epatch "${FILESDIR}/${P}-gcc34.diff"
 }
 
-src_compile() {
-	cd ${WORKDIR}/${CDB_P}
-	make || die
-	cd -
+src_configure() {
+	cd "${WORKDIR}/${CDB_P}"
+	emake || die
+	cd - || die
 
-	cd /usr/share/skk
-	echo "# Available SKK-JISYO files are:" >> ${S}/multiskkserv.conf
+	cd /usr/share/skk || die
+	echo "# Available SKK-JISYO files are:" >> "${S}/multiskkserv.conf"
 	for i in *.cdb ; do
-		echo "#   ${i}" >> ${S}/multiskkserv.conf
+		echo "#   ${i}" >> "${S}/multiskkserv.conf"
 	done
 	cd -
 
-	econf --with-cdb=${WORKDIR}/${CDB_P} || die
-	emake || die
+	econf --with-cdb="${WORKDIR}/${CDB_P}" || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	emake DESTDIR="${D}" install || die
 
-	newconfd ${FILESDIR}/multiskkserv.conf multiskkserv
+	newconfd "${FILESDIR}/multiskkserv.conf" multiskkserv || die
 
-	newinitd ${FILESDIR}/multiskkserv.initd multiskkserv
+	newinitd "${FILESDIR}/multiskkserv.initd" multiskkserv || die
 
-	dodoc AUTHORS ChangeLog INSTALL NEWS README*
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* || die
 }
 
 pkg_postinst() {
diff --git a/app-i18n/multiskkserv/multiskkserv-20051220.ebuild b/app-i18n/multiskkserv/multiskkserv-20051220.ebuild
index a6b19dea45ff..d5972087b093 100644
--- a/app-i18n/multiskkserv/multiskkserv-20051220.ebuild
+++ b/app-i18n/multiskkserv/multiskkserv-20051220.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 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/multiskkserv/multiskkserv-20051220.ebuild,v 1.2 2007/08/16 16:12:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/multiskkserv/multiskkserv-20051220.ebuild,v 1.3 2009/08/15 13:08:34 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils fixheadtails
 
@@ -15,39 +17,27 @@ IUSE=""
 
 DEPEND="dev-db/cdb"
 RDEPEND="|| (
-		>=app-i18n/skk-jisyo-200705
+		>=app-i18n/skk-jisyo-200705[cdb]
 		app-i18n/skk-jisyo-cdb
 	)"
 
 PROVIDE="virtual/skkserv"
 
-pkg_setup() {
-	if has_version '>=app-i18n/skk-jisyo-200705' && ! built_with_use '>=app-i18n/skk-jisyo-200705' cdb ; then
-		eerror "multiskkserv requires skk-jisyo to be built with cdb support. Please add"
-		eerror "'cdb' to your USE flags, and re-emerge app-i18n/skk-jisyo."
-		die "Missing cdb USE flag."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
+src_prepare() {
 	ht_fix_all
 }
 
-src_compile() {
+src_configure() {
 	econf --with-cdb=yes || die
-	emake || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 
-	newconfd "${FILESDIR}"/multiskkserv.conf multiskkserv
-	newinitd "${FILESDIR}"/multiskkserv.initd multiskkserv
+	newconfd "${FILESDIR}"/multiskkserv.conf multiskkserv || die
+	newinitd "${FILESDIR}"/multiskkserv.initd multiskkserv || die
 
-	dodoc AUTHORS ChangeLog NEWS README*
+	dodoc AUTHORS ChangeLog NEWS README* || die
 }
 
 pkg_postinst() {