* add opendldap dependency, fix bug #193442 (again)

(Portage version: 2.1.4.4)

3 files changed, 8 insertions, 88 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 08b62c285db9..fe7e8435cb17 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.186 2008/02/04 04:38:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.187 2008/03/03 22:01:33 eva Exp $
+
+  03 Mar 2008; Gilles Dartiguelongue <eva@gentoo.org> -gconf-2.20.1.ebuild,
+  gconf-2.20.1-r1.ebuild:
+  add openldap dependency, fix bug #193442 (again)
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gconf-2.20.1-r1.ebuild:
   Stable for HPPA (bug #208366).
diff --git a/gnome-base/gconf/gconf-2.20.1-r1.ebuild b/gnome-base/gconf/gconf-2.20.1-r1.ebuild
index 233af06f359f..aed8bef802ae 100644
--- a/gnome-base/gconf/gconf-2.20.1-r1.ebuild
+++ b/gnome-base/gconf/gconf-2.20.1-r1.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.20.1-r1.ebuild,v 1.9 2008/02/04 04:38:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.20.1-r1.ebuild,v 1.10 2008/03/03 22:01:33 eva Exp $
 
 inherit gnome2 autotools
 
@@ -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
diff --git a/gnome-base/gconf/gconf-2.20.1.ebuild b/gnome-base/gconf/gconf-2.20.1.ebuild
deleted file mode 100644
index 896c53d8846d..000000000000
--- a/gnome-base/gconf/gconf-2.20.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.20.1.ebuild,v 1.7 2007/11/29 05:10:29 jer Exp $
-
-inherit gnome2
-
-MY_PN=GConf
-MY_P=${MY_PN}-${PV}
-PVP=(${PV//[-\._]/ })
-
-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="debug doc"
-
-RDEPEND=">=dev-libs/glib-2.10
-		 >=x11-libs/gtk+-2.8.16
-		 >=gnome-base/orbit-2.4
-		 >=dev-libs/libxml2-2"
-DEPEND="${RDEPEND}
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.9
-		doc? ( >=dev-util/gtk-doc-1 )"
-
-# FIXME : consider merging the tree (?)
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --enable-gtk $(use_enable debug)"
-	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
-}
-
-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 "{}" \;
-}
-
-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
-}