Ebuild clean up, don't build 2.1 libs when building 2.2, just preserve if needed

(Portage version: 2.1.2_rc4)
 (Signed Manifest commit)

2 files changed, 30 insertions, 152 deletions

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index a0d007c82daf..16d64051e4c8 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -21,10 +21,6 @@ AUX gencert.sh 3505 RMD160 9de31e9a4d4b654ac9e0f899e51a8c5049bf90bf SHA1 c725139
 MD5 c8d6f4ebeb92ef1085b1bb77d7b4db5f files/gencert.sh 3505
 RMD160 9de31e9a4d4b654ac9e0f899e51a8c5049bf90bf files/gencert.sh 3505
 SHA256 73f1f7f0d76132da878ae8739f4f4403bb5f17d630ffa109fe4b1645e7f073c6 files/gencert.sh 3505
-AUX gencert.sh-2.2.27 2939 RMD160 fa7501bec63ea372904a215d7ae44d2ad9c99e23 SHA1 9e82bdfa35440c3a46481192d936d1c258ff642f SHA256 517884e873390eabbaf7d13880d1a676e2cb384331a9c65e3301ca6ac3642693
-MD5 c16eada85fafe1c17bf0089d0ef90ae3 files/gencert.sh-2.2.27 2939
-RMD160 fa7501bec63ea372904a215d7ae44d2ad9c99e23 files/gencert.sh-2.2.27 2939
-SHA256 517884e873390eabbaf7d13880d1a676e2cb384331a9c65e3301ca6ac3642693 files/gencert.sh-2.2.27 2939
 AUX openldap-2.1.27-db40.patch 718 RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 SHA1 9a6a9fb9608a1abfbafa3a4e4915d67e8e36ec4c SHA256 c312198115be7f9e63d073de9429b0253bb73e4d9c39aa03cbe5ab30c6309d53
 MD5 b10517f0e7be829d47bb8096d86fb519 files/openldap-2.1.27-db40.patch 718
 RMD160 89803b72228deb5772a57fa7e70b35530c7353b6 files/openldap-2.1.27-db40.patch 718
@@ -127,18 +123,18 @@ EBUILD openldap-2.1.30-r8.ebuild 8278 RMD160 2dcf044cf7f6e5a2f5ae36734e91a917174
 MD5 b6cef48c62a0322e3e7a8433225f5cad openldap-2.1.30-r8.ebuild 8278
 RMD160 2dcf044cf7f6e5a2f5ae36734e91a9171741ddae openldap-2.1.30-r8.ebuild 8278
 SHA256 f43bd32d81fa68f1d033655bdfd4ebdb1e2e65acc663dc9c4f66085553e3efea openldap-2.1.30-r8.ebuild 8278
