version bump, remove 1.2.5, add blocker against >=sys-libs/db-5.0

Package-Manager: portage-2.1.9.28/cvs/Linux x86_64

3 files changed, 24 insertions, 13 deletions

diff --git a/net-nds/389-ds-base/389-ds-base-1.2.5-r1.ebuild b/net-nds/389-ds-base/389-ds-base-1.2.7.5.ebuild
index 814a10c30b92..35a130dda9be 100644
--- a/net-nds/389-ds-base/389-ds-base-1.2.5-r1.ebuild
+++ b/net-nds/389-ds-base/389-ds-base-1.2.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.5-r1.ebuild,v 1.3 2010/10/15 17:08:26 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/389-ds-base-1.2.7.5.ebuild,v 1.1 2011/01/11 22:07:53 lxnay Exp $
 
 EAPI=2
 
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="autobind auto-dn-suffix debug doc +pam-passthru +dna +ldapi +bitwise +presence kerberos selinux"
 
-ALL_DEPEND="dev-libs/nss[utils]
+ALL_DEPEND="!>=sys-libs/db-5.0
+	dev-libs/nss[utils]
 	dev-libs/nspr
 	dev-libs/svrcore
 	dev-libs/mozldap
@@ -67,9 +68,6 @@ src_prepare() {
 	sed -i '/^nsslapd-allow-unauthenticated-binds/ s/off/on/' "${S}"/ldap/ldif/template-dse.ldif.in || \
 		die "cannot tweak default setting: nsslapd-allow-unauthenticated-binds"
 
-	# Fix buggy .ldiff, see RedHat #617629
-	epatch "${FILESDIR}/0001-Bug-617629-Missing-aliases-in-new-schema-files.patch"
-
 }
 
 src_configure() {
@@ -143,10 +141,11 @@ src_install () {
 	echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${D}"/etc/env.d/08dirsrv
 
 	# create the directory where our log file and database
-	diropts -m 0750 -o dirsrv -g dirsrv
+	diropts -m 0755
+	dodir /var/lib/dirsrv
 	keepdir /var/lib/dirsrv
 	dodir /var/lock/dirsrv
-
+	keepdir /var/lock/dirsrv
 	# snmp agent, required directory
 	keepdir /var/agentx
 	dodir /var/agentx
@@ -190,4 +189,10 @@ pkg_postinst() {
 	elog
 	elog "    rc-update add 389-ds default"
 	elog
+
+	elog "If you are upgrading from previous 1.2.6 release candidates"
+	elog "please see:"
+	elog "http://directory.fedoraproject.org/wiki/Subtree_Rename#warning:_upgrade_from_389_v1.2.6_.28a.3F.2C_rc1_.7E_rc6.29_to_v1.2.6_rc6_or_newer"
+	elog
+
 }
diff --git a/net-nds/389-ds-base/ChangeLog b/net-nds/389-ds-base/ChangeLog
index 88ea413533ef..1265b1d5fa7c 100644
--- a/net-nds/389-ds-base/ChangeLog
+++ b/net-nds/389-ds-base/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nds/389-ds-base
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.12 2010/11/12 12:26:37 lxnay Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/389-ds-base/ChangeLog,v 1.13 2011/01/11 22:07:53 lxnay Exp $
+
+*389-ds-base-1.2.7.5 (11 Jan 2011)
+
+  11 Jan 2011; Fabio Erculiani <lxnay@gentoo.org>
+  -389-ds-base-1.2.5-r1.ebuild, +389-ds-base-1.2.7.5.ebuild:
+  version bump, remove 1.2.5, add blocker against >=sys-libs/db-5.0
 
 *389-ds-base-1.2.6-r2 (12 Nov 2010)
 
diff --git a/net-nds/389-ds-base/Manifest b/net-nds/389-ds-base/Manifest
index e40f3b13d1ff..1ee8d0f96c6c 100644
--- a/net-nds/389-ds-base/Manifest
+++ b/net-nds/389-ds-base/Manifest
@@ -4,9 +4,9 @@ AUX 389-ds-snmp.initd 1076 RMD160 7a3be7745e7e7a6de675b40b56556bfacef76a9a SHA1
 AUX 389-ds.initd 1995 RMD160 1c6140438e874b5e75bc13533fb493780675a2ff SHA1 a3c567584ce949317a741f2a8410f758d507f9b5 SHA256 722f0c18f21ccb60054433e62748008ffd908d026220be4f705dcf46e9322a92
 AUX restart-dirsrv 581 RMD160 8812d099f1da6bcbefc0d09fe719f340f3c6d534 SHA1 0db36dd8f0379f1cd4bcc10da4f6cfe6dc37eacd SHA256 fd0dfbce5d74b065fc1bef6e11527d56c7fc4f16ae55383841c05d35d03173b2
 AUX start-dirsrv 303 RMD160 92d3d03931614f9a85345feec5a070c7a664996f SHA1 b2b92fc7d6aaec16d9ed31ff4fb5a596f9ce32f7 SHA256 d29272f92d2c4420da8aad7919861ab667c8f224bde560491f1626957418d361
-DIST 389-ds-base-1.2.5.tar.bz2 2791116 RMD160 7bc4af77a66f19f1ee5ea2dfe6678e0d4b09993f SHA1 40340cdf1d1816c5a6b97acfb770c1f5ad6f7f4a SHA256 564fa7fb368d6b0dacd9b237aa515a48f57ae7395f191ba17867a5506cdc0a43
 DIST 389-ds-base-1.2.6.tar.bz2 2869328 RMD160 2cf578ce766a254a103a9b5d91239c6985c8c8d2 SHA1 82aad9a2ac069c3f922fd4e62afa35c9ae051884 SHA256 5bb4ba3bba89623910dc9ce948b7699c5ca4f3201c2773aa3e85b60fd0f03f63
-EBUILD 389-ds-base-1.2.5-r1.ebuild 5320 RMD160 d45d0dd16fba62ce5a10b7d62f6ad5ac8b253bd5 SHA1 0dba3b6c96657a840c53c129b8c42ff7504470d3 SHA256 61a20f1ef634277826c99d6f835c825b5891cfc660d3af704818e423ae8c3cee
+DIST 389-ds-base-1.2.7.5.tar.bz2 2855009 RMD160 8fc68734b02120957c33448f3920360ecdaeb3fc SHA1 5277c8b26ab45c4399a836de4c4c0294b6b4de2b SHA256 0dd0f0e0905673b8bcb46b23d7123f971ab5afe2567043338baec0e7e4ee31a6
 EBUILD 389-ds-base-1.2.6-r2.ebuild 5468 RMD160 b26d859c9519b60e7c29f6b35a991777b65f4128 SHA1 691bb742e452608cafb442e06b5ab5553d4f167d SHA256 dfccb3a764d5e1ed44e5bf9396f7caded9c3089d5df7eff27b3d31153b8ab6a7
-MISC ChangeLog 2759 RMD160 3d7dd129a90dc8e65bd7dae9ca1979641e92f494 SHA1 54b9047664f7ecaaa19a6e4de694eb61e5765462 SHA256 81c122dceef10912cf4d57c0378e088f48eb7acea266c60e0b73e14763ed4d9c
+EBUILD 389-ds-base-1.2.7.5.ebuild 5487 RMD160 4d5f8f5de0e1e83cf6e78431eb52042ea4282dbf SHA1 2d6c40ab52a6785b37899d9e14c24e6941bce29c SHA256 3b3bf68e66e2b0041f0fdf548fe7cab5a87a9104a4e156dc45ab069c4ceb9b4e
+MISC ChangeLog 2975 RMD160 c53efcc015568c753673a85494bd13c56fda23eb SHA1 655ef2208437cbff32f3dba91e3c787c2d4389cb SHA256 e163ecc5fc954030cd66f08425311fe4789a1600591c75e7e91ae5abf3f9adaa
 MISC metadata.xml 1070 RMD160 f31a4089eb70f9228378f1fb6dd69ae2942bc9a3 SHA1 5b58beab1b9e2a63c7378bdf9836683a888600de SHA256 b7bd4cba6afb6af7418c4c6467ef998cdcd381765de671462f15872d29fa4066