Modified Version-Tag checker and added some skip option wrt bug #132246

Package-Manager: portage-2.1_pre10-r3

7 files changed, 51 insertions, 39 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index a8839ae20c0b..876d1a1de3be 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-nds/openldap
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.178 2006/05/06 10:57:47 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.179 2006/05/06 13:18:56 jokey Exp $
+
+  06 May 2006; Markus Ullmann <jokey@gentoo.org> openldap-2.3.21-r1.ebuild:
+  Modified Version-Tag checker and added some skip option wrt bug #132246
 
 *openldap-2.3.21-r1 (06 May 2006)
 
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 88f5f131b6c8..391f8be3635c 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -109,26 +109,26 @@ DIST openldap-2.1.30.tgz 2044673 RMD160 431aa798c6197530c17611b931f0169d7a53e831
 DIST openldap-2.2.23.tgz 2600908 RMD160 fc34d3f874d3976e4f8902820190dceda8d940c5 SHA256 303ae734d343f54228e6745d7660be2a46ecb7e6cd27199e027535dd35a63b14 size 2600908
 DIST openldap-2.2.28.tgz 2630427 RMD160 ca3f5aff42e6afc6b7c0a62beb8c13d4ff43d44c SHA256 05c75b719305578dec799f05eaddae6b77eb51857abc6284e47b6abc4317dfba size 2630427
 DIST openldap-2.3.21.tgz 3750778 RMD160 8fb7bce91452e24a8bd5e23f6dd3d17a3b2711cf SHA256 12204e82276036742f4595122ca2c4ca173e7144a449f1d6d4950273c94a0ef5 size 3750778
-EBUILD openldap-2.1.30-r2.ebuild 7483 RMD160 d58d6170eb26b2528ad2cfc39e0a098f9972ac77 SHA1 ea936d856c31b7c8704a4afe96adce32d65c2392 SHA256 eea4e345aebb4ddfbe77facba80b6ae0dafbacfdc1f45f84a0286f893c341d9d size 7483
-MD5 943899d61dff15e7eb2ff62409814b49 openldap-2.1.30-r2.ebuild 7483
-RMD160 d58d6170eb26b2528ad2cfc39e0a098f9972ac77 openldap-2.1.30-r2.ebuild 7483
-SHA256 eea4e345aebb4ddfbe77facba80b6ae0dafbacfdc1f45f84a0286f893c341d9d openldap-2.1.30-r2.ebuild 7483
-EBUILD openldap-2.1.30-r5.ebuild 7628 RMD160 ea0ac3e3db03fb6104ab74887a6047dac9d64fc9 SHA1 29d714669b101c1b5f568aaef0d599a48cf506ed SHA256 4a7f686b9596c8a6304b36679d0a9802f4721071a870edde2717585c03d812d2 size 7628
-MD5 2950a8442733483861d191c433359f59 openldap-2.1.30-r5.ebuild 7628
-RMD160 ea0ac3e3db03fb6104ab74887a6047dac9d64fc9 openldap-2.1.30-r5.ebuild 7628
-SHA256 4a7f686b9596c8a6304b36679d0a9802f4721071a870edde2717585c03d812d2 openldap-2.1.30-r5.ebuild 7628
-EBUILD openldap-2.1.30-r6.ebuild 8137 RMD160 56b99580fa06781f9268dce9983a0e77a3d83814 SHA1 fadb0d07f2b0093a342aae4857b75be3211293cd SHA256 76d6008dc79ffd9a44aaa7eb35b50ad13fd82bb80c3e095d6e2b88b26ec52e86 size 8137
-MD5 80349b77cb15c3fcae8812961ade31a2 openldap-2.1.30-r6.ebuild 8137
-RMD160 56b99580fa06781f9268dce9983a0e77a3d83814 openldap-2.1.30-r6.ebuild 8137
-SHA256 76d6008dc79ffd9a44aaa7eb35b50ad13fd82bb80c3e095d6e2b88b26ec52e86 openldap-2.1.30-r6.ebuild 8137
+EBUILD openldap-2.1.30-r2.ebuild 7481 RMD160 d3cf18053b469d1b482a116e2811ae4b5ddb8a0d SHA1 0219daa09b088949f4f776bed06cd9fc23d13cb4 SHA256 99dbf308566ccbe3c3be588c6e92bbcf6f476c80f95a6093d8667c6e46e09348 size 7481
+MD5 fd027aaa5f21cf18f10ed713411feda0 openldap-2.1.30-r2.ebuild 7481
+RMD160 d3cf18053b469d1b482a116e2811ae4b5ddb8a0d openldap-2.1.30-r2.ebuild 7481
+SHA256 99dbf308566ccbe3c3be588c6e92bbcf6f476c80f95a6093d8667c6e46e09348 openldap-2.1.30-r2.ebuild 7481
+EBUILD openldap-2.1.30-r5.ebuild 7626 RMD160 5e87d91bc6a410fd3da49aefd318e3e27d71304d SHA1 fd14c868487dde95e2dd5b1328e5e92b0b6d7ccc SHA256 f4190477d36047a1765fff17d7a12ec2375c01ff35a92523b8eaee66f6c0872f size 7626
+MD5 c139349233c8544ea01f31b593c17baf openldap-2.1.30-r5.ebuild 7626
+RMD160 5e87d91bc6a410fd3da49aefd318e3e27d71304d openldap-2.1.30-r5.ebuild 7626
+SHA256 f4190477d36047a1765fff17d7a12ec2375c01ff35a92523b8eaee66f6c0872f openldap-2.1.30-r5.ebuild 7626
+EBUILD openldap-2.1.30-r6.ebuild 8137 RMD160 dfacbe171a40150594b2dd6089b3d21fa388b019 SHA1 4ff56a43f98aea74b9608b5b1367360a73f1d85f SHA256 6a94fa3ef332a2425b87dbe4b44227d7194eaf2ff50bd688e532afebb34c4f3a size 8137
+MD5 cf3459ef7f70916905138caeed991715 openldap-2.1.30-r6.ebuild 8137
+RMD160 dfacbe171a40150594b2dd6089b3d21fa388b019 openldap-2.1.30-r6.ebuild 8137
+SHA256 6a94fa3ef332a2425b87dbe4b44227d7194eaf2ff50bd688e532afebb34c4f3a openldap-2.1.30-r6.ebuild 8137
 EBUILD openldap-2.1.30-r7.ebuild 8904 RMD160 b317d16176ddc9cfb8c329cd9642275c378a7615 SHA1 b3e6eee160ef78ee0c13b274aceb3acf60fa8ae2 SHA256 e196cb66fc9b0225f7e6b5c74f37386c563c6850daf18582e0c192f95dde5b28 size 8904
 MD5 41ddaae1efa5f62acef48fd20236b9e0 openldap-2.1.30-r7.ebuild 8904
 RMD160 b317d16176ddc9cfb8c329cd9642275c378a7615 openldap-2.1.30-r7.ebuild 8904
 SHA256 e196cb66fc9b0225f7e6b5c74f37386c563c6850daf18582e0c192f95dde5b28 openldap-2.1.30-r7.ebuild 8904