-EBUILD openldap-2.1.30-r9.ebuild 9044 RMD160 df07f5f73d2889a22d6f6f5093023a1afa9ec2aa SHA1 b65afd79b9fe96ed8d377a741e3d2ed0573477d1 SHA256 261b9625a036e04b16c4e311dc32ea65b1d97e94f6663be09f4a9213f5c7b4c8
-MD5 d613df3636750dd3df690ea2ab76e945 openldap-2.1.30-r9.ebuild 9044
-RMD160 df07f5f73d2889a22d6f6f5093023a1afa9ec2aa openldap-2.1.30-r9.ebuild 9044
-SHA256 261b9625a036e04b16c4e311dc32ea65b1d97e94f6663be09f4a9213f5c7b4c8 openldap-2.1.30-r9.ebuild 9044
-EBUILD openldap-2.2.28-r5.ebuild 13871 RMD160 ff44f43532ff6cf0d6436d560adb7d055d9d2eee SHA1 edbd63ccb6218aeb62b125e4d04d25f670446e24 SHA256 8aba892d3f122cf9bae8db85c81ff4921407c2346a9e0f6b541e5d8e9b378c1e
-MD5 5ddf5bf7bd6c0e7e0142b38d7279362e openldap-2.2.28-r5.ebuild 13871
-RMD160 ff44f43532ff6cf0d6436d560adb7d055d9d2eee openldap-2.2.28-r5.ebuild 13871
-SHA256 8aba892d3f122cf9bae8db85c81ff4921407c2346a9e0f6b541e5d8e9b378c1e openldap-2.2.28-r5.ebuild 13871
-EBUILD openldap-2.2.28-r6.ebuild 15182 RMD160 6c89460e2bbdd2b103b75b35fa5a330f7eacfcc8 SHA1 af995cefb935a943d1aeeb5e42e7f89caaaa714a SHA256 accfbb8bff6545b52437d290700c5f52fc949ad527daaacee37e30b6f9ea36f5
-MD5 128c38b707eebe22b9a18f83a48eb21c openldap-2.2.28-r6.ebuild 15182
-RMD160 6c89460e2bbdd2b103b75b35fa5a330f7eacfcc8 openldap-2.2.28-r6.ebuild 15182
-SHA256 accfbb8bff6545b52437d290700c5f52fc949ad527daaacee37e30b6f9ea36f5 openldap-2.2.28-r6.ebuild 15182
+EBUILD openldap-2.1.30-r9.ebuild 8128 RMD160 349f19aa8e6240133c11c2ba3ce1d69a651be453 SHA1 6631411994d64c9285dd310e873322613c5477f5 SHA256 f3c9b3cc3b5664d63be8cd21943d944841527f573606d78dfcf371e9a39231ee
+MD5 a0413c504432e0da495d44183c283754 openldap-2.1.30-r9.ebuild 8128
+RMD160 349f19aa8e6240133c11c2ba3ce1d69a651be453 openldap-2.1.30-r9.ebuild 8128
+SHA256 f3c9b3cc3b5664d63be8cd21943d944841527f573606d78dfcf371e9a39231ee openldap-2.1.30-r9.ebuild 8128
+EBUILD openldap-2.2.28-r5.ebuild 13821 RMD160 3dd962eb630dcb127131bf6dfe9f247ee9dab248 SHA1 c846de1e994bcd6d65371fd263e2d756950e311e SHA256 a00cb15ad1ad6e742197f5833ba8422b53dcb61e84140072bd9e04226d705143
+MD5 791fc29bf2c7059358f7bac7a6c7bfdb openldap-2.2.28-r5.ebuild 13821
+RMD160 3dd962eb630dcb127131bf6dfe9f247ee9dab248 openldap-2.2.28-r5.ebuild 13821
+SHA256 a00cb15ad1ad6e742197f5833ba8422b53dcb61e84140072bd9e04226d705143 openldap-2.2.28-r5.ebuild 13821
+EBUILD openldap-2.2.28-r6.ebuild 12023 RMD160 9a7365c9e8c9caf87b1ef17683d88ddd60cfd12a SHA1 24f96632ea06e0ed024ec892f3794c5f555b8320 SHA256 0b6f76a8126b75bbf180554e73854c9e4a53e7514242cd10d80ead0c04c0986f
+MD5 d24168d82938b630a300f8c721ef51ff openldap-2.2.28-r6.ebuild 12023
+RMD160 9a7365c9e8c9caf87b1ef17683d88ddd60cfd12a openldap-2.2.28-r6.ebuild 12023
+SHA256 0b6f76a8126b75bbf180554e73854c9e4a53e7514242cd10d80ead0c04c0986f openldap-2.2.28-r6.ebuild 12023
 EBUILD openldap-2.3.24-r1.ebuild 14268 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 SHA1 159add9ffaea974e73cc15edfde3cd48dd1ea31c SHA256 7568e3e249db5b4045a9326c40bcdf356649e70fe49de3ca15a8dab77b7f0e42
 MD5 de5dd9e1c32a1488d167678c67afbaa4 openldap-2.3.24-r1.ebuild 14268
 RMD160 b5f01fb5ffc7eb1232bca4bb717d5de3d9d6cf02 openldap-2.3.24-r1.ebuild 14268
