qa: fix various issues

(Portage version: 2.1_pre4-r1)

8 files changed, 35 insertions, 147 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 140b17a4a56f..dc6977009d73 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.135 2006/02/22 13:52:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.136 2006/02/25 01:45:41 allanonjl Exp $
+
+  25 Feb 2006; John N. Laliberte <allanonjl@gentoo.org>
+  gconf-1.0.8-r3.ebuild, gconf-1.0.8-r5.ebuild, gconf-1.0.9.ebuild,
+  -gconf-2.12.0.ebuild:
+  qa: fix various issues
 
   22 Feb 2006; Aron Griffis <agriffis@gentoo.org>
   +files/gconf-1.0.9-gcc4.patch, +files/gconf-1.0.9-linguas.patch,
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 8f34c58a0127..bcb56c7fe699 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,24 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7906672b171c81c2ca1640b7341baea6 ChangeLog 17655
-RMD160 0690fa930ef54c1af5b902aa01d9f04a6d3e4645 ChangeLog 17655
-SHA256 1689d39b6ef3f0a8fc5025ece65d5a15456ccb1891033c1730c523ee21a427e2 ChangeLog 17655
+MD5 e41934bfc70f10d79a3c4c206afbdb7f ChangeLog 17829
+RMD160 ba0759f5aee37de118aee3c6367ccfcda530591d ChangeLog 17829
+SHA256 768bcf6218a6a4c680e946fc75f2ee2e747acfa6ec346ac8ddab0fed4c3e2511 ChangeLog 17829
 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
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
 RMD160 ebc699448e24dc5d252346644c502aba30a0271d files/digest-gconf-1.0.8-r5 64
 SHA256 d249e722900e836ce4b4c2d8d7e2e508a5e5694f7f377f1a84d5a7c339d60f5d files/digest-gconf-1.0.8-r5 64
-MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
-RMD160 b8e6fa304eb164a42a5e2d075928a3dacd3d25ce files/digest-gconf-1.0.9 64
-SHA256 9de56074d71d10c3c8e24c18f7f7d09118c41b4a584820dceb5ffcf15654f028 files/digest-gconf-1.0.9 64
+MD5 b7e93a52522be76daa1603400d61ba52 files/digest-gconf-1.0.9 238
+RMD160 e9beb9df147ffd6f8d50649b4ee4cc6228a38c0a files/digest-gconf-1.0.9 238
+SHA256 65e197a6a7288d97cdbb02678e21562fff201c70d528bdfe2074641896acf45f files/digest-gconf-1.0.9 238
 MD5 117bfac59f5e93e340fe707b61bc5b53 files/digest-gconf-2.10.1-r1 66
 RMD160 fefad893f7cb361931a732ba93eade512183a8d0 files/digest-gconf-2.10.1-r1 66
 SHA256 7199365e31c7d4f443c407dc3ec7481dbfcaac147e49948115a89efee5163e2e files/digest-gconf-2.10.1-r1 66
-MD5 1dd5411bdbfdf13b035f9d03ef9858c1 files/digest-gconf-2.12.0 66
-RMD160 abee8154f2d3730d5733328906c8f413dece73d8 files/digest-gconf-2.12.0 66
-SHA256 3808cca079357dedbe943f8ca73fc2215629c25225970c36588904a6baadca19 files/digest-gconf-2.12.0 66
 MD5 32bee061b8d5bc7a5a41e3587f60f6ad files/digest-gconf-2.12.1 66
 RMD160 14b85da0b347b6b0d03864f75a6d401d57540d61 files/digest-gconf-2.12.1 66
 SHA256 97c7aab32b1dc3c13bec384d1795f84e47fcff9c62589a21d73a6d848e7a0ce1 files/digest-gconf-2.12.1 66
@@ -34,31 +28,21 @@ SHA256 98021a78c16f3f21a33c8705907cdfb485a11df1a4acddbd5dfbf40b0738ce23 files/gc
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 RMD160 126c30484309dc60a72b843697ab0feb352cde67 files/gconfd-2-fix.patch 1820
 SHA256 d311a969cfcfda29a1350c47b8a60068d4da37651a4485521b6889400ad584c4 files/gconfd-2-fix.patch 1820
