New release: 2.12.1. Pruning old ebuild.

(Portage version: 2.0.53_rc7)

5 files changed, 30 insertions, 27 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 0353b8812306..d02ecf77c6c6 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.125 2005/10/13 08:55:04 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.126 2005/11/15 22:52:40 leonardop Exp $
+
+*gconf-2.12.1 (15 Nov 2005)
+
+  15 Nov 2005; Leonardo Boshell <leonardop@gentoo.org> +gconf-2.12.1.ebuild:
+  New version.
 
   13 Oct 2005; Hardave Riar <hardave@gentoo.org> gconf-2.10.1-r1.ebuild:
   Stable on mips.
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 9fd2bcd9daec..fa0cf3fdec0f 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,16 +1,16 @@
 MD5 70d95e2a7965007fac109dfdfa6846b6 ChangeLog 16452
-MD5 ac7cff50ecafeb03d9e4f489cbbf037f gconf-1.0.8-r3.ebuild 1707
-MD5 7998f0e3fab48622265a6b5277bf28ed gconf-1.0.8-r5.ebuild 1872
-MD5 a3295c560e968484fb4d35f2b3bb4d49 gconf-1.0.9.ebuild 1842
-MD5 92e5e04bfdcd104514e19ad5a1538861 gconf-2.10.0.ebuild 1947
-MD5 e9577b3216e9a2ab22f87bf5b234ca27 gconf-2.10.1-r1.ebuild 2015
-MD5 9f586fcd2813a75ccd7da699616850b9 gconf-2.12.0.ebuild 2011
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 117bfac59f5e93e340fe707b61bc5b53 files/digest-gconf-2.10.1-r1 66
 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 8cfc79bc2dbac8f93a77df81c0a90bca files/digest-gconf-2.10.0 66
+MD5 117bfac59f5e93e340fe707b61bc5b53 files/digest-gconf-2.10.1-r1 66
 MD5 1dd5411bdbfdf13b035f9d03ef9858c1 files/digest-gconf-2.12.0 66
+MD5 32bee061b8d5bc7a5a41e3587f60f6ad files/digest-gconf-2.12.1 66
 MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
+MD5 ac7cff50ecafeb03d9e4f489cbbf037f gconf-1.0.8-r3.ebuild 1707
+MD5 7998f0e3fab48622265a6b5277bf28ed gconf-1.0.8-r5.ebuild 1872
+MD5 a3295c560e968484fb4d35f2b3bb4d49 gconf-1.0.9.ebuild 1842
+MD5 e9577b3216e9a2ab22f87bf5b234ca27 gconf-2.10.1-r1.ebuild 2015
+MD5 9f586fcd2813a75ccd7da699616850b9 gconf-2.12.0.ebuild 2011
+MD5 6989a98a96753d4f09bb3e4457b03da4 gconf-2.12.1.ebuild 1981
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/gconf/files/digest-gconf-2.10.0 b/gnome-base/gconf/files/digest-gconf-2.10.0
deleted file mode 100644
index 236857a84b2b..000000000000
--- a/gnome-base/gconf/files/digest-gconf-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7cd37be4e317195a6668a086fc72033 GConf-2.10.0.tar.bz2 1734260
diff --git a/gnome-base/gconf/files/digest-gconf-2.12.1 b/gnome-base/gconf/files/digest-gconf-2.12.1
new file mode 100644
index 000000000000..48e5c92a784f
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.12.1
@@ -0,0 +1 @@
+MD5 247110de013ed24b17cf4191eb6daec5 GConf-2.12.1.tar.bz2 1945241
diff --git a/gnome-base/gconf/gconf-2.10.0.ebuild b/gnome-base/gconf/gconf-2.12.1.ebuild
index feb9413fd6d7..169f961f0c9a 100644
--- a/gnome-base/gconf/gconf-2.10.0.ebuild
+++ b/gnome-base/gconf/gconf-2.12.1.ebuild
@@ -1,8 +1,8 @@
 # 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.10.0.ebuild,v 1.11 2005/07/12 02:54:54 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.12.1.ebuild,v 1.1 2005/11/15 22:52:41 leonardop Exp $
 
-inherit eutils gnome2
+inherit gnome2
 
 MY_PN=GConf
 MY_P=${MY_PN}-${PV}
@@ -15,24 +15,31 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-RDEPEND=">=dev-libs/glib-2.0.1
+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.12.0
-	doc? ( dev-util/gtk-doc )"
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 # FIXME : consider merging the tree (?)
-DOCS="AUTHORS ChangeLog README NEWS TODO"
+
+DOCS="ABOUT-NLS AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
 MAKEOPTS="${MAKEOPTS} -j1"
 
+
+pkg_setup() {
+	G2CONF="--enable-gtk"
+	kill_gconf
+}
+
 src_install() {
 
 	gnome2_src_install
@@ -69,12 +76,6 @@ kill_gconf() {
 
 }
 
-pkg_setup() {
-
-	kill_gconf
-
-}
-
 pkg_preinst() {
 
 	kill_gconf
@@ -84,7 +85,6 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-
 	kill_gconf
 
 	#change the permissions to avoid some gconf bugs
@@ -92,6 +92,4 @@ pkg_postinst() {
 	find  /etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
 	einfo "changing permissions for gconf files"
 	find  /etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-
 }
-