@@ -147,18 +143,18 @@ EBUILD openldap-2.3.27-r3.ebuild 17913 RMD160 4ef009d1299514bdda6667694e176632f0
 MD5 e85cfe3479b0b0f669d58e42c3887d99 openldap-2.3.27-r3.ebuild 17913
 RMD160 4ef009d1299514bdda6667694e176632f084f51a openldap-2.3.27-r3.ebuild 17913
 SHA256 5939ae06f7bcbcb692d25d06cc0ecab477ae9f5ad031b447e36bc5146341c1b2 openldap-2.3.27-r3.ebuild 17913
-EBUILD openldap-2.3.30-r1.ebuild 17803 RMD160 8a86b9e9a26080461f20d243bde9b86725e0d883 SHA1 a374927a74ce0c7a3e565d7f54f6fa7f76728e22 SHA256 b238e671cf3120dfff6af55dda43e277d09734fc4c36c62b6dda22ab33076187
-MD5 c20bf96b591beccba8b9629a1e4baf83 openldap-2.3.30-r1.ebuild 17803
-RMD160 8a86b9e9a26080461f20d243bde9b86725e0d883 openldap-2.3.30-r1.ebuild 17803
-SHA256 b238e671cf3120dfff6af55dda43e277d09734fc4c36c62b6dda22ab33076187 openldap-2.3.30-r1.ebuild 17803
-EBUILD openldap-2.3.31.ebuild 17797 RMD160 aaa87fc3c52b7e76eb586fb254c7d73f05f41f70 SHA1 32218b1372bf93a4661f42b6e6ac9fa7ea0117bf SHA256 ddf15700940b5c7d69f0994ede1dbd67c79f28d51e9ad16c056377684893987d
-MD5 392e2d19cb2aba4e1e53948a15ced714 openldap-2.3.31.ebuild 17797
-RMD160 aaa87fc3c52b7e76eb586fb254c7d73f05f41f70 openldap-2.3.31.ebuild 17797
-SHA256 ddf15700940b5c7d69f0994ede1dbd67c79f28d51e9ad16c056377684893987d openldap-2.3.31.ebuild 17797
-MISC ChangeLog 40790 RMD160 66fdb6e2ea3b2ca3979165665afa21175a498c51 SHA1 aa4b8887e0c21092ee379778c539ecea7abac491 SHA256 cd3ddab2a7b8adf56d5fc4849394890b5720b52e359b2e53d886ce51cd705fde
-MD5 83c7f173282228333d63a946cdb2cb47 ChangeLog 40790
-RMD160 66fdb6e2ea3b2ca3979165665afa21175a498c51 ChangeLog 40790
-SHA256 cd3ddab2a7b8adf56d5fc4849394890b5720b52e359b2e53d886ce51cd705fde ChangeLog 40790
+EBUILD openldap-2.3.30-r1.ebuild 16737 RMD160 e9bff4f1d125ee134477ce7c35da4b43cd9a72b9 SHA1 aaa633352649b7643ed424ba83e55b06be1e07b9 SHA256 4993a344796799d6e8c3d5165d0c6fcd96d58e6602d20c22f0a17bda455cd53e
+MD5 238575a5434c08f92f9434a848bc82b0 openldap-2.3.30-r1.ebuild 16737
+RMD160 e9bff4f1d125ee134477ce7c35da4b43cd9a72b9 openldap-2.3.30-r1.ebuild 16737
+SHA256 4993a344796799d6e8c3d5165d0c6fcd96d58e6602d20c22f0a17bda455cd53e openldap-2.3.30-r1.ebuild 16737
+EBUILD openldap-2.3.31.ebuild 16734 RMD160 2f5eceb89ee40b5a0e5ce7bb7fdc452257be7aa5 SHA1 5e20a97e8e9dfa1d6032622f31ab856b27752b24 SHA256 ef22fb63e0caf0b0f21943bbaf11ebbb9b2a8559074180a0c121a85dc294c241
+MD5 addd96bd4bcbba6b006be32e93f61bfc openldap-2.3.31.ebuild 16734
+RMD160 2f5eceb89ee40b5a0e5ce7bb7fdc452257be7aa5 openldap-2.3.31.ebuild 16734
+SHA256 ef22fb63e0caf0b0f21943bbaf11ebbb9b2a8559074180a0c121a85dc294c241 openldap-2.3.31.ebuild 16734
+MISC ChangeLog 41089 RMD160 f2ad18c6f11267485eeba7b02c00c27374eff41e SHA1 ef50a820f1c17c3c0aab9e040a6196ee9319ce17 SHA256 866480975e7878ac1e150040171296460e5fadaa04ee4c2ac7069eaef5c3516a
+MD5 6e8d3e9ce77afe1c0a624704e187667f ChangeLog 41089
+RMD160 f2ad18c6f11267485eeba7b02c00c27374eff41e ChangeLog 41089
+SHA256 866480975e7878ac1e150040171296460e5fadaa04ee4c2ac7069eaef5c3516a ChangeLog 41089
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -172,9 +168,9 @@ SHA256 93bf80b5f142956ebcafc98f71500106ffddbf3e1bfd5986c3573a6567e61b54 files/di
 MD5 7e4e22b26b4b86007460dcf3252bc08c files/digest-openldap-2.2.28-r5 482
 RMD160 f24d179480f1f0d0b0138beb7675e2d99dcb2419 files/digest-openldap-2.2.28-r5 482
 SHA256 f158ecb35b525da1bd32b3d0742f83a05ae925d77d71fcf9268584c06e07de63 files/digest-openldap-2.2.28-r5 482
