fix bug #207114 and clean up revision

Package-Manager: portage-2.1.4

6 files changed, 58 insertions, 110 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 5338b15d0f0d..cd029f994c89 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.180 2008/01/02 07:06:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.181 2008/01/26 13:27:25 eva Exp $
+
+  26 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gconf-2.20.1-drop-gtk-doc.patch, -gconf-2.14.0.ebuild,
+  gconf-2.20.1-r1.ebuild:
+  fix bug #207114 and clean up old revision
 
   02 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
   gconf-2.20.1-r1.ebuild:
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 354ceb758347..c60cc1abddb2 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -5,36 +5,32 @@ AUX gconf-2.20.1-automagic-ldap.patch 2360 RMD160 e25144064b0fa723966314906a011b
 MD5 7827c5728e674ea0b148e811018ad641 files/gconf-2.20.1-automagic-ldap.patch 2360
 RMD160 e25144064b0fa723966314906a011be951f1a704 files/gconf-2.20.1-automagic-ldap.patch 2360
 SHA256 65d7cf8a4453b95f947fb8c3db2a5392b421e0a052566ba13c8345b4ecd2e536 files/gconf-2.20.1-automagic-ldap.patch 2360
-DIST GConf-2.14.0.tar.bz2 1895477 RMD160 4e281fc8046238df2056cbb1c1b068dc9663041b SHA1 97784779cbecb1f52e1728647889dd4b48f04f62 SHA256 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525
+AUX gconf-2.20.1-drop-gtk-doc.patch 846 RMD160 839eb47227eeb607dc39279c8fff6beb237f8a40 SHA1 61138fdd3d477ddf110d8d4530ed38194badbece SHA256 a740e74dcb13d08dbce3a8816323d371c63a448143ff32ca5002d3bdeb9e24b1
+MD5 4c68ec09a1992c63e52c149b296a559c files/gconf-2.20.1-drop-gtk-doc.patch 846
+RMD160 839eb47227eeb607dc39279c8fff6beb237f8a40 files/gconf-2.20.1-drop-gtk-doc.patch 846
+SHA256 a740e74dcb13d08dbce3a8816323d371c63a448143ff32ca5002d3bdeb9e24b1 files/gconf-2.20.1-drop-gtk-doc.patch 846
 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.14.0.ebuild 1925 RMD160 485f094f001fa7f6ee72ee57f58b26fff0bca467 SHA1 af7bcaa246c6c29258880cbb9691a6f36f577c85 SHA256 8cea00cd5efdc3f3571ab7eace1771e0c0c7b6926a6bf7dea4ee7dd84e762a58
-MD5 05382a74836328bfd9114e89be728755 gconf-2.14.0.ebuild 1925
-RMD160 485f094f001fa7f6ee72ee57f58b26fff0bca467 gconf-2.14.0.ebuild 1925
-SHA256 8cea00cd5efdc3f3571ab7eace1771e0c0c7b6926a6bf7dea4ee7dd84e762a58 gconf-2.14.0.ebuild 1925
 EBUILD gconf-2.18.0.1.ebuild 1927 RMD160 0ca869a5d2b79c04425f00f9d54521afc8804203 SHA1 007b712b02ac6990b95e8c7bd08e412d00a65464 SHA256 41e2ce283a7e27d819f39c24d1f8d9785cefb65f3f7b148c5d877709d1f353d4
 MD5 f595a54cfdab679683357b11248deccf gconf-2.18.0.1.ebuild 1927
 RMD160 0ca869a5d2b79c04425f00f9d54521afc8804203 gconf-2.18.0.1.ebuild 1927
 SHA256 41e2ce283a7e27d819f39c24d1f8d9785cefb65f3f7b148c5d877709d1f353d4 gconf-2.18.0.1.ebuild 1927
