Migrate to EAPI 2.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

4 files changed, 44 insertions, 29 deletions

diff --git a/app-admin/diradm/ChangeLog b/app-admin/diradm/ChangeLog
index 96a51dd8e3dc..5836329c04c6 100644
--- a/app-admin/diradm/ChangeLog
+++ b/app-admin/diradm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/diradm
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/ChangeLog,v 1.36 2009/03/09 20:52:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/ChangeLog,v 1.37 2009/03/09 21:14:53 betelgeuse Exp $
+
+  09 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> diradm-2.9.3.ebuild,
+  diradm-2.9.6.ebuild:
+  Migrate to EAPI 2.
 
   09 Mar 2009; Robin H. Johnson <robbat2@gentoo.org> -diradm-1.1.ebuild,
   -diradm-1.1-r1.ebuild, -diradm-1.2.ebuild, -diradm-2.1.ebuild,
diff --git a/app-admin/diradm/Manifest b/app-admin/diradm/Manifest
index c53f9056fc21..cda654735bc4 100644
--- a/app-admin/diradm/Manifest
+++ b/app-admin/diradm/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST diradm-2.9.3.tar.bz2 105362 RMD160 b4c24bbcecfd8f092f510663eb512b600f1c4ce2 SHA1 8451ff3023bd18c7b29200bc495db8a22f1f8935 SHA256 4bd8261c11916caab989b596c78f648510225de4d52af3c9a425ef92bf6a096d
 DIST diradm-2.9.5.tar.bz2 113429 RMD160 92503903faf4ad4de49327db11d9623d87003dc9 SHA1 01cf10d40519ac2446460f1802016f8619260559 SHA256 8d189981d0fbd63bd55114f7b1c34f97f39a832fa5093f63be3c403ba4da87e4
 DIST diradm-2.9.6.tar.bz2 113599 RMD160 f146333ebd4c5c7028b44d3b5ec9073ef53e1dd8 SHA1 a05da881b88222192a93722b44a3277cb57f1bb6 SHA256 8c316d05a8d5faf73fc9608bb3bfd1c610148c0132f7db80f92423c40ce08256
-EBUILD diradm-2.9.3.ebuild 2038 RMD160 c1d90a35470b62ed2e80b67d98a03b4e5bd48359 SHA1 8ee753931e224ac0f78453ac3d72cc65cafeb9e8 SHA256 cf23da0fcb9ed41f3dee41ca829d0f4473713bf39002270081c6143e83ad7edf
+EBUILD diradm-2.9.3.ebuild 1837 RMD160 ff6427287c288ab91f4ef285c3bf0a898e37bf55 SHA1 f4f0fba88196871cec32de8edeec74401b31d7f9 SHA256 abe01ee6cb650e38bc1449adb3eaab5dd878ffacff93fc1eb7b521eb2a1af6dd
 EBUILD diradm-2.9.5.ebuild 2048 RMD160 e920765a33961237b3e4befea8576f59319a066d SHA1 2ef822c4a476e03a3c1636d629a591d233e43210 SHA256 020e5621b738b911b31221b81738a76b3fdd65d2d3b95e6bb93235973e59afd3
-EBUILD diradm-2.9.6.ebuild 2048 RMD160 11d782c9a042c978f51769c523da2846abd93e2f SHA1 77c10a43c74b38f18eeaf3a4c44dfe7473f487ad SHA256 ec71b424073c842953d8a36ccb464622ccba579193e0db1c3ab4bfcf374ef68a
-MISC ChangeLog 5557 RMD160 59cc90e3f161e5e96c867d75f2f568343ed40862 SHA1 277060b564d0f1a8f894457ae21515f7bde148e5 SHA256 c9aa2355414c38e211ea285a831645add752879a5d55abf776830e04906eab17
+EBUILD diradm-2.9.6.ebuild 1858 RMD160 33482ccd81fc55c077c04f6d9fa8f38a931aebc2 SHA1 f3e5b353b8ee8089d0a0385c41a3083feecf8f2f SHA256 0d79b61e6fa7683413c37905153ab286355cacc0fffda8201b94d3243463f4e8
+MISC ChangeLog 5679 RMD160 747fd13ff5afcc888bb49b49978460d643c2c96f SHA1 72a2cd78527d6b9ea8ad3f4d9b0f68fa4db1a5a8 SHA256 78e61242745c8db12e7ca431ca3118a111a60d681a2ac6c118e558400b27b00e
 MISC metadata.xml 438 RMD160 0099918a929b23981edbee07aab44f4dbd3fd844 SHA1 e9a8a9e3f559e7be3cad098ae667a619ce184e8c SHA256 074a32b53478917419bda7182f8208671e9eaa9dcebefdcf104f82bd34439e9a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm1hzYACgkQcxLzpIGCsLRgTgCeLAYsQ6NG3K8W7LNU+87qaZyd
