Fix ebuilds with EAPI=2, bug #255021

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r2 ia64

5 files changed, 24 insertions, 21 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index c8dce4cf950b..4108a611c95a 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.338 2009/01/13 20:20:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.339 2009/01/15 11:12:28 armin76 Exp $
+
+  15 Jan 2009; Raúl Porcel <armin76@gentoo.org> openldap-2.3.43.ebuild,
+  openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild:
+  Fix ebuilds with EAPI=2, bug #255021
 
   13 Jan 2009; Raúl Porcel <armin76@gentoo.org> openldap-2.3.43.ebuild,
   openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild:
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 803adc8a2849..35c286260058 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -22,11 +22,11 @@ EBUILD openldap-2.3.39-r2.ebuild 17585 RMD160 ddfd345419a591238c628b03904bb54bd8
 EBUILD openldap-2.3.40-r1.ebuild 17595 RMD160 723f7e06a6ab06227cd2ca4502780163516192f9 SHA1 f073d59465a93aaf60d2da85eded5ff98a8a8ad2 SHA256 3980c63c1f55b874313c6726cdaa8c460f67586ea7cd2f76b6123befcdab1d8d
 EBUILD openldap-2.3.41-r1.ebuild 17759 RMD160 d090cc892c2bfed850d84aa61d80683e6d104c6a SHA1 8372fe77cc4eef2827dcf7d2c1563e9e90652026 SHA256 dfc6f8a1a4df8fa74e2a4fdd3c2b1a002d737fc3ed80b6897a0588f8a77e85fe
 EBUILD openldap-2.3.41.ebuild 17653 RMD160 7c8318fc65e12d4796de6baa89364a2bcb0840d8 SHA1 6c9ea556e2cdae07cd5573e7661142ba13bbc539 SHA256 d8045ddc14697a146410297fbd8c597ffea86ce49f0f73766d745dabb7e2429a
-EBUILD openldap-2.3.43-r1.ebuild 17833 RMD160 f8a572997e8a2eb0cac7b58a994e7c2f426f6327 SHA1 b89eccab9d3296ca777b4687e4cb6e1fa1843935 SHA256 9563039133e411639a875f71c38769fda701854bb15f74863bee7e66b584a1c9
-EBUILD openldap-2.3.43.ebuild 17752 RMD160 a97c938d30d83c632e1d9caeba8f9390116beba6 SHA1 60c12a45e5d3dbef099190387a2059de70285cf5 SHA256 97d998731331a70d5becca099a590da7916ef0baea0a6ae1e181ee5a9702740a
+EBUILD openldap-2.3.43-r1.ebuild 17840 RMD160 fcaa57e4646d6b2775fe45d32cb470ddcb2e75d1 SHA1 4de23d68ff41197a777d3af4fa94dd8a1dc14311 SHA256 0d137584e281f25ecd481c48b4e9b4bdef03564426952819664ce27659cc491c
+EBUILD openldap-2.3.43.ebuild 17760 RMD160 afa9a1c6990f75ed1f0d184ca50a77911ee015e9 SHA1 f376a7d08e87bf9c538014a72ba48f67cde23511 SHA256 c894c4d38bf0563f17cc488f5ca275d1d59ff0ac4ab998e7c303a0390e087cc1
 EBUILD openldap-2.4.10.ebuild 13887 RMD160 3a63c3a7270fdc0236922570b2b9b0bd233b75cb SHA1 6ad2722d0a1d11265e733d117d166589b18f5a6d SHA256 291ab646b54ac7f286f5c33dc9087921cd6a39957442540b4ed4f88d5e757aa3
-EBUILD openldap-2.4.11-r1.ebuild 14206 RMD160 b4d3887f6aada3e93d1a488d279a255535fd1f21 SHA1 b2f3a75f3648db1b1da1b6f2fe76cf4395c09fe2 SHA256 39d96ab8febcb5bf99ebfb33812883fe8a25eb6e855b3d640345e426e0724886
+EBUILD openldap-2.4.11-r1.ebuild 14202 RMD160 10520ba88f1648e7ac922b314d9b94406e9e70ed SHA1 1242722ada4e8a894af8fff4b38214b36efeb360 SHA256 f159ca58f40e1849a996b7150f9376412f25c74690c672e35a81c0f6924a0051
 EBUILD openldap-2.4.11.ebuild 13885 RMD160 60891d864822b679200c8c6aca68275a307fb58f SHA1 93b50df0424a83e325f4a0ae6df4d40791314270 SHA256 749787c150151334ab7a424fc574453156b7720d9a313cd61e65c1adada2b977
 EBUILD openldap-2.4.7.ebuild 11106 RMD160 093948db1357a06b60826d76dbb870d49985409a SHA1 a8fc14a97e6b8a78ad9b11b69ac8408b8351c0bd SHA256 01b233c023499c7c423c838106b73ff9f620ba70d0b50dd954c843f6799f5305