-MD5 7e4e22b26b4b86007460dcf3252bc08c files/digest-openldap-2.2.28-r6 482
-RMD160 f24d179480f1f0d0b0138beb7675e2d99dcb2419 files/digest-openldap-2.2.28-r6 482
-SHA256 f158ecb35b525da1bd32b3d0742f83a05ae925d77d71fcf9268584c06e07de63 files/digest-openldap-2.2.28-r6 482
+MD5 7c24277a9daf03437d0d2266c2379a60 files/digest-openldap-2.2.28-r6 241
+RMD160 68c8f1b251970b4272d34661de70d260efe8f90c files/digest-openldap-2.2.28-r6 241
+SHA256 51c7035bfbf95337f8b29fb76a53ed35b35d31d1e194d72fd430126279074adf files/digest-openldap-2.2.28-r6 241
 MD5 90715e5ebf5339aaaa881c3ed3b46b3c files/digest-openldap-2.3.24-r1 241
 RMD160 13c05b3ac61d04c0b78a7788823a866477e2eb16 files/digest-openldap-2.3.24-r1 241
 SHA256 1421251aff6fc052097eddf5d854cd3001eaa984555a64343b705d18325b7ece files/digest-openldap-2.3.24-r1 241
@@ -190,7 +186,7 @@ SHA256 1da7f61889e0b638a15aa1fbcefb9b5df99ea1ed92b83196fc9c9b12e08527aa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFjVUkz974XjDVpbkRAoe9AJ9zfWk5anoMSfxek3fGJzEwr7IYmwCgi1A9
-0lsnYI8+4wtyxDooZA4bL9k=
-=RW7M
+iD8DBQFFjZGGz974XjDVpbkRAisQAKCi4MeOBENYoyQN45HwRWT5dgUwuACdGy3E
+Vp8m5Ma8RJkKJtAAcR6kI1I=
+=MjnM
 -----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/files/gencert.sh-2.2.27 b/net-nds/openldap/files/gencert.sh-2.2.27
