Add openldap to RDEPEND again, bug #222617.

Package-Manager: portage-2.1.5_rc6

4 files changed, 14 insertions, 95 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/Manifest b/gnome-base/gconf/Manifest
index 74826847720c..5a978b4ad59e 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX gconf-2.20.1-automagic-ldap.patch 2360 RMD160 e25144064b0fa723966314906a011be951f1a704 SHA1 e825aa8a109a7b4903912914c88d73301a14399a SHA256 65d7cf8a4453b95f947fb8c3db2a5392b421e0a052566ba13c8345b4ecd2e536
 AUX gconf-2.20.1-drop-gtk-doc.patch 846 RMD160 839eb47227eeb607dc39279c8fff6beb237f8a40 SHA1 61138fdd3d477ddf110d8d4530ed38194badbece SHA256 a740e74dcb13d08dbce3a8816323d371c63a448143ff32ca5002d3bdeb9e24b1
 AUX gconf-2.22.0-automagic-ldap.patch 12512 RMD160 877eac8dd4ce6ab4ccfcaf02e86db6f02fe6261a SHA1 d2865965e13622bb5139ada69de8707486a8a744 SHA256 3e2e4edebf35e1dc74a6ef63b236f5bd17479592f17412293a9f70dc562f555d
-DIST GConf-2.18.0.1.tar.bz2 1347765 RMD160 79bad5a19404277abfbd7f17b61e09274dcc1aa3 SHA1 6bbceafc636457ec14ec2d7b4358235ff6cf08d3 SHA256 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1
 DIST GConf-2.20.1.tar.bz2 1404919 RMD160 743bee341731402e5d4938ee030adf4f463d9a52 SHA1 c628e2645a91b15749f1ebacc62ea685cbfa681c SHA256 0fb446b87e71fe1089f43e671b5b7689ec91d781b5b2e8f0fc72d4a83a014838
 DIST GConf-2.22.0.tar.bz2 1416685 RMD160 71f0c6f20882681efdffc957f6d86affd4a29a80 SHA1 2a9ca649ef58394e425a030dc99b863b499a8a56 SHA256 54e40cf047eb431cdf994f763ae840107ed6e9b8f9521b2b2eb07c7a55f92ce0
-EBUILD gconf-2.18.0.1.ebuild 1928 RMD160 78d9764d4847fd1252d9b2874bce8c55fc1acb6e SHA1 3d0df3cccf49ccb475d2d4ee74feabd6a3a87943 SHA256 f51e5f86e97aa12d90167dea573494d3661434266742f3655c4936d2eb9a6383
 EBUILD gconf-2.20.1-r1.ebuild 2226 RMD160 9589270ea56d087977acb66ef67d8344616ec21a SHA1 c065027e287bb24084b2fcb26770a0f8489988c1 SHA256 0648111360a1770ad9a007799097c82cc5d45bc7b114f366989e01a14ea9981f
-EBUILD gconf-2.22.0.ebuild 1980 RMD160 c5ebca92fd4c218b0f753f59e42eba5140683602 SHA1 fd4213d925349df2b48f51a1264d478a776b9b2d SHA256 dc78c03ac76035b76adfa09f75e2e70dda7b785bfff1023428efcbca280c4106
-MISC ChangeLog 24695 RMD160 ff3e8a906d1f5a0d5ecaefddea3f1692e1eef6f3 SHA1 dc3b446f7653519b845f66cc71fd1416f0384eea SHA256 90d9ac5835b545cd6173150d69ee56f5adf0d1abbea1ae9f1e7776a1881b9c5d
+EBUILD gconf-2.22.0.ebuild 2009 RMD160 7ab1e6838ee0087631cfc205cfcc6f7a76fbc845 SHA1 ecd016d503eb436feaa53e4f4f386b51aa7b8f05 SHA256 cb9759ec3cdae524c31ab704d8ffb8cfbacdca939d16348d4d28cc158d5aee59
+MISC ChangeLog 24841 RMD160 023b749ab105c9b100ae023ca6d6ad079c1708a3 SHA1 991fb6537ecd206de345fc6b6f645da0ff24660a SHA256 02860c2ee473f346097782c73e4f08141174ba7c6cf3c23c5ef5086a8d835702
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFICp4oj9hvisErhMIRAhJTAJoCg8GIATnfh/gF5sA5o6HVPsX9vQCfS2Zl
-89xn07ZuH4lj8k3FftYpLSQ=
-=oCBz
+iEYEARECAAYFAkgwIyMACgkQ1fmVwcYIWAYZ5ACfQUjfUAYbw14EIY9wKxUuarDj
+IWIAn2QAOmeahRiboUbtdBoKHGxYLWXt
+=KeIk
 -----END PGP SIGNATURE-----
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