-EBUILD openldap-2.2.23-r1.ebuild 8793 RMD160 1e04523d6d4b394f1e0b2957b8fc72dc771c2760 SHA1 ebe6e600b97ec5719dbeb9d12cb235a2a09af0b8 SHA256 58948e6507ff5688fd2fc34db9d7336b50d34c975cc7368af2f132f85d957d57 size 8793
-MD5 67e977f2927e78c29f4020adba7f6b5b openldap-2.2.23-r1.ebuild 8793
-RMD160 1e04523d6d4b394f1e0b2957b8fc72dc771c2760 openldap-2.2.23-r1.ebuild 8793
-SHA256 58948e6507ff5688fd2fc34db9d7336b50d34c975cc7368af2f132f85d957d57 openldap-2.2.23-r1.ebuild 8793
+EBUILD openldap-2.2.23-r1.ebuild 8791 RMD160 84f5f420371877d3107eeb25f06af26840e30824 SHA1 7b598285483be8310d5aab87f9648ff735151f7c SHA256 01c44304fb6c82b6bfe8b28f8d59f81433c6bf51fa2ce591446f89bfa9c5693e size 8791
+MD5 621f16d84bb0cb752ac3171f9c231eb4 openldap-2.2.23-r1.ebuild 8791
+RMD160 84f5f420371877d3107eeb25f06af26840e30824 openldap-2.2.23-r1.ebuild 8791
+SHA256 01c44304fb6c82b6bfe8b28f8d59f81433c6bf51fa2ce591446f89bfa9c5693e openldap-2.2.23-r1.ebuild 8791
 EBUILD openldap-2.2.28-r3.ebuild 13717 RMD160 841dd06f816c4d266a638ef9e056fe48ddacd698 SHA1 8f091fe7fc2e6e71d8da7bafd536f4b5d4ef1d22 SHA256 45465cbe50c9815d4bb251c90ce9fcd528774a3b7b7272c7a57e95c77b620a36 size 13717
 MD5 d4c182a4f028e7ad79cfc127f3a2632d openldap-2.2.28-r3.ebuild 13717
 RMD160 841dd06f816c4d266a638ef9e056fe48ddacd698 openldap-2.2.28-r3.ebuild 13717
