don't redefine P

3 files changed, 27 insertions, 15 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 7914e4dc2682..cdacf3175d17 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.43 2003/08/25 10:50:28 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.44 2003/09/08 12:20:42 foser Exp $
+
+*gconf-2.3.3 (08 Sep 2003)
+
+  08 Sep 2003; foser <foser@gentoo.org> gconf-2.3.3.ebuild :
+  Gnome 2.4 rc1 , fix redefinition of ${P} in the ebuild (#28169)
 
   25 Aug 2003; Mike Gardiner <obz@gentoo.org> gconf-2.2.1.ebuild:
   Removed gnome2_pkg_postinst as it is unneeded, see bug #27262
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 7c780bbbc0cf..7938669365e0 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,15 +1,15 @@
-MD5 0493d665f08d02cfa191709f97324b7e ChangeLog 6895
 MD5 2bdeb24eae8590fc7903478432c2d457 gconf-1.0.8-r3.ebuild 1695
-MD5 87a34bd430e3fce09cc7b3acbcb50c99 gconf-1.0.8-r4.ebuild 1790
-MD5 423a82bbcd7364a6be65f532ba8324c2 gconf-2.2.0.ebuild 1803
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 40a6d540af0c5b1390f33f53b576a4e9 gconf-2.2.1.ebuild 1785
 MD5 11738e3ca7931c556071056947914a9e gconf-1.0.8-r5.ebuild 1847
-MD5 0bea101d6490ba78a5b498e9a53591dc gconf-2.3.3.ebuild 1787
+MD5 423a82bbcd7364a6be65f532ba8324c2 gconf-2.2.0.ebuild 1803
+MD5 9afb7cb5850099546422e5e58d8113eb gconf-2.3.3.ebuild 1902
+MD5 657aafc46fe65f2b7f2964986a5a1934 ChangeLog 7053
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 87a34bd430e3fce09cc7b3acbcb50c99 gconf-1.0.8-r4.ebuild 1790
+MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
+MD5 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
+MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
+MD5 3b633d5429f7f806b3625afb97888bd3 files/digest-gconf-2.3.3 65
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r4 64
-MD5 74dce531af7567e546dfd4f0f7dc7572 files/digest-gconf-2.2.1 65
-MD5 f0a71242e14d4bae36c2e6dbc1b675b1 files/digest-gconf-2.2.0 65
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
-MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
-MD5 3b633d5429f7f806b3625afb97888bd3 files/digest-gconf-2.3.3 65
diff --git a/gnome-base/gconf/gconf-2.3.3.ebuild b/gnome-base/gconf/gconf-2.3.3.ebuild
index c9050448f2d4..6c1c03f769fb 100644
--- a/gnome-base/gconf/gconf-2.3.3.ebuild
+++ b/gnome-base/gconf/gconf-2.3.3.ebuild
@@ -1,14 +1,16 @@
 # 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-2.3.3.ebuild,v 1.2 2003/09/08 02:29:57 msterret Exp $
-
-PN=GConf
-P=${PN}-${PV}
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.3.3.ebuild,v 1.3 2003/09/08 12:20:42 foser Exp $
 
 inherit gnome2
 
+MY_P=GConf-${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/${PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
 
 IUSE="doc"
 LICENSE="LGPL-2"
@@ -39,6 +41,7 @@ src_install() {
 }
 
 kill_gconf () {
+
 	# this function will kill all running gconfd that could be causing troubles
 	if [ -x /usr/bin/gconftool ]
 	then
@@ -55,25 +58,29 @@ 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
 
 	dodir /root/.gconfd
+
 }
 
 pkg_postinst () {
 
 	kill_gconf
-	gnome2_pkg_postinst
 
 	#change the permissions to avoid some gconf bugs
 	einfo "changing permissions for gconf dirs"