bumping to 2.18.0.1 for gnome 2.18.0

Package-Manager: portage-2.1.2.3

4 files changed, 105 insertions, 15 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index a73a5f9ca007..40359de21764 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.160 2007/03/23 21:34:07 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.161 2007/03/30 21:24:45 remi Exp $
+
+*gconf-2.18.0.1 (30 Mar 2007)
+
+  30 Mar 2007; Remi Cardona <remi@gentoo.org> +gconf-2.18.0.1.ebuild:
+  bumping to 2.18.0.1 for gnome 2.18.0
 
   23 Mar 2007; Daniel Gryniewicz <dang@gentoo.org> +gconf-2.16.0.ebuild:
   add gnome 2.18.0
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 14b1ea050bee..bceb1312523b 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST GConf-2.14.0.tar.bz2 1895477 RMD160 4e281fc8046238df2056cbb1c1b068dc9663041b SHA1 97784779cbecb1f52e1728647889dd4b48f04f62 SHA256 040c512ebc39285bce78c177e9e434e7b6731fd53a001768ee3405a919837525
 DIST GConf-2.16.0.tar.bz2 1307732 RMD160 b3c429a45ac96cf79b7231666ecb8e1de645a4f8 SHA1 4fbd2aa7e0d6deb1673c3c6db64892491edcdb6a SHA256 d687ea919e20e08c42eeedf32e40f0845cd6799dbfa2edec9dbc644d386805c2
+DIST GConf-2.18.0.1.tar.bz2 1347765 RMD160 79bad5a19404277abfbd7f17b61e09274dcc1aa3 SHA1 6bbceafc636457ec14ec2d7b4358235ff6cf08d3 SHA256 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1
 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
@@ -11,10 +9,14 @@ EBUILD gconf-2.16.0.ebuild 1935 RMD160 74a9fdd831344cb3520bd6e2097631718b070bb8
 MD5 961e54fc83cfd4121cef82a169585612 gconf-2.16.0.ebuild 1935
 RMD160 74a9fdd831344cb3520bd6e2097631718b070bb8 gconf-2.16.0.ebuild 1935
 SHA256 ddc8a199e364fc6f82a28e0ba3740091b36f2d94e9acac05b8ff9e7dece13452 gconf-2.16.0.ebuild 1935
-MISC ChangeLog 21139 RMD160 cb009dd256135bdd1e03608d5e714e455bb70180 SHA1 7e9b27cdc4ba47d169ba952b64d765c865986223 SHA256 2d7069f4eb729ddb02461458d1d9e040c886ae3136dd8d0d07d8f49717c6ad24
-MD5 2c38cd4b6170a4d0e2a5cc6dcdac3f91 ChangeLog 21139
-RMD160 cb009dd256135bdd1e03608d5e714e455bb70180 ChangeLog 21139
-SHA256 2d7069f4eb729ddb02461458d1d9e040c886ae3136dd8d0d07d8f49717c6ad24 ChangeLog 21139
+EBUILD gconf-2.18.0.1.ebuild 1936 RMD160 2003b619906d4687bc9bc690fa262769fdd8b2c5 SHA1 ff2eb356ce53e8c2be515657e437e70185d8b992 SHA256 31b0f8603383ea9ceb79399382c04b4da360ec85f9c7cdd48d8bdfb96be817a6
+MD5 1d075dd514e627d78dbf24e52226c27a gconf-2.18.0.1.ebuild 1936
+RMD160 2003b619906d4687bc9bc690fa262769fdd8b2c5 gconf-2.18.0.1.ebuild 1936
+SHA256 31b0f8603383ea9ceb79399382c04b4da360ec85f9c7cdd48d8bdfb96be817a6 gconf-2.18.0.1.ebuild 1936
+MISC ChangeLog 21280 RMD160 fbccd5bb590f9118a4eddaed1aa39566bcc67ff9 SHA1 ff1e6bc3a37fcaec3ada0401069f1589f6c389fb SHA256 ce68cc9e4ad4e843d77f423abbc529281ede18a61eb0bb65e693c47c1512c641
+MD5 72a970204184fbeba012a472dd39f67c ChangeLog 21280
+RMD160 fbccd5bb590f9118a4eddaed1aa39566bcc67ff9 ChangeLog 21280
+SHA256 ce68cc9e4ad4e843d77f423abbc529281ede18a61eb0bb65e693c47c1512c641 ChangeLog 21280
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -25,10 +27,6 @@ SHA256 732b6991d53f6e4f74136993463746c114f2881e198c38ee914f259dbba0ae52 files/di
 MD5 3115f41764e825dcdc3a5b076c096ac1 files/digest-gconf-2.16.0 244
 RMD160 4547464fceceb7c38d9278bc3eaa9ef2c8251495 files/digest-gconf-2.16.0 244
 SHA256 a10c8870288e0817b4cec9bca5a5f7a624d8ecaea709040131ce4b5a2cc6567c files/digest-gconf-2.16.0 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGBEeeomPajV0RnrERAgDIAJ9Ypzmbm2XBRqdoZsHnHOXKbrlbwgCeMhmh
-tFYcY+oM1aVMaRAHOayT20k=
-=Jk+j
------END PGP SIGNATURE-----
+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
diff --git a/gnome-base/gconf/files/digest-gconf-2.18.0.1 b/gnome-base/gconf/files/digest-gconf-2.18.0.1
new file mode 100644
index 000000000000..b2e1e94e9e5c
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.18.0.1
@@ -0,0 +1,3 @@
+MD5 aa0e0a0729fb021bab72b4166fd392f9 GConf-2.18.0.1.tar.bz2 1347765
+RMD160 79bad5a19404277abfbd7f17b61e09274dcc1aa3 GConf-2.18.0.1.tar.bz2 1347765
+SHA256 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1 GConf-2.18.0.1.tar.bz2 1347765
diff --git a/gnome-base/gconf/gconf-2.18.0.1.ebuild b/gnome-base/gconf/gconf-2.18.0.1.ebuild
new file mode 100644
index 000000000000..c1e1bdf95dc3
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.18.0.1.ebuild
@@ -0,0 +1,84 @@
+# 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.18.0.1.ebuild,v 1.1 2007/03/30 21:24:45 remi 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 "{}" \;
+}