deleted file mode 100644
index a06c53345d17..000000000000
--- a/net-nds/openldap/files/gencert.sh-2.2.27
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# 
-# Originally written by me for the mdk distro 
-# On the old header you can find my old email <czoffoli@linux-mandrake.com>
-#
-# Last update 20050401 - Christian Zoffoli <xmerlin@gentoo.org>
-#
-
-VERSION="0.3"
-openssl="/usr/bin/openssl"
-opensslopts=""
-ldapconfdir="/etc/openldap/ssl"
-pemfile="${ldapconfdir}/ldap.pem"
-randfile="${ldapconfdir}/ldap.rand"
-cfgfile="${ldapconfdir}/ldap.cfg"
-
-function fixperms {
-	chown root:ldap ${ldapconfdir} -R
-	find ${ldapconfdir} -type f -exec chmod 640 \{\} \;
-	chmod 750 ${ldapconfdir}
-}
-
-
-if [ ! -x ${openssl} ]; then
-	exit 0
-fi
-
-if [ ! -d ${ldapconfdir} ]; then
-	mkdir -p ${ldapconfdir}
-fi
-
-fixperms
-
-if [ -f ${pemfile} ]; then
-	echo "${pemfile} already exist, dying"
-	exit 0
-fi
-
-
-dd if=/dev/urandom of=$randfile count=1 2>/dev/null
-
-echo ""
-echo "______________________________________________________________________${T_ME}"
-echo ""
-echo "Creating self-signed certificate -- Version ${VERSION}"
-echo ""
-echo "______________________________________________________________________${T_ME}"
-echo ""
-
-
-COMMONNAME=`hostname`
-if [ ! -n "$COMMONNAME" ]; then
-	COMMONNAME="www.openldap.org"
-fi
-
-
-if [ -f ${cfgfile} ]; then
-	echo "${cfgfile} found, would you like to use it ? (y/n)"
-	read answer
-	
-	case "$answer" in
-		y|Y)
-			opensslopts="-batch"
-		;;
-		n|N)
-			cat >${cfgfile} <<EOT
-			[ req ]
-			default_bits                    = 1024
-			distinguished_name              = req_DN
-			RANDFILE                        = ${randfile}
-			[ req_DN ]
-			countryName                     = "1. Country Name             (2 letter code)"
-			countryName_default             = "US"
-			countryName_min			= 2
-			countryName_max			= 2
-			stateOrProvinceName		= "2. State or Province Name   (full name)    "
-			stateOrProvinceName_default	= ""
-			localityName                    = "3. Locality Name            (eg, city)     "
-			localityName_default		= ""
-			0.organizationName		= "4. Organization Name        (eg, company)  "
-			0.organizationName_default	= "LDAP Server"
-			organizationalUnitName		= "5. Organizational Unit Name (eg, section)  "
-			organizationalUnitName_default	= "For testing purposes only"
-			commonName			= "6. Common Name              (eg, CA name)  "
-			commonName_max			= 64
-			commonName_default		= "${COMMONNAME}"
-			emailAddress			= "7. Email Address            (eg, name@FQDN)"
-			emailAddress_max		= 40
-			emailAddress_default		= ""
-EOT
-		;;
-		*)
-			echo "Wrong answer, retry!"
-			exit 1
-		;;
-	esac 
-fi
-
-echo ""
-
-${openssl} req -config ${cfgfile} ${opensslopts} -new -rand ${randfile} -x509 -nodes -out ${pemfile} -keyout ${pemfile} -days 999999  
-
-if [ $? -ne 0 ]; then
-	echo "cca:Error: Failed to generate certificate " 1>&2
-	exit 1
-else
-	echo -e "\nCertificate creation done!"
-fi
-
-if [ -f ${randfile} ]; then
-	rm -f ${randfile}
-fi
-
-if [ -f ${pemfile} ]; then
-	fixperms
-fi