-EBUILD gconf-2.20.1-r1.ebuild 2180 RMD160 f3d99af5da0cb503d1c27e6f13f729fd026b86b7 SHA1 42d0d978e4cfcf3d7d90b4a92f636d1fd5800b6a SHA256 73504702fca626d82f646cf4e4d9798ae703fb1bebe3db4796ca8efdde7786a8
-MD5 246396b5bb4286bf57791d634f076dd0 gconf-2.20.1-r1.ebuild 2180
-RMD160 f3d99af5da0cb503d1c27e6f13f729fd026b86b7 gconf-2.20.1-r1.ebuild 2180
-SHA256 73504702fca626d82f646cf4e4d9798ae703fb1bebe3db4796ca8efdde7786a8 gconf-2.20.1-r1.ebuild 2180
+EBUILD gconf-2.20.1-r1.ebuild 2202 RMD160 5610df035f98fa3ae73e42585820c33e0118403a SHA1 8dac068e67c25d5354d25179e86d59a37ab63674 SHA256 a690e0fcd1663ed48424043fdfdfb7fe1dbac6aa18395539843962c81447851e
+MD5 b476f2f442b3085c99d6ef6e3bbca5a0 gconf-2.20.1-r1.ebuild 2202
+RMD160 5610df035f98fa3ae73e42585820c33e0118403a gconf-2.20.1-r1.ebuild 2202
+SHA256 a690e0fcd1663ed48424043fdfdfb7fe1dbac6aa18395539843962c81447851e gconf-2.20.1-r1.ebuild 2202
 EBUILD gconf-2.20.1.ebuild 1974 RMD160 22a9193e3dc176fde744cf7be37a9fbfacb453ee SHA1 de5ceaceaf96456282f5eb87213b167cc3253b51 SHA256 9f2249f672f26773c62f95b525a09b3af8d4300dee37081ffebd0e7d92ea3ae6
 MD5 61bb6df3fe0e5a55e5ae7088247141cc gconf-2.20.1.ebuild 1974
 RMD160 22a9193e3dc176fde744cf7be37a9fbfacb453ee gconf-2.20.1.ebuild 1974
 SHA256 9f2249f672f26773c62f95b525a09b3af8d4300dee37081ffebd0e7d92ea3ae6 gconf-2.20.1.ebuild 1974
-MISC ChangeLog 23459 RMD160 388d72115c765de5ce170674d721575fc1f612ae SHA1 86ffec630c146d3e64aaa09ba5541c361470d637 SHA256 2ec70168e025fc265efffd6b5aadf2002c9de178c2c4a198156a0cdf264f4baa
-MD5 35804645bdd8062715aba561e25d6c0a ChangeLog 23459
-RMD160 388d72115c765de5ce170674d721575fc1f612ae ChangeLog 23459
-SHA256 2ec70168e025fc265efffd6b5aadf2002c9de178c2c4a198156a0cdf264f4baa ChangeLog 23459
+MISC ChangeLog 23648 RMD160 cf21a4028c34f20ef3f9aa89fcd1eff2c9f2609e SHA1 72fdddd6d595bc6d3adc57ff1b7fc39504be151d SHA256 123affc01980085cd273b7c6c32d91974ad07514b9abcf79e549ac5f0ef878d6
+MD5 3ca980a2bf3cac14f312bc15baea5f7d ChangeLog 23648
+RMD160 cf21a4028c34f20ef3f9aa89fcd1eff2c9f2609e ChangeLog 23648
+SHA256 123affc01980085cd273b7c6c32d91974ad07514b9abcf79e549ac5f0ef878d6 ChangeLog 23648
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 5dc9e65c9149f6afd374d60c243b8577 files/digest-gconf-2.14.0 244
-RMD160 dc7bbd4d128938abcc1caae0f4e66d1f140604bf files/digest-gconf-2.14.0 244
-SHA256 732b6991d53f6e4f74136993463746c114f2881e198c38ee914f259dbba0ae52 files/digest-gconf-2.14.0 244
 MD5 4e987338c47682ca5e5b3142a29e7a5e files/digest-gconf-2.18.0.1 250
 RMD160 d8f8bf897934b3d89c75d87f69f99602776cfc53 files/digest-gconf-2.18.0.1 250
 SHA256 34a84f2a7e37d0b8d0399ca5922e79d75d1ac69143983e91e5cc9e1b2108ee34 files/digest-gconf-2.18.0.1 250
