Versionbump, removed unapplying patch

4 files changed, 116 insertions, 11 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 84db417d8051..4e652ca747e1 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.75 2004/07/05 17:53:47 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.76 2004/07/11 18:58:47 spider Exp $
+
+  11 Jul 2004; <spider@gentoo.org> :
+  versionbump, removed gcc 2.95.x patch as it doesn't apply anymore.
 
   05 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> gconf-2.6.0.ebuild:
   Stable on alpha.
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 344695f9cf0c..174d64f43aa3 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,17 +1,19 @@
-MD5 c3c143d266c026ee8bf16d86cd0394dc gconf-2.4.0.1.ebuild 1964
+MD5 92839162a88cf49fdf04133a6f9094c3 ChangeLog 10906
 MD5 b8257ec44062f1749ae3a7108a2665b7 gconf-1.0.8-r3.ebuild 1706
-MD5 205ea2d65aa35761d9f8f12e87100c78 gconf-2.6.1.ebuild 2126
-MD5 19b4e18cb12a6034622680b0e5a09750 gconf-1.0.9.ebuild 1885
 MD5 9e193ede22931c15cf5009584f5a3eaf gconf-1.0.8-r5.ebuild 1871
+MD5 19b4e18cb12a6034622680b0e5a09750 gconf-1.0.9.ebuild 1885
+MD5 c3c143d266c026ee8bf16d86cd0394dc gconf-2.4.0.1.ebuild 1964
 MD5 c3a073a17685f2a9e1fe1ff241c9b576 gconf-2.6.0.ebuild 1980
-MD5 92839162a88cf49fdf04133a6f9094c3 ChangeLog 10906
+MD5 205ea2d65aa35761d9f8f12e87100c78 gconf-2.6.1.ebuild 2126
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
-MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
-MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
-MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
-MD5 cb328a03018fd32a8066856c5db76e13 files/digest-gconf-2.6.0 65
-MD5 069b5d67ce4b6a0bb68130fc9b156597 files/digest-gconf-2.6.1 65
+MD5 4519e7461498e4383169f7d866098b13 gconf-2.6.2.ebuild 1999
 MD5 4452461d5fcfd96e2d95e62712554c71 files/GConf-2.6.1-gcc2_fix.patch 420
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
+MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
+MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
+MD5 cb328a03018fd32a8066856c5db76e13 files/digest-gconf-2.6.0 65
+MD5 069b5d67ce4b6a0bb68130fc9b156597 files/digest-gconf-2.6.1 65
+MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
+MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
+MD5 a54671d9ce7e9f5abdf7b7e9d8c1a45d files/digest-gconf-2.6.2 65
diff --git a/gnome-base/gconf/files/digest-gconf-2.6.2 b/gnome-base/gconf/files/digest-gconf-2.6.2
new file mode 100644
index 000000000000..6d877444d2e0
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.6.2
@@ -0,0 +1 @@
+MD5 4d55a5f49306fac3208606fcfd4f74af GConf-2.6.2.tar.bz2 1521902
diff --git a/gnome-base/gconf/gconf-2.6.2.ebuild b/gnome-base/gconf/gconf-2.6.2.ebuild
new file mode 100644
index 000000000000..6384bb436601
--- /dev/null
+++ b/gnome-base/gconf/gconf-2.6.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.2.ebuild,v 1.1 2004/07/11 18:58:47 spider Exp $
+
+inherit eutils gnome2
+
+MY_PN=GConf
+MY_P=${MY_PN}-${PV}
+PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+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"
+
+IUSE="doc"
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
+
+RDEPEND=">=dev-libs/glib-2.0.1
+	>=gnome-base/ORBit2-2.4
+	>=dev-libs/libxml2-2
+	dev-libs/popt
+	>=x11-libs/gtk+-2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( dev-util/gtk-doc )"
+
+# FIXME : consider merging the tree (?)
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+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}
+
+}
+
+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_setup () {
+
+	kill_gconf
+
+}
+
+pkg_preinst () {
+
+	kill_gconf
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > ${D}/etc/env.d/50gconf
+
+	dodir /root/.gconfd
+
+}
+
+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 "{}" \;
+
+}
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+USE_DESTDIR="1"