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

Package-Manager: portage-2.1

4 files changed, 26 insertions, 22 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/Manifest b/net-nds/openldap/Manifest
index 53436b73c920..a3a1e50d65a7 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -159,18 +159,18 @@ EBUILD openldap-2.3.23.ebuild 14146 RMD160 a1b0b90e1e31cf849e3e63f4dc6b84b24cc64
 MD5 0d37122fbd8c111bbfd05cb74807e065 openldap-2.3.23.ebuild 14146
 RMD160 a1b0b90e1e31cf849e3e63f4dc6b84b24cc64ec1 openldap-2.3.23.ebuild 14146
 SHA256 ce3425f81a66ba4a5019ffcaeb71a9a51ca9ac0d93d3f30ff71dd88e905d2aa1 openldap-2.3.23.ebuild 14146
-EBUILD openldap-2.3.24-r1.ebuild 14207 RMD160 0ba27af6c1c01377db707abdd5d5842f0583d086 SHA1 d5bf955b8b49de634cf88e4a6e8d6aca677f7a81 SHA256 2fa630f2449277777f625e21ec80f2ea79dda5a728b54394242526c9c6e2da38
-MD5 eebef0b73e4e94844f64f4bdf41bf4f4 openldap-2.3.24-r1.ebuild 14207
-RMD160 0ba27af6c1c01377db707abdd5d5842f0583d086 openldap-2.3.24-r1.ebuild 14207
-SHA256 2fa630f2449277777f625e21ec80f2ea79dda5a728b54394242526c9c6e2da38 openldap-2.3.24-r1.ebuild 14207
-EBUILD openldap-2.3.24-r2.ebuild 17306 RMD160 c1a6ae69f6a498db16da84f340abbd834ff77f69 SHA1 00cce093e53376999656d8971bb583bd23da8249 SHA256 f5d4cdbbce625124985c0a4754578b91084cb47ab81adc14bf228149d5918274
-MD5 ae4c50017d7970c68b08efb5a69e589a openldap-2.3.24-r2.ebuild 17306
-RMD160 c1a6ae69f6a498db16da84f340abbd834ff77f69 openldap-2.3.24-r2.ebuild 17306
-SHA256 f5d4cdbbce625124985c0a4754578b91084cb47ab81adc14bf228149d5918274 openldap-2.3.24-r2.ebuild 17306
-MISC ChangeLog 34273 RMD160 5cd01e5ad615f12c5c3977c0055eb1a429436d27 SHA1 f3c8a215706a91f4dc89b031983a66a10602553c SHA256 a3bf7581da23ff16997baa10ee0891876f76fe6bb283582eb4c9ce484062de5e
-MD5 eb40869ff8f8e72a2fe9c5986b5eecff ChangeLog 34273
-RMD160 5cd01e5ad615f12c5c3977c0055eb1a429436d27 ChangeLog 34273
-SHA256 a3bf7581da23ff16997baa10ee0891876f76fe6bb283582eb4c9ce484062de5e ChangeLog 34273
+EBUILD openldap-2.3.24-r1.ebuild 14198 RMD160 afb1dfed32977b841c086b386edf812a38288b49 SHA1 9f531d9c188a56299a9716f51d725c96b362db65 SHA256 2eb97d941cf7590fae59f72a3c205d800db9f0b25f9cd96254bf8355bba72928
+MD5 18c8bfa95c32fcc8e0fd2985ab110e13 openldap-2.3.24-r1.ebuild 14198
+RMD160 afb1dfed32977b841c086b386edf812a38288b49 openldap-2.3.24-r1.ebuild 14198
+SHA256 2eb97d941cf7590fae59f72a3c205d800db9f0b25f9cd96254bf8355bba72928 openldap-2.3.24-r1.ebuild 14198
+EBUILD openldap-2.3.24-r2.ebuild 17299 RMD160 33798d6a11b44ff51b8a0dbe8349ed00437e093c SHA1 2bd7c58e3ae5e4990eeed365749ad635a6bb2d29 SHA256 ca7cab5289eb47ff2ed4f9a95bef7ec6b959a3c91fbc2806776355426094c2fb
+MD5 13941b3aa19088aec994ce41ac5aecf2 openldap-2.3.24-r2.ebuild 17299
+RMD160 33798d6a11b44ff51b8a0dbe8349ed00437e093c openldap-2.3.24-r2.ebuild 17299
+SHA256 ca7cab5289eb47ff2ed4f9a95bef7ec6b959a3c91fbc2806776355426094c2fb openldap-2.3.24-r2.ebuild 17299
+MISC ChangeLog 34439 RMD160 148bfb95c5307bc44f68c93a72c94a52b73a6096 SHA1 05ee613e5a0353da854a0e875d9b1801d6b6453d SHA256 01cb7af588e8537a658fe479cf0828ce2bd1dd883bf06a61ab6fae28032243c0
+MD5 d0fabf139aedc65b4b7c68ffce551e48 ChangeLog 34439
+RMD160 148bfb95c5307bc44f68c93a72c94a52b73a6096 ChangeLog 34439
+SHA256 01cb7af588e8537a658fe479cf0828ce2bd1dd883bf06a61ab6fae28032243c0 ChangeLog 34439
 MISC metadata.xml 240 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf SHA1 21c64f9ef102b6649bccfca61f06d7b328ef1727 SHA256 fecb6db825d33099fa9f18392db0b7a5ab89a4895ac6ca0f8a2313f348dfaaa6
 MD5 9a8efd7efb44b06913bf1d906d493407 metadata.xml 240
 RMD160 3dfef965b1bac3faa4abfec78fb98b0ed5a9ddaf metadata.xml 240
@@ -214,7 +214,7 @@ SHA256 1421251aff6fc052097eddf5d854cd3001eaa984555a64343b705d18325b7ece files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEkbOFz974XjDVpbkRAp0IAKC/3XDc3pmqnd5F9E5h0dHsrrsVowCgyo8C
-ANatalk8NOav7v4ngoxaQOU=
-=uP17
+iD8DBQFEkoX2z974XjDVpbkRAk8PAJwJiOXN3AdSVPumMnITjqyFsfYscACaA/Ft
+WnL2bUxY7ivK+OOFgDQELSc=
+=lsTm
 -----END PGP SIGNATURE-----
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