@@ -45,9 +41,9 @@ MD5 02066683a19787df7c66726b61e25912 files/digest-gconf-2.20.1-r1 244
 RMD160 4c4736f447a805acdbe8413928105d0ce4692373 files/digest-gconf-2.20.1-r1 244
 SHA256 115c0245feda9039e0f55bdab2588f0b48dde6c105e833cc7fd7f82cd9c06d13 files/digest-gconf-2.20.1-r1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkd7N7cACgkQ1fmVwcYIWAa2nwCgsw8SUaubTMmwLn4O43oICcT+
-bBUAoOPcekIYcXs9iQJHO2MTiABdTojI
-=yinX
+iD8DBQFHmzV91fmVwcYIWAYRAoTlAJ40EEr693d5apMDkHHSbjpA3jbXUQCgvxpV
+LyWvU7Ij5IvvRUQxhlFx5iE=
+=y5ux
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/files/digest-gconf-2.14.0 b/gnome-base/gconf/files/digest-gconf-2.14.0
deleted file mode 100644
index 0be96ef76ea3..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.14.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d07c2efcaf477cf34225c604a04b6271 GConf-2.14.0.tar.bz2 1895477
-RMD160 4e281fc8046238df2056cbb1c1b068dc9663041b GConf-2.14.0.tar.bz2 1895477
-SHA256 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525 GConf-2.14.0.tar.bz2 1895477
diff --git a/gnome-base/gconf/files/gconf-2.20.1-drop-gtk-doc.patch b/gnome-base/gconf/files/gconf-2.20.1-drop-gtk-doc.patch
new file mode 100644
index 000000000000..62c2ef855169
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-2.20.1-drop-gtk-doc.patch
@@ -0,0 +1,33 @@
+--- configure.in.old	2008-01-26 11:43:17.423830001 +0100
++++ configure.in	2008-01-26 11:44:23.137155036 +0100
+@@ -129,7 +129,12 @@
+   fi
+ fi
+ 
+-GTK_DOC_CHECK([1.0])
++dnl Crazy hack for dropping the dep on gtk-doc
++AC_DEFUN(GTK_DOC_CHECK, [])
++
++dnl Crazy hack for dropping the dep on gtk-doc
++AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
++AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
+ 
+ AC_ARG_ENABLE(gtk,
+ 	      AC_HELP_STRING([--enable-gtk],
+Index: Makefile.am
+===================================================================
+--- Makefile.am	(révision 2495)
++++ Makefile.am	(copie de travail)
+@@ -1,7 +1,11 @@
+ 
+-SUBDIRS = gconf backends po doc examples
++SUBDIRS = gconf backends po examples
+ DIST_SUBDIRS=tests $(SUBDIRS)
+ 
++if ENABLE_GTK_DOC
++SUBDIRS += doc
++endif
++
+ EXTRA_DIST =                \
+ 	TODO                \
+ 	gtk-doc.make        \
diff --git a/gnome-base/gconf/gconf-2.14.0.ebuild b/gnome-base/gconf/gconf-2.14.0.ebuild
deleted file mode 100644
index 96a48d51974c..000000000000
--- a/gnome-base/gconf/gconf-2.14.0.ebuild
+++ /dev/null
@@ -1,83 +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.14.0.ebuild,v 1.16 2007/03/10 15:02:17 vapier 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.20.1-r1.ebuild b/gnome-base/gconf/gconf-2.20.1-r1.ebuild
index 5586659d0a13..8bc46b97f995 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.2 2008/01/02 07:06:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.20.1-r1.ebuild,v 1.3 2008/01/26 13:27:25 eva Exp $
 
 inherit gnome2 autotools
 
@@ -41,9 +41,9 @@ src_unpack() {
 
 	# fix bug #193442
 	epatch "${FILESDIR}/${P}-automagic-ldap.patch"
+	use doc || epatch "${FILESDIR}/${P}-drop-gtk-doc.patch"
 
-	cp aclocal.m4 old.m4
-	AT_M4DIR="." eautoreconf
+	eautoreconf
 }
 
 src_install() {