+16QAoJUxYfVqM1dXd4ogcDywHKzFmWS7
+=bL19
+-----END PGP SIGNATURE-----
diff --git a/app-admin/diradm/diradm-2.9.3.ebuild b/app-admin/diradm/diradm-2.9.3.ebuild
index c8aa29822182..6dae7b51218d 100644
--- a/app-admin/diradm/diradm-2.9.3.ebuild
+++ b/app-admin/diradm/diradm-2.9.3.ebuild
@@ -1,6 +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-admin/diradm/diradm-2.9.3.ebuild,v 1.6 2008/02/20 23:03:36 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-2.9.3.ebuild,v 1.7 2009/03/09 21:14:53 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -26,18 +28,18 @@ DEPEND="net-nds/openldap
 		dev-perl/Crypt-SmbHash
 		>=net-fs/samba-3.0.6
 	)
-	test? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 dev-util/dejagnu )"
+	test? (
+		dev-perl/Crypt-SmbHash
+		>=net-fs/samba-3.0.6
+		dev-util/dejagnu
+		net-nds/openldap[-minimal]
+	)"
 
 pkg_setup() {
-	if use test; then
-		if built_with_use net-nds/openldap minimal ; then
-			die "You MUST have a non-minimal build of OpenLDAP to use the testcases!"
-		fi
-		elog "Warning, for test usage, diradm is built with all optional features!"
-	fi
+	use test && elog "Warning, for test usage, diradm is built with all optional features!"
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	if use test; then
 		myconf="--enable-samba --enable-automount --enable-irixpasswd"
@@ -45,7 +47,6 @@ src_compile() {
 		myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
 	fi
 	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
@@ -64,6 +65,5 @@ pkg_postinst() {
 }
 
 src_test() {
-	use test || die "You must build diradm with USE=test to run the testcases!"
 	emake -j1 check
 }
diff --git a/app-admin/diradm/diradm-2.9.6.ebuild b/app-admin/diradm/diradm-2.9.6.ebuild
index b0807e7fef75..cc026107fd31 100644
--- a/app-admin/diradm/diradm-2.9.6.ebuild
+++ b/app-admin/diradm/diradm-2.9.6.ebuild
@@ -1,6 +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-admin/diradm/diradm-2.9.6.ebuild,v 1.1 2008/09/25 05:53:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-2.9.6.ebuild,v 1.2 2009/03/09 21:14:53 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -26,18 +28,18 @@ DEPEND=">=net-nds/openldap-2.3
 		dev-perl/Crypt-SmbHash
 		>=net-fs/samba-3.0.6
 	)
-	test? ( dev-perl/Crypt-SmbHash >=net-fs/samba-3.0.6 dev-util/dejagnu )"
+	test? (
+		dev-perl/Crypt-SmbHash
+		>=net-fs/samba-3.0.6
+		dev-util/dejagnu
+		net-nds/openldap[-minimal]
+	)"
 
 pkg_setup() {
-	if use test; then
-		if built_with_use net-nds/openldap minimal ; then
-			die "You MUST have a non-minimal build of OpenLDAP to use the testcases!"
-		fi
-		elog "Warning, for test usage, diradm is built with all optional features!"
-	fi
+	use test && elog "Warning, for test usage, diradm is built with all optional features!"
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	if use test; then
 		myconf="--enable-samba --enable-automount --enable-irixpasswd"
@@ -45,12 +47,12 @@ src_compile() {
 		myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
 	fi
 	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
 }
 
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork THANKS TODO KNOWN-BUGS
+	dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork \
+		THANKS TODO KNOWN-BUGS || die
 	if use irixpasswd; then
 		insinto /etc/openldap/schema
 		doins irixpassword.schema
@@ -64,6 +66,5 @@ pkg_postinst() {
 }
 
 src_test() {
-	use test || die "You must build diradm with USE=test to run the testcases!"
 	emake -j1 check
 }