remove makeopts -j1 ( fixed upstream ), adding in ${G2CONF} when setting --enable...

Package-Manager: portage-2.1_pre6-r3

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index e1e1d55b768dedebb5f06a7535264f6b85a39464..a534c6840270ca2d3aefd8690aed434dca873bba 100644 (file)
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.141 2006/03/05 05:52:01 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.142 2006/03/16 13:53:23 allanonjl Exp $
+
+*gconf-2.13.5 (16 Mar 2006)
+
+  16 Mar 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +gconf-2.13.5.ebuild:
+  remove makeopts -j1 ( fixed upstream ), adding in ${G2CONF} when setting
+  --enable-gtk. patch from 2.12.1-r1 has been applied in this release.
 
   05 Mar 2006; Saleem Abdulrasool <compnerd@gentoo.org>
   gconf-2.12.1-r1.ebuild:

diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index b6b974693587e398124a2ab05ce233545ce39d28..c39bc76410bdff796ec416d30298ea6d1f9c3404 100644 (file)
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,6 +1,6 @@
-MD5 ea921ae16070c8a6f7088382be770a45 ChangeLog 18405
-RMD160 3727f2a24e4a703492354e4fd444f1479bc88ea8 ChangeLog 18405
-SHA256 111df86c3ae6b89405f126b8efe7715d43fce5ec7d3558c6b862dee66a216481 ChangeLog 18405
+MD5 2b6b813c4c019ca82b5e45deddbd9682 ChangeLog 18662
+RMD160 6b076f0477b50c761c82d7dd152df3ea1e38c096 ChangeLog 18662
+SHA256 247d18ec4a312f4183aa29eded223b474b123bccff93f80e3f4d54f9f5f0715d ChangeLog 18662
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
 RMD160 ebc699448e24dc5d252346644c502aba30a0271d files/digest-gconf-1.0.8-r3 64
 SHA256 d249e722900e836ce4b4c2d8d7e2e508a5e5694f7f377f1a84d5a7c339d60f5d files/digest-gconf-1.0.8-r3 64
@@ -19,6 +19,9 @@ SHA256 97c7aab32b1dc3c13bec384d1795f84e47fcff9c62589a21d73a6d848e7a0ce1 files/di
 MD5 c0206532a622fd40ced4bed0815de00e files/digest-gconf-2.12.1-r1 244
 RMD160 978091a0bb1ef985a6d5bfb16d57578f7562a38b files/digest-gconf-2.12.1-r1 244
 SHA256 37c882259f034501e14219e40aadf285f30511cefb90b772ea80031854892229 files/digest-gconf-2.12.1-r1 244
+MD5 c14c3321e1225e6d5b75429507d9149e files/digest-gconf-2.13.5 244
+RMD160 e9edf7b5a4e63a6dcf2c44b4372a469747ced525 files/digest-gconf-2.13.5 244
+SHA256 d3d02e758a7c3e4f84488e6585552d3f92f47b377d58e874c41879a9e763aa77 files/digest-gconf-2.13.5 244
 MD5 a00775eca77339f117c1edd3ae41ed32 files/gconf-1.0.9-gcc4.patch 581
 RMD160 ee224b9ece8c06d41437eff7c86b799823aefe95 files/gconf-1.0.9-gcc4.patch 581
 SHA256 4e0a6cbc44d96c8a1dbd870b936f2beebc385856f8afd91cfb8084cd70d1320f files/gconf-1.0.9-gcc4.patch 581
@@ -52,6 +55,9 @@ SHA256 1a9eb9db3be8cb67757db8195a047cc7f5ea6fc127f5598c1da402f3c96d899d gconf-2.
 MD5 9053b30e0012779041c2157506b5cbbd gconf-2.12.1.ebuild 1970
 RMD160 13fd02954581488ed7ffe94b4c94d72bd936120e gconf-2.12.1.ebuild 1970
 SHA256 e83cdfe75cc53f0b8862b1e689c85c9f46f675fa1e156413ce2e2b0b36fe84dd gconf-2.12.1.ebuild 1970
+MD5 a9817a29216b90a342cc323750e660d8 gconf-2.13.5.ebuild 1940
+RMD160 7b986a0a4080c6f02af8d10858e0647c0fe51b91 gconf-2.13.5.ebuild 1940
+SHA256 491be07702c3d318216fdc58b554309ca8db080db7ece48cba580f61a720ea3c gconf-2.13.5.ebuild 1940
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158

diff --git a/gnome-base/gconf/files/digest-gconf-2.13.5 b/gnome-base/gconf/files/digest-gconf-2.13.5
new file mode 100644 (file)
index 0000000..4637393
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.13.5
@@ -0,0 +1,3 @@
+MD5 097823748dac6afc7a138001df6d3c35 GConf-2.13.5.tar.bz2 1984182
+RMD160 cf8ce58e08a2147ce225583a45af5b68e3de25cc GConf-2.13.5.tar.bz2 1984182
+SHA256 6b96bbb27eabc0f338389611e631e58901929485091e9eb1ee8dd273637b65e8 GConf-2.13.5.tar.bz2 1984182

diff --git a/gnome-base/gconf/gconf-2.13.5.ebuild b/gnome-base/gconf/gconf-2.13.5.ebuild
new file mode 100644 (file)
index 0000000..ba9d6f4
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.13.5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.13.5.ebuild,v 1.1 2006/03/16 13:53:23 allanonjl 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 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.7
+       >=gnome-base/orbit-2.4
+       >=dev-libs/libxml2-2
+       dev-libs/popt
+       >=x11-libs/gtk+-2"
+
+DEPEND="${RDEPEND}
+       >=dev-util/pkgconfig-0.9
+       doc? ( >=dev-util/gtk-doc-1 )"
+
+# FIXME : consider merging the tree (?)
+DOCS="ABOUT-NLS 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}
+
+       dodir /etc/env.d
+       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
+
+       echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${IMAGE}/etc/env.d/50gconf
+}
+
+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 "{}" \;
+}