gnome 2.6 commit

12 files changed, 84 insertions, 176 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 4c2e3cd85ce3..6011258bf7b3 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,12 @@
 # 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.56 2004/03/17 00:31:53 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.57 2004/03/20 15:27:39 foser Exp $
+
+*control-center-2.5.4 (20 Mar 2004)
+
+  20 Mar 2004; foser <foser@gentoo.org> control-center-2.5.4.ebuild :
+  Gnome 2.6 release
+  Added alsa USE
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org>
   control-center-2.4.0.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index c42789b30a95..7b3659d12b35 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,3 +1,4 @@
+MD5 a042752f3444e2ca9e890271c66a5cfb control-center-2.5.4.ebuild 1798
 MD5 b3eff5f25b710499dad3ee7dba904969 control-center-2.2.2.ebuild 1111
 MD5 8bcb94ccbd821b943d0061900648a69e control-center-2.4.0.ebuild 1432
 MD5 e1c0c367fe0bd93637deea26f5db84dd control-center-2.2.1.ebuild 1120
@@ -9,6 +10,7 @@ MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 d505cf9f64f1562a777380d903306088 files/digest-control-center-2.2.1 74
 MD5 dbda24a02e6a621f95ad2ee91c154112 files/digest-control-center-2.2.2 74
 MD5 440e2fbb11ac5952e79c4205595d54f3 files/digest-control-center-2.4.0 74
+MD5 9586f48d3351e8286cd850904020e3c6 files/digest-control-center-2.5.4 74
 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 dbda24a02e6a621f95ad2ee91c154112 files/digest-control-center-2.2.2-r1 74
