Add openldap to RDEPEND again, bug #222617.

(Portage version: 2.1.5_rc6)

3 files changed, 8 insertions, 87 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 212bb99ba7a6..75b032599b0d 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.189 2008/03/31 05:02:28 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.190 2008/05/18 12:37:45 eva Exp $
+
+  18 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gconf-2.18.0.1.ebuild, gconf-2.22.0.ebuild:
+  Add openldap to RDEPEND again, bug #222617.
 
   31 Mar 2008; <ricmm@gentoo.org> gconf-2.18.0.1.ebuild:
   Drop to ~mips due to unstable deps
diff --git a/gnome-base/gconf/gconf-2.18.0.1.ebuild b/gnome-base/gconf/gconf-2.18.0.1.ebuild
deleted file mode 100644
index 68c79ad6c477..000000000000
--- a/gnome-base/gconf/gconf-2.18.0.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.18.0.1.ebuild,v 1.11 2008/03/31 05:02:28 ricmm Exp $
-
-inherit gnome2
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Gnome Configuration System and Daemon"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.10
-	>=x11-libs/gtk+-2.8.16
-	>=gnome-base/orbit-2.4
-	>=dev-libs/libxml2-2
-	dev-libs/popt"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-# FIXME : consider merging the tree (?)
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-gtk"
-	kill_gconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	# hack hack
-	dodir /etc/gconf/gconf.xml.mandatory
-	dodir /etc/gconf/gconf.xml.defaults
-	touch "${D}"/etc/gconf/gconf.xml.mandatory/.keep${SLOT}
-	touch "${D}"/etc/gconf/gconf.xml.defaults/.keep${SLOT}
-
-	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
-	doenvd 50gconf || die
-	dodir /root/.gconfd
-}
-
-kill_gconf() {
-	# this function will kill all running gconfd that could be causing troubles
-	if [ -x /usr/bin/gconftool ]
-	then
-		/usr/bin/gconftool --shutdown
-	fi
-	if [ -x /usr/bin/gconftool-1 ]
-	then
-		/usr/bin/gconftool-1 --shutdown
-	fi
-
-	# and for gconf 2
-	if [ -x /usr/bin/gconftool-2 ]
-	then
-		/usr/bin/gconftool-2 --shutdown
-	fi
-	return 0
-}
-
-pkg_preinst() {
-	kill_gconf
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	#change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-	einfo "changing permissions for gconf files"
-	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
diff --git a/gnome-base/gconf/gconf-2.22.0.ebuild b/gnome-base/gconf/gconf-2.22.0.ebuild
index e64d0cc19489..5d5cc01ff006 100644
--- a/gnome-base/gconf/gconf-2.22.0.ebuild
+++ b/gnome-base/gconf/gconf-2.22.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.22.0.ebuild,v 1.1 2008/03/22 17:52:45 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.22.0.ebuild,v 1.2 2008/05/18 12:37:45 eva Exp $
 
 inherit eutils gnome2
 
@@ -20,7 +20,8 @@ IUSE="debug doc ldap"
 RDEPEND=">=dev-libs/glib-2.10
 		 >=x11-libs/gtk+-2.8.16
 		 >=gnome-base/orbit-2.4
-		 >=dev-libs/libxml2-2"
+		 >=dev-libs/libxml2-2
+		 ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.35
 		>=dev-util/pkgconfig-0.9