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

Package-Manager: portage-2.1.4.4

4 files changed, 20 insertions, 91 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/Manifest b/gnome-base/gconf/Manifest
index 66d06a7ebcc8..434afc8cb347 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 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
 EBUILD gconf-2.18.0.1.ebuild 1927 RMD160 0ca869a5d2b79c04425f00f9d54521afc8804203 SHA1 007b712b02ac6990b95e8c7bd08e412d00a65464 SHA256 41e2ce283a7e27d819f39c24d1f8d9785cefb65f3f7b148c5d877709d1f353d4
-EBUILD gconf-2.20.1-r1.ebuild 2194 RMD160 357baca84788fe2684afd2a5991cdc3b1f0f89c0 SHA1 bc060018f2f1fab0a42941f3c76e9d75ed55b971 SHA256 ac953c6162db22da61f14cd28ac13a37c503d89971c857aa1f8446c6e1aa0a7d
-EBUILD gconf-2.20.1.ebuild 1974 RMD160 22a9193e3dc176fde744cf7be37a9fbfacb453ee SHA1 de5ceaceaf96456282f5eb87213b167cc3253b51 SHA256 9f2249f672f26773c62f95b525a09b3af8d4300dee37081ffebd0e7d92ea3ae6
-MISC ChangeLog 24222 RMD160 a9f1774788a1e9bf99f255a77cba0643314547fd SHA1 79d93d1745b882985ad5cc2c546d8bfa7eadfdfe SHA256 b87a053b1ef78cde318b0961af4c21fc24a7e69900f20f620b352f04600fa71b
+EBUILD gconf-2.20.1-r1.ebuild 2225 RMD160 d332dd26613f1bd30930bbfcd4794f5695ad83ba SHA1 fc89bc0da6cae7d37712b273154edd129586a2f7 SHA256 ee7da96de85a6dbb21433a426beb088f2d0238372a8a68113565c68421ab0fd5
+MISC ChangeLog 24376 RMD160 421e5a40c3ba556eeabc1ca9870db718d84978e6 SHA1 ddf2e48c9339f0ae262d2f5c8b245c035d4e6570 SHA256 df01494dd03c47fd3814b95203187e63ef0330ea3fbd96f39e673849dd15b8c2
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzHVH1fmVwcYIWAYRAntcAKDhJOO2e1VPP636L0yb/rIX3A/orQCgs//9
+LMaUeqCNyvjkNS5WfOFPDu8=
+=I49P
+-----END PGP SIGNATURE-----
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
-}