-MISC ChangeLog 57112 RMD160 cea6259a3896076cc9e5694876a5fc5fd9338846 SHA1 c263858a4b2fe9e0e068a024daa607fad03bff7c SHA256 5b101437af71b5d23ec6f8d6bc32d338d5fb9965c0a1354e71bbb881254a3acc
+MISC ChangeLog 57281 RMD160 829662c211400509f16e0dfc6a04be69be02d232 SHA1 ce55ea5df10a665339fbfb7fe248c3d569c6ad9e SHA256 4bab872b9fd75d85c4943ef979d4d01719d9e0504200f1b80d3c1398c9dabaca
 MISC metadata.xml 493 RMD160 3fd70a0f5e5b400cce6f75e477c8c9eaf0244ff8 SHA1 324691bfdc993bd6de2fff7cbfc10cfad567d32d SHA256 d23200f9c2f9e95e5fa32808c597df2951cd5e88ca9c519c9d5186bc42b0981e
diff --git a/net-nds/openldap/openldap-2.3.43-r1.ebuild b/net-nds/openldap/openldap-2.3.43-r1.ebuild
index decb03a6b3a9..ff64629bb812 100644
--- a/net-nds/openldap/openldap-2.3.43-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.43-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.3 2009/01/13 20:20:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43-r1.ebuild,v 1.4 2009/01/15 11:12:28 armin76 Exp $
 
 EAPI="2"
 
@@ -187,9 +187,7 @@ pkg_setup() {
 	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# According to MDK, the link order needs to be changed so that
 	# on systems w/ MD5 passwords the system crypt library is used
 	# (the net result is that "passwd" can be used to change ldap passwords w/
@@ -233,7 +231,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	#Fix for glibc-2.8 and ucred. Bug 228457.
@@ -309,7 +307,9 @@ src_compile() {
 		--enable-shared \
 		--libexecdir=/usr/$(get_libdir)/openldap \
 		${myconf} || die "configure failed"
+}
 
+src_compile() {
 	emake depend || die "make depend failed"
 	emake || die "make failed"
 
diff --git a/net-nds/openldap/openldap-2.3.43.ebuild b/net-nds/openldap/openldap-2.3.43.ebuild
index 796c1c1fe3fe..5259dd88367a 100644
--- a/net-nds/openldap/openldap-2.3.43.ebuild
+++ b/net-nds/openldap/openldap-2.3.43.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43.ebuild,v 1.9 2009/01/13 20:20:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.43.ebuild,v 1.10 2009/01/15 11:12:28 armin76 Exp $
 
 EAPI="2"
 
@@ -187,9 +187,7 @@ pkg_setup() {
 	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# According to MDK, the link order needs to be changed so that
 	# on systems w/ MD5 passwords the system crypt library is used
 	# (the net result is that "passwd" can be used to change ldap passwords w/
@@ -232,7 +230,7 @@ src_unpack() {
 	fi
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	#Fix for glibc-2.8 and ucred. Bug 228457.
@@ -308,7 +306,9 @@ src_compile() {
 		--enable-shared \
 		--libexecdir=/usr/$(get_libdir)/openldap \
 		${myconf} || die "configure failed"
+}
 
+src_compile() {
 	emake depend || die "make depend failed"
 	emake || die "make failed"
 
diff --git a/net-nds/openldap/openldap-2.4.11-r1.ebuild b/net-nds/openldap/openldap-2.4.11-r1.ebuild
index 4084793f95c8..f484e3cf4457 100644
--- a/net-nds/openldap/openldap-2.4.11-r1.ebuild
+++ b/net-nds/openldap/openldap-2.4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.11-r1.ebuild,v 1.4 2009/01/13 20:20:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.11-r1.ebuild,v 1.5 2009/01/15 11:12:28 armin76 Exp $
 
 EAPI="2"
 inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs
@@ -165,10 +165,7 @@ pkg_setup() {
 	enewuser ldap 439 -1 /usr/$(get_libdir)/openldap ldap
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# ensure correct SLAPI path by default
 	sed -i -e 's,\(#define LDAPI_SOCK\).*,\1 "/var/run/openldap/slapd.sock",' \
 		"${S}"/include/ldap_defaults.h
@@ -200,7 +197,7 @@ build_contrib_module() {
 		${LDFLAGS} -o $3.so $2 || die "building $3 failed"
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	#Fix for glibc-2.8 and ucred. Bug 228457.
@@ -276,7 +273,9 @@ src_compile() {
 	econf \
 		--libexecdir=/usr/$(get_libdir)/openldap \
 		${myconf} || die "configure failed"
+}
 
+src_compile() {
 	emake depend || die "emake depend failed"
 	emake CC=$(tc-getCC) AR=$(tc-getAR) || die "emake failed"