@@ -137,18 +137,18 @@ EBUILD openldap-2.2.28-r4.ebuild 14856 RMD160 cee7261ad9b819187e0a96e4db57ac33f7
 MD5 bfbb723e1d3af9439454c3e320feb0d0 openldap-2.2.28-r4.ebuild 14856
 RMD160 cee7261ad9b819187e0a96e4db57ac33f7cc9567 openldap-2.2.28-r4.ebuild 14856
 SHA256 da400cd6cf66d08911b831a71507c86827ac924521cd9d384bb93fcae489acf5 openldap-2.2.28-r4.ebuild 14856
-EBUILD openldap-2.3.21-r1.ebuild 13094 RMD160 154701ecb6acaca4dc12c7e1cc81f814e5a720b9 SHA1 151844d96604e29f7cc9997441a3ffd39adf5225 SHA256 456e35f4542035cd624a209e77d6a2fb62cc02ca66f5c9df5c868cbe04ebdb02 size 13094
-MD5 1b1777e3af7698c345cf3b4eb7e19f96 openldap-2.3.21-r1.ebuild 13094
-RMD160 154701ecb6acaca4dc12c7e1cc81f814e5a720b9 openldap-2.3.21-r1.ebuild 13094
-SHA256 456e35f4542035cd624a209e77d6a2fb62cc02ca66f5c9df5c868cbe04ebdb02 openldap-2.3.21-r1.ebuild 13094
+EBUILD openldap-2.3.21-r1.ebuild 13339 RMD160 c26aa553cbdded6cac522d7c47ab33704a4a7590 SHA1 43ecedc2300a61d621a68616a2b38b98157b3637 SHA256 74c6332477466ab8e1cd46a844c087f68c11aeb181b185f89535b4777e0c08f8 size 13339
+MD5 b153178085f6f9eedc149fc8f63fedf7 openldap-2.3.21-r1.ebuild 13339
+RMD160 c26aa553cbdded6cac522d7c47ab33704a4a7590 openldap-2.3.21-r1.ebuild 13339
+SHA256 74c6332477466ab8e1cd46a844c087f68c11aeb181b185f89535b4777e0c08f8 openldap-2.3.21-r1.ebuild 13339
 EBUILD openldap-2.3.21.ebuild 12948 RMD160 afa1c92a3512191c0739115194cab97bf8019aef SHA1 3649e82d6b6aa83da4cbae68e466e2bc60f5204b SHA256 ff59e7728f5a2ac0ae8ff873ae0d04bf7941785872b467e598f6763227ec6b85 size 12948
 MD5 d5546d9d6f63b754dbf3f07a4871d041 openldap-2.3.21.ebuild 12948
 RMD160 afa1c92a3512191c0739115194cab97bf8019aef openldap-2.3.21.ebuild 12948
 SHA256 ff59e7728f5a2ac0ae8ff873ae0d04bf7941785872b467e598f6763227ec6b85 openldap-2.3.21.ebuild 12948
-MISC ChangeLog 31852 RMD160 634a100d7c666a23ac0d3cd244e6d036861e481f SHA1 c64c626f7c6eb71f58f445a47d3d962c35b33624 SHA256 03ff26e9efb5a6e519e7ffbbab31f5aec5b259da36c85caa26192f2e4ed5808b size 31852
-MD5 5e3b627d82fc7b213805bbb4d46bb8cf ChangeLog 31852
-RMD160 634a100d7c666a23ac0d3cd244e6d036861e481f ChangeLog 31852
-SHA256 03ff26e9efb5a6e519e7ffbbab31f5aec5b259da36c85caa26192f2e4ed5808b ChangeLog 31852
+MISC ChangeLog 32003 RMD160 544e6c6526aa1ceb9e278cdab7d6205ddd9ed259 SHA1 5ac7814462ecb4a638fc9124eef3178e1547cf73 SHA256 6c7b465b99b3072b7dbad091db82cc880c751feea49d31855fe374d9dcef669b size 32003
+MD5 e5182dd822aacc6593a8b4556b362b62 ChangeLog 32003
+RMD160 544e6c6526aa1ceb9e278cdab7d6205ddd9ed259 ChangeLog 32003
+SHA256 6c7b465b99b3072b7dbad091db82cc880c751feea49d31855fe374d9dcef669b ChangeLog 32003
 MISC metadata.xml 503 RMD160 7888826d012217d4828733015fc1b62d95beb1c1 SHA1 aa81832c2d31f74e3d82978b127e039955de05e6 SHA256 52d773827d4d35086b58b24837b2e90eb3479e6a1fd5cce81c60a33c912d8722 size 503
 MD5 e630c2183fdc9397de2386d887a0e252 metadata.xml 503
 RMD160 7888826d012217d4828733015fc1b62d95beb1c1 metadata.xml 503
