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

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

4 files changed, 53 insertions, 58 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/Manifest b/app-i18n/multiskkserv/Manifest
index 0a08c10d0cfb..f603509c8b38 100644
--- a/app-i18n/multiskkserv/Manifest
+++ b/app-i18n/multiskkserv/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cdb-0.75-errno.diff 243 RMD160 90c6614ff96108a7965857b65919b8cad1fdfaac SHA1 eab8001280c0c77b469129a2c1c1825762e87a16 SHA256 7d614d7e677a64685995067cc1db1d514b6a1c73981187f2d7a5d56b54b6966e
 AUX multiskkserv-20020201-gcc34.diff 432 RMD160 518ba690e907613da05146e7197bd9d080336671 SHA1 e404a2de5df538a32bc3dc1bd5c0e9fa03d48033 SHA256 48f19d5e783dc9fc624a5013362c5fae4195a9f1acd1054cbbe8b74cccdcab01
 AUX multiskkserv.conf 461 RMD160 a49ab43ddb9bf14fb8a4e95a7beead4cf8d68db5 SHA1 987cde6a985ccf44afd09664802f6031037824fd SHA256 a758b207be25732c38706110a88e6e379fdda8adce567ca2ca027780a9428d94
@@ -5,7 +8,14 @@ AUX multiskkserv.initd 941 RMD160 7d83cdb26812c58d93e598caef999b961adf3444 SHA1
 DIST cdb-0.75.tar.gz 54162 RMD160 d52288ee6df58fdc5a79efc16693cd5e305f9c65 SHA1 555749be5b2617e29e44b5326a2536813d62c248 SHA256 1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5
 DIST multiskkserv-20020201.tar.bz2 159412 RMD160 f8f6228f93ba828f633055a84789953e5712bba6 SHA1 bcdd61f174095833edd54b2f844e3332e2bf10b3 SHA256 3bec276a3cd1831b9075eb61510f10b84c4605448bac4af7fa4d8b3af0612347
 DIST multiskkserv-20051220.tar.bz2 244023 RMD160 18dae8dcd6e26246a3243c143be46b533921464b SHA1 f7da523c2a998f7bf260799d369a3c8728a9b49d SHA256 c77ec5ec597cc6ff8f40fb63dcf4c470f61d2530a87846d8e4d6466eb5a490ec
-EBUILD multiskkserv-20020201.ebuild 1874 RMD160 dae5697f3e490e7a9df8e66f37c36126d6b3bb80 SHA1 6a013bc8fa7f1991d326a8eac82da2d40699d96c SHA256 4818e5b60d89fcaa791f14c8a9911f4880dadf438f982dde06e3121856957e11
-EBUILD multiskkserv-20051220.ebuild 1458 RMD160 0a0f60774eb07cca09f79ff75cc2931b31fa6371 SHA1 2de884abf72a58c32a4eb4ac17c20f175fb6ed1c SHA256 d5c016f3755225cc31ce194a8f3a990f8666c4d6c5678d5740a70abfbd4a903c
-MISC ChangeLog 1652 RMD160 a4f9eeb3bef3b35420ecb93a51db260f167adf52 SHA1 45a025697fe1db8f6e875b3ab4d9b2bac8e348c3 SHA256 a74ea09acb069418fb2aa899a975df9bed45c7c014ab8c5af77c68f91c9c9d63
+EBUILD multiskkserv-20020201.ebuild 1626 RMD160 650ce8675029b1f4f0e2eb0c6d8d7755618aab34 SHA1 58c7c2563a785d4a212542f2a0cc5dfc45d88393 SHA256 0a23fb58849a4b6de4facb23b5f59cce1f6d8af85c2e088c9008166499694387
+EBUILD multiskkserv-20051220.ebuild 1150 RMD160 2a22007cc8a9309126c87f80bf479f317859b87f SHA1 add3ef56e5b866f67375074e32130bbb3d5e0dad SHA256 663ba1d9899b91da79cd2d98b8e6f8a8de985f91f8b386b8a4af2c2e4482a15b
+MISC ChangeLog 1849 RMD160 5c39261a57eed8c341398677f6d88faf190ba7da SHA1 b20237b22cf2f7057fee125dd2071ed849a05e42 SHA256 fa6175c8d6d58da7d855ca13cd2799991de980a8b65f4bb0b979b7e4f70a7a08
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqGs00ACgkQcxLzpIGCsLQeZgCgj6zAaqUDXFIEATm0WotekWdP
+PlUAn2eMr39qQKJSCCymQ1T2aMJDXGma
+=XFT9
+-----END PGP SIGNATURE-----
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() {