new version 'n cleanup

5 files changed, 39 insertions, 31 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index b492041017b4..ca6da159f315 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.36 2003/04/09 03:03:17 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.37 2003/06/03 11:13:31 foser Exp $
+
+*gconf-2.2.1 (03 Jun 2003)
+
+  03 Jun 2003; foser <foser@gentoo.org> gconf-2.2.1.ebuild :
+  New version, minor ebuild cleanups
 
   07 Feb 2003; Aron Griffis <agriffis@gentoo.org> gconf-2.2.0.ebuild :
   Add ~alpha to KEYWORDS
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index c9e70a6b5bca..b782015db635 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,10 +1,8 @@
-MD5 9f9a32cc7b2595a3506357646c6b7a08 gconf-1.2.1.ebuild 1881
 MD5 caafc2baaeeda2786822ae034b2936ef gconf-1.0.8-r3.ebuild 1719
-MD5 356552e8597c56673ae9e9acf85e817d gconf-2.2.1.ebuild 1799
+MD5 022e7286c2ed0c055cf6254b60de9092 gconf-2.2.1.ebuild 1799
 MD5 356552e8597c56673ae9e9acf85e817d gconf-2.2.0.ebuild 1799
-MD5 d7f344e0f946bfcd2c9f4ad0687cfd1a ChangeLog 5897
+MD5 0e421df7ade5ec542d1c4f57abbc7a41 ChangeLog 6025
 MD5 22b3a3ecf98aa4ec9a7c88dae46ada44 gconf-1.0.8-r4.ebuild 1821
-MD5 6feeddef3456f1b0832c867bf40a8132 files/digest-gconf-1.2.1 64
 MD5 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
 MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
diff --git a/gnome-base/gconf/files/digest-gconf-1.2.1 b/gnome-base/gconf/files/digest-gconf-1.2.1
deleted file mode 100644
index e2222c9d2026..000000000000
--- a/gnome-base/gconf/files/digest-gconf-1.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e5ffdebd7dbf6d86459f6e57f8d772c GConf-1.2.1.tar.bz2 954798
diff --git a/gnome-base/gconf/files/digest-gconf-2.2.1 b/gnome-base/gconf/files/digest-gconf-2.2.1
new file mode 100644
index 000000000000..90614a47966d
--- /dev/null
+++ b/gnome-base/gconf/files/digest-gconf-2.2.1
@@ -0,0 +1 @@
+MD5 3788a2e63f200478caf2b16059327076 GConf-2.2.1.tar.bz2 1130871
diff --git a/gnome-base/gconf/gconf-1.2.1.ebuild b/gnome-base/gconf/gconf-2.2.1.ebuild
index ac8ff7682328..4f2556b19703 100644
--- a/gnome-base/gconf/gconf-1.2.1.ebuild
+++ b/gnome-base/gconf/gconf-2.2.1.ebuild
@@ -1,32 +1,44 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.2.1.ebuild,v 1.12 2003/03/06 09:30:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.2.1.ebuild,v 1.1 2003/06/03 11:13:31 foser Exp $
 
 IUSE="doc"
 
+PN=GConf
+P=${PN}-${PV}
+
 inherit gnome2
 
-MY_PN=GConf
-S=${WORKDIR}/${MY_PN}-${PV}
 DESCRIPTION="Gnome Configuration System and Daemon"
-SRC_URI="mirror://gnome/2.0.0/sources/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2"
+
 SLOT="2"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
 
-RDEPEND=">=dev-libs/glib-2.0.6
-		>=gnome-base/ORBit2-2.4.1
-		>=dev-libs/libxml2-2.4.17
-		>=net-libs/linc-0.5.2
-		>=x11-libs/gtk+-2.0.6"
+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 )"
+	doc? ( >=dev-util/gtk-doc-0.6 )"
+
+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}
 
-# multple jobs fails on alpha (#14280) and x86 (#16807)
-MAKEOPTS="-j1"
+}
 
 kill_gconf () {
 	# this function will kill all running gconfd that could be causing troubles
@@ -48,22 +60,18 @@ kill_gconf () {
 }
 
 pkg_setup () {
-  kill_gconf
+	kill_gconf
 }
+
 pkg_preinst () {
 	kill_gconf 
-	# hack hack
-	dodir /etc/gconf/gconf.xml.mandatory
-	dodir /etc/gconf/gconf.xml.defaults
-    touch ${D}/etc/gconf/gconf.xml.mandatory/.keep
-	touch ${D}/etc/gconf/gconf.xml.defaults/.keep
 
 	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
@@ -76,7 +84,4 @@ pkg_postinst () {
 	
 }
 
-
-DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README* INSTALL NEWS TODO"
-
-
+DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"