Minor fix on migration howto wrt bug #136863 and arm love

(Portage version: 2.1)

3 files changed, 11 insertions, 7 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 081dabc6e410..2cb1c39a5832 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,10 @@
 # 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.195 2006/06/15 19:22:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.196 2006/06/16 10:20:26 jokey Exp $
+
+  16 Jun 2006; Markus Ullmann <jokey@gentoo.org> openldap-2.3.24-r1.ebuild,
+  openldap-2.3.24-r2.ebuild:
+  Minor fix on migration howto wrt bug #136863 and arm love
 
   15 Jun 2006; Markus Ullmann <jokey@gentoo.org> openldap-2.3.24-r1.ebuild:
   Minor fix for populated tree detection, thanks to cardoe on #gentoo-dev for
diff --git a/net-nds/openldap/openldap-2.3.24-r1.ebuild b/net-nds/openldap/openldap-2.3.24-r1.ebuild
index cf0c05528868..62ab602c5b1b 100644
--- a/net-nds/openldap/openldap-2.3.24-r1.ebuild
+++ b/net-nds/openldap/openldap-2.3.24-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.24-r1.ebuild,v 1.9 2006/06/15 19:22:35 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.24-r1.ebuild,v 1.10 2006/06/16 10:20:26 jokey Exp $
 
 inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="berkdb crypt debug gdbm ipv6 kerberos minimal odbc overlays perl readline samba sasl slp ssl tcpd selinux"
 
 # note that the 'samba' USE flag pulling in OpenSSL is NOT an error.  OpenLDAP
@@ -59,7 +59,7 @@ openldap_upgrade_howto() {
 	eerror " 2. slapcat -l ${i}"
 	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
 	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/openldap-${PV}"
+	eerror " 5. emerge --update \=net-nds/${PF}"
 	eerror " 6. etc-update, and ensure that you apply the changes"
 	eerror " 7. slapadd -l ${l}"
 	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
diff --git a/net-nds/openldap/openldap-2.3.24-r2.ebuild b/net-nds/openldap/openldap-2.3.24-r2.ebuild
index fbef5e65f785..4c6f31287265 100644
--- a/net-nds/openldap/openldap-2.3.24-r2.ebuild
+++ b/net-nds/openldap/openldap-2.3.24-r2.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.24-r2.ebuild,v 1.1 2006/06/03 00:29:28 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.3.24-r2.ebuild,v 1.2 2006/06/16 10:20:26 jokey Exp $
 
 inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
 
@@ -59,7 +59,7 @@ openldap_upgrade_howto() {
 	eerror " 2. slapcat -l ${i}"
 	eerror " 3. egrep -v '^entryCSN:' <${i} >${l}"
 	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
-	eerror " 5. emerge --update \=net-nds/openldap-${PV}"
+	eerror " 5. emerge --update \=net-nds/${PF}"
 	eerror " 6. etc-update, and ensure that you apply the changes"
 	eerror " 7. slapadd -l ${l}"
 	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
@@ -107,7 +107,7 @@ openldap_find_versiontags() {
 				# are we on the same branch?
 				if [ "${OLD_MAJOR}" != "${PV:0:3}" ] ; then
 					ewarn "   Versiontag doesn't match current major release!"
-					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` > 5 ]] ; then
+					if [[ `ls -a ${CURRENT_TAGDIR} | wc -l` -gt 5 ]] ; then
 						eerror "   Versiontag says other major and you (probably) have datafiles!"
 						echo
 						openldap_upgrade_howto