gnome 2.6

5 files changed, 11 insertions, 7 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index ee046936c6ff..2f8423897332 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.58 2004/03/28 23:14:01 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.59 2004/03/31 22:55:25 foser Exp $
+
+*control-center-2.6.0.2 (01 Apr 2004)
+
+  01 Apr 2004; foser <foser@gentoo.org> control-center-2.6.0.1.ebuild :
+  Gnome 2.6 final
 
   28 Mar 2004; foser <foser@gentoo.org> control-center-2.5.4.ebuild :
   Reenabled gstreamer
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index 7938b168fb24..c255a5057a35 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,5 +1,6 @@
 MD5 dfe3d9c41be92663ec6afbeda736a463 control-center-2.5.4.ebuild 1849
 MD5 8bcb94ccbd821b943d0061900648a69e control-center-2.4.0.ebuild 1432
+MD5 3d09a46daf7f060b32f42f401fcf5986 control-center-2.6.0.2.ebuild 1851
 MD5 7b5319985f9fa99996bac5e08205cb26 control-center-1.4.0.5-r1.ebuild 1209
 MD5 3d31bf62c0f781bf34659c911f19e1fd ChangeLog 7771
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
@@ -8,5 +9,6 @@ MD5 9586f48d3351e8286cd850904020e3c6 files/digest-control-center-2.5.4 74
 MD5 111edb31ce663d8dbe8011f77cf9e913 files/control-center-2.5.4-fix_gst_0.8.patch 443
 MD5 b76eaa4944f6f4be761fc68f0c46c52c files/control-center-2.4.0-64bit-fixes.patch 1663
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
+MD5 b17314d0adddd9e26bc4629cac5876aa files/digest-control-center-2.6.0.2 76
 MD5 adbe3cf7b6918f7681569128f76a4b71 files/control-center-2.2-icons_install.patch 2943
 MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
diff --git a/gnome-base/control-center/control-center-2.5.4.ebuild b/gnome-base/control-center/control-center-2.6.0.2.ebuild
index 74ac605ea837..0edf391d9cba 100644
--- a/gnome-base/control-center/control-center-2.5.4.ebuild
+++ b/gnome-base/control-center/control-center-2.6.0.2.ebuild
@@ -1,6 +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/control-center/control-center-2.5.4.ebuild,v 1.2 2004/03/28 23:14:01 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.6.0.2.ebuild,v 1.1 2004/03/31 22:55:25 foser Exp $
 
 # FIXME : double check all the acme stuff
 inherit gnome2 eutils
@@ -31,7 +31,7 @@ RDEPEND=">=x11-libs/gtk+-2.3
 	dev-libs/libxml2
 	media-sound/esound
 	>=x11-wm/metacity-2.4.5
-	>=x11-libs/libxklavier-0.97
+	>=x11-libs/libxklavier-1
 	alsa? ( >=media-libs/alsa-lib-0.9 )
 	gstreamer? ( >=media-libs/gst-plugins-0.8 )
 	!gnome-extra/fontilus
@@ -66,7 +66,4 @@ src_unpack() {
 	# FIXME : this broke again
 #	epatch ${FILESDIR}/${PN}-2.2-icons_install.patch
 
-	epatch ${FILESDIR}/${P}-fix_gst_0.8.patch
-	WANT_AUTOCONF=2.5 autoconf || die
-
 }
diff --git a/gnome-base/control-center/files/digest-control-center-2.5.4 b/gnome-base/control-center/files/digest-control-center-2.5.4
deleted file mode 100644
index 6a5cecbb40b4..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b18499feb4dc74894b882bbe4d9b2ea2 control-center-2.5.4.tar.bz2 2347989
diff --git a/gnome-base/control-center/files/digest-control-center-2.6.0.2 b/gnome-base/control-center/files/digest-control-center-2.6.0.2
new file mode 100644
index 000000000000..776ca37e740c
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.6.0.2
@@ -0,0 +1 @@
+MD5 20438f755c6da00558038e443d4c3bb8 control-center-2.6.0.2.tar.bz2 2419710