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

(Portage version: 2.1_pre10-r3)

6 files changed, 24 insertions, 12 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/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