@@ -183,7 +183,7 @@ SHA256 e00ac18f0faf58d41a73109775715224d49093c682e31cf0d3236468918974c7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEXIBZz974XjDVpbkRAlXQAKDGNLU8daRl80j9uoutCiKuvpNv9ACfQ/Wq
-2RJ9Hz+dAqp0jML+zYIsb3o=
-=l3oS
+iD8DBQFEXKF0z974XjDVpbkRAmX4AKCLsyqttYU8ZfW2Rj95+nH1pop9FACfavAU
+1ZqXgzZ22Ot7vKu0nLEQS8A=
+=cCSJ
 -----END PGP SIGNATURE-----
diff --git a/net-nds/openldap/openldap-2.1.30-r2.ebuild b/net-nds/openldap/openldap-2.1.30-r2.ebuild
index 7c5a47ba3365..f495d9eaeaf7 100644
--- a/net-nds/openldap/openldap-2.1.30-r2.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r2.ebuild,v 1.12 2005/09/22 19:57:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r2.ebuild,v 1.13 2006/05/06 13:18:56 jokey Exp $
 
 inherit eutils
 
diff --git a/net-nds/openldap/openldap-2.1.30-r5.ebuild b/net-nds/openldap/openldap-2.1.30-r5.ebuild
index ec852f4dd2b5..5f74b0f70edd 100644
--- a/net-nds/openldap/openldap-2.1.30-r5.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r5.ebuild,v 1.11 2005/09/22 19:57:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r5.ebuild,v 1.12 2006/05/06 13:18:56 jokey Exp $
 
 inherit eutils
 
diff --git a/net-nds/openldap/openldap-2.1.30-r6.ebuild b/net-nds/openldap/openldap-2.1.30-r6.ebuild
index ddbbbfdfabaf..a73c4e2e431d 100644
--- a/net-nds/openldap/openldap-2.1.30-r6.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r6.ebuild,v 1.8 2005/12/13 23:16:15 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r6.ebuild,v 1.9 2006/05/06 13:18:56 jokey Exp $
 
 inherit eutils
 
diff --git a/net-nds/openldap/openldap-2.2.23-r1.ebuild b/net-nds/openldap/openldap-2.2.23-r1.ebuild
index d3ca3bade600..a774bb97b299 100644
--- a/net-nds/openldap/openldap-2.2.23-r1.ebuild
+++ b/net-nds/openldap/openldap-2.2.23-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.23-r1.ebuild,v 1.7 2005/09/22 19:57:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.23-r1.ebuild,v 1.8 2006/05/06 13:18:56 jokey Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-nds/openldap/openldap-2.3.21-r1.ebuild b/net-nds/openldap/openldap-2.3.21-r1.ebuild
index 92cc4a07f162..26db8e3b1016 100644
--- a/net-nds/openldap/openldap-2.3.21-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.21-r1.ebuild,v 1.1 2006/05/06 10:57:47 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.21-r1.ebuild,v 1.2 2006/05/06 13:18:56 jokey Exp $
 
 inherit autotools eutils flag-o-matic multilib toolchain-funcs
 
@@ -92,7 +92,9 @@ openldap_find_versiontags() {
 
 				# are we on the same branch?
 				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
-					openldap_upgrade_howto
+					if [[ `ls -a ${eachdir} | wc -l` > 4 ]] ; then
+						openldap_upgrade_howto
+					fi
 				fi
 			fi
 		fi
@@ -122,7 +124,14 @@ openldap_find_versiontags() {
 }
 
 pkg_setup() {
-	openldap_find_versiontags
+	if use minimal && built_with_use net-nds/openldap minimal ; then
+	    einfo
+	    einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	    einfo
+	else
+	    openldap_find_versiontags
+	fi
+
 	if use perl && built_with_use dev-lang/perl minimal ; then
 		die "You must have a complete (USE='-minimal') Perl install to use the perl backend!"
 	fi