-MD5 ac7cff50ecafeb03d9e4f489cbbf037f gconf-1.0.8-r3.ebuild 1707
-RMD160 6439ab897e3291f2ce0f3c86f0df261b905bd4aa gconf-1.0.8-r3.ebuild 1707
-SHA256 ea79f0a6bd36ecc3ab4aae6f1f7b5ae34ca3d77ae94293a0ea9fd4c53959a162 gconf-1.0.8-r3.ebuild 1707
-MD5 7998f0e3fab48622265a6b5277bf28ed gconf-1.0.8-r5.ebuild 1872
-RMD160 14e4f2c697467c2f3c6bb54fb3ed6878d034b136 gconf-1.0.8-r5.ebuild 1872
-SHA256 85422afbff95f9824be8a5c330992faa3c8740d05b370834aceba6d691f7f75e gconf-1.0.8-r5.ebuild 1872
-MD5 10fbd9fbbd20f86082b81b98f0709fbd gconf-1.0.9.ebuild 1917
-RMD160 1d0124f92720b8623a9494fbc6aba08f64b8cb4a gconf-1.0.9.ebuild 1917
-SHA256 572d1c3cafe41c2ea21f09be2580fbee4fa32fc08d9924d9d354ae57111416b2 gconf-1.0.9.ebuild 1917
+MD5 d1aeb763e77372574d084b9be9b69682 gconf-1.0.8-r3.ebuild 1717
+RMD160 225e420f2b8e960e8a4300074cc9e4373700dc15 gconf-1.0.8-r3.ebuild 1717
+SHA256 3d9437ff793f8560e1a3d5d72f37142590de3a7575c15e444e67ad69a39e99d7 gconf-1.0.8-r3.ebuild 1717
+MD5 eb7b0e7af230e4243b2fe5a23be51f80 gconf-1.0.8-r5.ebuild 1883
+RMD160 832282b1b0e212250f6eb89e49e9061dce5ceca4 gconf-1.0.8-r5.ebuild 1883
+SHA256 2ba9e7e3d59d9a0a114d1140799a113a7e85797079ee435214591054379e24f4 gconf-1.0.8-r5.ebuild 1883
+MD5 79e1ec82eca96361d8de30daba040200 gconf-1.0.9.ebuild 1897
+RMD160 da963faf878f9f111dd87f46c5f822187d8f86ef gconf-1.0.9.ebuild 1897
+SHA256 8f7f94cf9afd711324cc49054e56c783b5b1f9fcf67d4210c5e33e95fcbad646 gconf-1.0.9.ebuild 1897
 MD5 e9577b3216e9a2ab22f87bf5b234ca27 gconf-2.10.1-r1.ebuild 2015
 RMD160 79b07adb0ef584e8e95f822c4adae39e23b69d93 gconf-2.10.1-r1.ebuild 2015
 SHA256 e21d998847720e4cf15704461a404d9a6c23efd702496efe60bef9f1a2ad38ab gconf-2.10.1-r1.ebuild 2015
-MD5 9f586fcd2813a75ccd7da699616850b9 gconf-2.12.0.ebuild 2011
-RMD160 1ed07fff41d7f3515cb1e334afb56c1dfa6b7488 gconf-2.12.0.ebuild 2011
-SHA256 dc0aa11485424c5c7c59d12f49a73c8c7036a845361456f641aec755a3b36e03 gconf-2.12.0.ebuild 2011
 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 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD/Gy9JrHF4yAQTrARAtLbAKCQr0iML/O5mT5yLRgRfPZGeoAQ/gCdHEEa
-bWx+by2Lbewi1f/2ZTSzUxk=
-=gD0F
------END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/files/digest-gconf-1.0.9 b/gnome-base/gconf/files/digest-gconf-1.0.9
index 0c0a5f1316f3..6c04b3831cc6 100644
--- a/gnome-base/gconf/files/digest-gconf-1.0.9
+++ b/gnome-base/gconf/files/digest-gconf-1.0.9
@@ -1 +1,3 @@
 MD5 613aea1d9b7a9c504f52217451c7bf99 GConf-1.0.9.tar.bz2 784363
