gnome 2.6 commit

7 files changed, 39 insertions, 122 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index e474901c3824..b305f998e82b 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.61 2004/03/15 01:33:45 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.62 2004/03/19 16:12:46 foser Exp $
 
+*gconf-2.5.90 (19 Mar 2004)
+
+  19 Mar 2004; foser <foser@gentoo.org> gconf-2.5.90.ebuild :
+  Gnome 2.6 commit
+  
   15 Mar 2004; <spider@gentoo.org> gconf-2.2.0.ebuild, gconf-2.2.1.ebuild:
   fixing bug #44712 , assignment to P and PN
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 28d81d842b53..2384282bbdbc 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,17 +1,19 @@
-MD5 d24e49795a7b26f224243e6833abba3f gconf-2.2.0.ebuild 1933
-MD5 2852414aaa362c408eb05d5b8fb63a11 ChangeLog 8910
+MD5 b0d2309dfbf9fa2e768bb3473ff5f9be gconf-2.4.0.1.ebuild 1938
 MD5 aec56460553eb2cfe7cdc1f61b9a9c94 gconf-1.0.8-r3.ebuild 1715
+MD5 e1733a22a5ebcc18a75403c2d72f788c gconf-2.2.1.ebuild 2022
+MD5 4cd81e0e163c70b1f59f4a2dbead5539 gconf-1.0.9.ebuild 1859
 MD5 191ce55854537de718e039dbc4950f35 gconf-1.0.8-r5.ebuild 1873
-MD5 b0d2309dfbf9fa2e768bb3473ff5f9be gconf-2.4.0.1.ebuild 1938
+MD5 50f464ee6a4f924229f89da7f97b2477 gconf-2.5.90.ebuild 1961
+MD5 d24e49795a7b26f224243e6833abba3f gconf-2.2.0.ebuild 1933
+MD5 2852414aaa362c408eb05d5b8fb63a11 ChangeLog 8910
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 4cd81e0e163c70b1f59f4a2dbead5539 gconf-1.0.9.ebuild 1859
-MD5 e1733a22a5ebcc18a75403c2d72f788c gconf-2.2.1.ebuild 2022
-MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
-MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
+MD5 fc14b962a1167dba4a7486edfd085f57 files/digest-gconf-2.5.90 66
+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 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
 MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
-MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
-MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
+MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
+MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
 MD5 52e623180b7b8b7336ca4c1977432da9 files/gconf-2.2.1-stdio.patch 361
-MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
-MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
diff --git a/gnome-base/gconf/files/digest-gconf-2.2.0 b/gnome-base/gconf/files/digest-gconf-2.2.0
deleted file mode 100644
index fcce97c00d1e..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 07ed2f6c583d5664cd728787cf59219b GConf-2.2.0.tar.bz2 1049910
diff --git a/gnome-base/gconf/files/digest-gconf-2.2.1 b/gnome-base/gconf/files/digest-gconf-2.2.1
deleted file mode 100644
index 90614a47966d..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3788a2e63f200478caf2b16059327076 GConf-2.2.1.tar.bz2 1130871
diff --git a/gnome-base/gconf/files/digest-gconf-2.5.90 b/gnome-base/gconf/files/digest-gconf-2.5.90
new file mode 100644
index 000000000000..442bf500d202
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.5.90
@@ -0,0 +1 @@
+MD5 cd3d817f036980b37c346f97a10a5a92 GConf-2.5.90.tar.bz2 1411392
diff --git a/gnome-base/gconf/gconf-2.2.0.ebuild b/gnome-base/gconf/gconf-2.2.0.ebuild
deleted file mode 100644
index 142f5b34b096..000000000000
--- a/gnome-base/gconf/gconf-2.2.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.2.0.ebuild,v 1.15 2004/03/15 01:33:45 spider Exp $
-
-
-inherit 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"
-
-RDEPEND=">=dev-libs/glib-2.0.1
-	>=gnome-base/ORBit2-2.4
-	>=dev-libs/libxml2-2.4.17
-	>=net-libs/linc-0.5
-	>=x11-libs/gtk+-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( dev-util/gtk-doc )"
-
-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
-	gnome2_pkg_postinst
-
-	#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"
diff --git a/gnome-base/gconf/gconf-2.2.1.ebuild b/gnome-base/gconf/gconf-2.5.90.ebuild
index 562239eec737..0f23468dae9e 100644
--- a/gnome-base/gconf/gconf-2.2.1.ebuild
+++ b/gnome-base/gconf/gconf-2.5.90.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.2.1.ebuild,v 1.9 2004/03/15 01:33:45 spider Exp $
-
-
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.5.90.ebuild,v 1.1 2004/03/19 16:12:46 foser Exp $
 
 inherit gnome2
 
@@ -11,36 +9,30 @@ 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"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 
 RDEPEND=">=dev-libs/glib-2.0.1
 	>=gnome-base/ORBit2-2.4
-	>=dev-libs/libxml2-2.4.17
-	>=net-libs/linc-0.5
+	>=dev-libs/libxml2-2
+	dev-libs/popt
 	>=x11-libs/gtk+-2"
 
+# FIXME : gtk dep only for tests (?)
+
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.6 )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
+	doc? ( dev-util/gtk-doc )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
+# FIXME : consider merging the tree (?)
 
-	epatch ${FILESDIR}/gconf-${PV}-stdio.patch
-}
+MAKEOPTS="${MAKEOPTS} -j1"
 
 src_install() {
 
@@ -55,6 +47,7 @@ src_install() {
 }
 
 kill_gconf () {
+
 	# this function will kill all running gconfd that could be causing troubles
 	if [ -x /usr/bin/gconftool ]
 	then
@@ -71,22 +64,28 @@ kill_gconf () {
 		/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
+	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
@@ -98,3 +97,5 @@ pkg_postinst () {
 }
 
 DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+USE_DESTDIR="1"