diff --git a/gnome-base/control-center/control-center-2.2.0.1-r1.ebuild b/gnome-base/control-center/control-center-2.2.0.1-r1.ebuild
deleted file mode 100644
index e9023c5f4179..000000000000
--- a/gnome-base/control-center/control-center-2.2.0.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 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.2.0.1-r1.ebuild,v 1.6 2003/09/06 23:51:37 msterret Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc alpha ~sparc"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/libgnomeui-2.2
-	dev-libs/libxml2
-	media-sound/esound
-	>=x11-wm/metacity-2.4.5"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
-	# what this is about.
-	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
-}
diff --git a/gnome-base/control-center/control-center-2.2.1.ebuild b/gnome-base/control-center/control-center-2.2.1.ebuild
deleted file mode 100644
index b4897d94729b..000000000000
--- a/gnome-base/control-center/control-center-2.2.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 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.2.1.ebuild,v 1.9 2003/09/06 23:51:37 msterret Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha sparc hppa amd64"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/libgnomeui-2.2
-	dev-libs/libxml2
-	media-sound/esound
-	>=x11-wm/metacity-2.4.5"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
-	# what this is about.
-	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
-}
diff --git a/gnome-base/control-center/control-center-2.2.2-r1.ebuild b/gnome-base/control-center/control-center-2.2.2-r1.ebuild
deleted file mode 100644
index 72d310de8755..000000000000
--- a/gnome-base/control-center/control-center-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2003 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.2.2-r1.ebuild,v 1.6 2003/09/23 15:50:38 darkspecter Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="the gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~alpha ~sparc ~hppa ~amd64"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/libgnomeui-2.2
-	dev-libs/libxml2
-	media-sound/esound
-	>=x11-wm/metacity-2.4.5"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
-G2CONF="${G2CONF} --disable-schemas-install"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
-	# what this is about.
-	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
-
-	# temporary fix for icon installation adapted by <link@sub_pop.net> (#16928)
-	epatch ${FILESDIR}/${PN}-2.2-icons_install.patch
-}
diff --git a/gnome-base/control-center/control-center-2.2.2.ebuild b/gnome-base/control-center/control-center-2.2.2.ebuild
deleted file mode 100644
index 340145e28ed8..000000000000
--- a/gnome-base/control-center/control-center-2.2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 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.2.2.ebuild,v 1.3 2003/09/06 23:51:37 msterret Exp $
-
-inherit gnome2 eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="the gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~alpha ~sparc"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libbonobo-2
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/libgnomeui-2.2
-	dev-libs/libxml2
-	media-sound/esound
-	>=x11-wm/metacity-2.4.5"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0"
-
-DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
-	# what this is about.
-	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
-}
diff --git a/gnome-base/control-center/control-center-2.5.4.ebuild b/gnome-base/control-center/control-center-2.5.4.ebuild
new file mode 100644
index 000000000000..04c8900b4466
--- /dev/null
+++ b/gnome-base/control-center/control-center-2.5.4.ebuild
@@ -0,0 +1,74 @@
+# 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.1 2004/03/20 15:27:39 foser Exp $
+
+# FIXME : double check all the acme stuff
+# FIXME : readd gstreamer support
+inherit gnome2 eutils
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2"
+
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+IUSE="alsa"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND=">=x11-libs/gtk+-2.3
+	virtual/xft
+	media-libs/fontconfig
+	>=dev-libs/atk-1.2
+	>=gnome-base/gconf-1.2
+	>=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/libbonobo-2.2
+	>=gnome-base/libbonoboui-2.2
+	>=gnome-base/nautilus-2.2
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/gnome-desktop-2.2
+	dev-libs/libxml2
+	media-sound/esound
+	>=x11-wm/metacity-2.4.5
+	>=x11-libs/libxklavier-0.97
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	!gnome-extra/fontilus
+	!gnome-extra/themus
+	!gnome-extra/acme"
+#	gstreamer? ( >=media-libs/gst-plugins-0.7.6 )
+
+DEPEND="${RDEPEND}
+	>=app-text/scrollkeeper-0.3.11
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS ChangeLog COPYING README TODO INSTALL NEWS"
+
+G2CONF="${G2CONF} \
+	--disable-schemas-install\
+	--enable-vfs-methods \
+	$(use_enable alsa) \
+	--disable-gstreamer"
+#	$(use_enable gstreamer)"
+
+USE_DESTDIR="1"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# See http://gcc.gnu.org/cgi-bin/gnatsweb.pl problem #9700 for
+	# what this is about.
+	use alpha && epatch ${FILESDIR}/control-center-2.2.0.1-alpha_hack.patch
+
+	# temporary fix for icon installation adapted by <link@sub_pop.net> (#16928)
+	# 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.2.0.1-r1 b/gnome-base/control-center/files/digest-control-center-2.2.0.1-r1
deleted file mode 100644
index 7c99e5c397e2..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.2.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b17bc2ecf9a38614310c54c5f88ffc55 control-center-2.2.0.1.tar.bz2 146238
diff --git a/gnome-base/control-center/files/digest-control-center-2.2.1 b/gnome-base/control-center/files/digest-control-center-2.2.1
deleted file mode 100644
index c8b0ac7eb968..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a39858a9ed4fa4aed8c3cecde72bbe9b control-center-2.2.1.tar.bz2 1491602
diff --git a/gnome-base/control-center/files/digest-control-center-2.2.2 b/gnome-base/control-center/files/digest-control-center-2.2.2
deleted file mode 100644
index 4d5a3972ed84..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5288d0e4249a5afdef494d5c59cb1bc control-center-2.2.2.tar.bz2 1543005
diff --git a/gnome-base/control-center/files/digest-control-center-2.2.2-r1 b/gnome-base/control-center/files/digest-control-center-2.2.2-r1
deleted file mode 100644
index 4d5a3972ed84..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5288d0e4249a5afdef494d5c59cb1bc control-center-2.2.2.tar.bz2 1543005
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
new file mode 100644
index 000000000000..6a5cecbb40b4
--- /dev/null
+++ b/gnome-base/control-center/files/digest-control-center-2.5.4
@@ -0,0 +1 @@
+MD5 b18499feb4dc74894b882bbe4d9b2ea2 control-center-2.5.4.tar.bz2 2347989