More docs for 2.2 upgrade, fix slight glitch in slapd.conf.

5 files changed, 23 insertions, 15 deletions

diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index b4840cf1ed8f..8b0ac843cc1c 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-nds/openldap
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.92 2004/12/02 04:54:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.93 2004/12/07 06:35:00 robbat2 Exp $
+
+  06 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
+  openldap-2.1.30-r3.ebuild, openldap-2.1.30-r4.ebuild,
+  openldap-2.2.14.ebuild, openldap-2.2.19.ebuild:
+  More docs for 2.2 upgrade, fix slight glitch in slapd.conf.
 
 *openldap-2.1.30-r4 (01 Dec 2004)
 
diff --git a/net-nds/openldap/openldap-2.1.30-r3.ebuild b/net-nds/openldap/openldap-2.1.30-r3.ebuild
index a948aeef4b6c..e7b3c9e3d2f2 100644
--- a/net-nds/openldap/openldap-2.1.30-r3.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r3.ebuild,v 1.1 2004/08/22 20:23:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r3.ebuild,v 1.2 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -138,10 +138,10 @@ src_compile() {
 
 	make depend || die "make depend failed"
 	make || die "make failed"
-
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
diff --git a/net-nds/openldap/openldap-2.1.30-r4.ebuild b/net-nds/openldap/openldap-2.1.30-r4.ebuild
index 1a62b292adf4..e812035c5103 100644
--- a/net-nds/openldap/openldap-2.1.30-r4.ebuild
+++ b/net-nds/openldap/openldap-2.1.30-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r4.ebuild,v 1.1 2004/12/02 04:54:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.1.30-r4.ebuild,v 1.2 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -143,6 +143,7 @@ src_compile() {
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
diff --git a/net-nds/openldap/openldap-2.2.14.ebuild b/net-nds/openldap/openldap-2.2.14.ebuild
index 04992f7a2100..badaa5db8fcb 100644
--- a/net-nds/openldap/openldap-2.2.14.ebuild
+++ b/net-nds/openldap/openldap-2.2.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.14.ebuild,v 1.2 2004/08/22 20:23:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.14.ebuild,v 1.3 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -11,9 +11,8 @@ SRC_URI="mirror://openldap/openldap-release/${P}.tgz"
 LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
-KEYWORDS="-*"
 #In portage for testing only
-#KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 s390 hppa ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -145,6 +144,7 @@ src_compile() {
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
@@ -172,7 +172,7 @@ src_install() {
 	fowners ldap:ldap /var/run/openldap
 	fperms 0755 /var/run/openldap
 	for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-		sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+		sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
 		sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
 		fowners root:ldap ${f}
 		fperms 0640 ${f}
diff --git a/net-nds/openldap/openldap-2.2.19.ebuild b/net-nds/openldap/openldap-2.2.19.ebuild
index f15bd416f0c1..fd14ca7c05ea 100644
--- a/net-nds/openldap/openldap-2.2.19.ebuild
+++ b/net-nds/openldap/openldap-2.2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.19.ebuild,v 1.1 2004/12/02 04:39:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.2.19.ebuild,v 1.2 2004/12/07 06:35:00 robbat2 Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="OPENLDAP"
 SLOT="0"
 IUSE="berkdb crypt debug gdbm ipv6 odbc perl readline samba sasl slp ssl tcpd"
 #In portage for testing only, hardmasked in package.mask
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha arm ~amd64 ~s390 ~hppa ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64 ~s390 ~hppa ~ppc64"
 
 DEPEND=">=sys-libs/ncurses-5.1
 	>=sys-apps/sed-4
@@ -28,12 +28,13 @@ DEPEND=">=sys-libs/ncurses-5.1
 # We do NOT support major version upgrades yet
 # required process is:
 # 1. stop slapd/slurpd
-# 2. slapcat -l file
+# 2. slapcat -l file ## THIS WILL NOT WORK AFTER THE EMERGE, YOU MUST DO IT WITH THE OLD VERSION
 # 3. egrep -v '^entryCSN:' file >file.new ## are any other changes required?
-# 4. unmerge openldap-2.1
-# 5. emerge openldap-2.2
-# 6. etc-update # !!!IMPORTANT!!! new config file stuff that we need to write for users (I haven't done it yet)
+# 4. emerge unmerge '<=net-nds/openldap-2.1*'
+# 5. emerge '>=net-nds/openldap-2.2'
+# 6. etc-update ## !!!IMPORTANT!!! new config file stuff that we need to write for users (I haven't done it yet)
 # 7. slapadd -l file.new
+# 8. chown ldap:ldap /var/lib/openldap-data/*
 # 8. start slapd again, set up new replication system maybe
 DEPEND="${DEPEND} !<net-nds/openldap-2.2"
 
@@ -155,6 +156,7 @@ src_compile() {
 }
 
 src_test() {
+	einfo "Doing tests"
 	cd tests ; make tests || die "make tests failed"
 }
 
@@ -182,7 +184,7 @@ src_install() {
 	fowners ldap:ldap /var/run/openldap
 	fperms 0755 /var/run/openldap
 	for f in /etc/openldap/slapd.conf /etc/openldap/slapd.conf.default; do
-		sed -e "s:/var/lib/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
+		sed -e "s:/var/lib/run/slapd.:/var/run/openldap/slapd.:" -i ${D}/${f}
 		sed -e "/database\tbdb$/acheckpoint	32	30 # <kbyte> <min>" -i ${D}/${f}
 		fowners root:ldap ${f}
 		fperms 0640 ${f}