+RMD160 d5cb8ae92146c33bc6ea073b485c3ad6f12f6cc7 GConf-1.0.9.tar.bz2 784363
+SHA256 863c3dd3e72cf7d35eff7497b833978cc28a9f9d12d7caeb9d61ea785731cb19 GConf-1.0.9.tar.bz2 784363
diff --git a/gnome-base/gconf/files/digest-gconf-2.12.0 b/gnome-base/gconf/files/digest-gconf-2.12.0
deleted file mode 100644
index 6dd5187462e1..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.12.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e674d838922a9e9de0cee9fd2ef1ea0c GConf-2.12.0.tar.bz2 1899718
diff --git a/gnome-base/gconf/gconf-1.0.8-r3.ebuild b/gnome-base/gconf/gconf-1.0.8-r3.ebuild
index 03fba9539bdb..ab2a54cc7fae 100644
--- a/gnome-base/gconf/gconf-1.0.8-r3.ebuild
+++ b/gnome-base/gconf/gconf-1.0.8-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-1.0.8-r3.ebuild,v 1.20 2005/01/08 23:26:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r3.ebuild,v 1.21 2006/02/25 01:45:41 allanonjl Exp $
 
 S=${WORKDIR}/GConf-${PV}
-DESCRIPTION="Gconf"
+DESCRIPTION="Gnome Configuration System and Daemon"
 HOMEPAGE="http://www.gnome.org/"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-${PV}.tar.gz"
 
@@ -12,17 +12,15 @@ SLOT="1"
 KEYWORDS="x86 ppc sparc"
 IUSE="nls"
 
-RDEPEND="nls? ( sys-devel/gettext )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/guile-1.4
+DEPEND=">=dev-util/guile-1.4
 	dev-util/indent
 	=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
 	dev-libs/libxml
 	dev-libs/popt
 	gnome-base/oaf
-	=gnome-base/orbit-0*"
+	=gnome-base/orbit-0*
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
 	local myconf
diff --git a/gnome-base/gconf/gconf-1.0.8-r5.ebuild b/gnome-base/gconf/gconf-1.0.8-r5.ebuild
index 00222452fae9..7edfdf62ca77 100644
--- a/gnome-base/gconf/gconf-1.0.8-r5.ebuild
+++ b/gnome-base/gconf/gconf-1.0.8-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-1.0.8-r5.ebuild,v 1.15 2005/01/08 23:26:55 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.8-r5.ebuild,v 1.16 2006/02/25 01:45:41 allanonjl Exp $
 
 inherit libtool eutils
 
 S=${WORKDIR}/GConf-${PV}
-DESCRIPTION="Gconf"
+DESCRIPTION="Gnome Configuration System and Daemon"
 HOMEPAGE="http://www.gnome.org/"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-${PV}.tar.gz"
 
@@ -20,9 +20,7 @@ DEPEND="dev-util/indent
 	dev-libs/libxml
 	dev-libs/popt
 	gnome-base/oaf
-	=gnome-base/orbit-0*"
-
-RDEPEND="${DEPEND}
+	=gnome-base/orbit-0*
 	nls? ( sys-devel/gettext )"
 
 src_unpack () {
diff --git a/gnome-base/gconf/gconf-1.0.9.ebuild b/gnome-base/gconf/gconf-1.0.9.ebuild
index 11ec48935c13..fc1007f39c14 100644
--- a/gnome-base/gconf/gconf-1.0.9.ebuild
+++ b/gnome-base/gconf/gconf-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # 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-1.0.9.ebuild,v 1.19 2006/02/22 13:52:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.9.ebuild,v 1.20 2006/02/25 01:45:41 allanonjl Exp $
 
 inherit libtool gnome.org eutils gnuconfig
 
@@ -25,8 +25,7 @@ DEPEND="dev-util/indent
 	dev-libs/libxml
 	dev-libs/popt
 	gnome-base/oaf
-	=gnome-base/orbit-0*"
-RDEPEND="${DEPEND}
+	=gnome-base/orbit-0*
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
diff --git a/gnome-base/gconf/gconf-2.12.0.ebuild b/gnome-base/gconf/gconf-2.12.0.ebuild
deleted file mode 100644
index 0448114c8552..000000000000
--- a/gnome-base/gconf/gconf-2.12.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.12.0.ebuild,v 1.1 2005/09/09 01:01:55 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 static"
-
-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"
-USE_DESTDIR="1"
-MAKEOPTS="${MAKEOPTS} -j1"
-
-
-pkg_setup() {
-	G2CONF="$(use_enable static) --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 "{}" \;
-
-}