Added desktop-file-utils to DEPEND (bug #110082). Removing old ebuilds.

Package-Manager: portage-2.0.53_rc6

8 files changed, 19 insertions, 179 deletions

diff --git a/gnome-base/control-center/ChangeLog b/gnome-base/control-center/ChangeLog
index 5e240f9025ca..ebb6b1d5906e 100644
--- a/gnome-base/control-center/ChangeLog
+++ b/gnome-base/control-center/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/control-center
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.137 2005/10/17 13:07:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/ChangeLog,v 1.138 2005/10/28 17:21:28 leonardop Exp $
+
+  28 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
+  control-center-2.10.2.ebuild, control-center-2.12.1.ebuild:
+  Added desktop-file-utils to DEPEND (bug #110082).
 
   17 Oct 2005; Aron Griffis <agriffis@gentoo.org>
   control-center-2.10.2.ebuild:
diff --git a/gnome-base/control-center/Manifest b/gnome-base/control-center/Manifest
index fc13ce8f6812..dcb1783e1150 100644
--- a/gnome-base/control-center/Manifest
+++ b/gnome-base/control-center/Manifest
@@ -1,28 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 52cfaa768b796812c1255e27f03b3999 ChangeLog 17806
+MD5 02e8b950302f884140fa26517ac19967 ChangeLog 17977
 MD5 d4f0febb27460c43fb258412acde17b8 control-center-1.4.0.5-r1.ebuild 1333
-MD5 3cab1be20dfc1f79ecb30aec964cd27f control-center-2.12.1.ebuild 2265
-MD5 5af1d1aad2b9b7fef198abb27b604c35 control-center-2.10.1-r1.ebuild 2036
-MD5 63d40166766fb5bc828bb2bad93e6422 control-center-2.10.0.ebuild 1905
-MD5 2983b66accc54f8e9c9a44c55295f89b control-center-2.10.2.ebuild 1985
-MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
+MD5 411bb0502e1a779a850ab4bb0d582e5c control-center-2.10.2.ebuild 2015
+MD5 4c51b1cfa94b30d5b65e740eaf9f12fe control-center-2.12.1.ebuild 2294
+MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
 MD5 f14d2fe3d15320580a2ab5715e6e2d94 files/control-center-2.10.1-pathfix.patch 6670
-MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
+MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
 MD5 fdc3d7feea8b429588a2d193c9547dbf files/control-center-2.2.0.1-alpha_hack.patch 2997
-MD5 2f0867c07305e05e49c57051e20dc068 files/digest-control-center-2.10.1-r1 75
 MD5 63670f480e3cafb0d9dc8b3423425071 files/control-center-2.6.0-remove-pmu.patch 1210
 MD5 c74402dbfb3e7cdb095304cc4751d86a files/control-center-2.9-logout.patch 4083
-MD5 dbc915ad73576e8f0ae8a948e52fb621 files/control-center-1.4.0.5-cflags.patch 744
+MD5 38949ed5d795344f78a96af44764f896 files/digest-control-center-1.4.0.5-r1 76
+MD5 cd6f25b991e95ef9f518b4c499f2e2f7 files/digest-control-center-2.10.2 75
 MD5 ce951b06688a38662ed2c0e5e8d0d1bc files/digest-control-center-2.12.1 75
-MD5 6d346011e61ca1c016c3c391881f9a4a files/control-center-2.11-gentoo_xcursor.patch 527
-MD5 86ede4717972671750335483cefdf77b files/digest-control-center-2.10.0 75
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDU6IpJrHF4yAQTrARAiCvAKDQeBFkrwU2K08rymBWdrNWbypYhgCfVMnk
-4Nh5f95seVntGIZEDU2tF4Q=
-=MJye
------END PGP SIGNATURE-----
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/gnome-base/control-center/control-center-2.10.0.ebuild b/gnome-base/control-center/control-center-2.10.0.ebuild
deleted file mode 100644
index fa354c9caf49..000000000000
--- a/gnome-base/control-center/control-center-2.10.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.0.ebuild,v 1.17 2005/07/12 02:53:26 geoman Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="alsa gstreamer"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=dev-libs/glib-2.5
-	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.6
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/gnome-menus-2.9.1
-	dev-libs/libxml2
-	media-sound/esound
-	>=x11-wm/metacity-2.8.6-r1
-	>=x11-libs/libxklavier-1.14
-	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	gstreamer? ( >=media-libs/gst-plugins-0.8 )
-	!gnome-extra/fontilus
-	!gnome-extra/themus
-	!gnome-extra/acme"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog README TODO NEWS"
-
-G2CONF="${G2CONF} \
-	--disable-schemas-install\
-	--enable-vfs-methods \
-	$(use_enable alsa) \
-	$(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 workaround for a problematic behaviour with acme.
-	epatch ${FILESDIR}/control-center-2.6.0-remove-pmu.patch
-
-	# Fix the logout keyboard shortcut by moving it out of
-	# the control-center here, and into metacity, bug #52034
-	epatch ${FILESDIR}/control-center-2.9-logout.patch
-
-}
diff --git a/gnome-base/control-center/control-center-2.10.1-r1.ebuild b/gnome-base/control-center/control-center-2.10.1-r1.ebuild
deleted file mode 100644
index 023cac907766..000000000000
--- a/gnome-base/control-center/control-center-2.10.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.1-r1.ebuild,v 1.12 2005/08/24 01:21:18 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="The gnome2 Desktop configuration tool"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="alsa gstreamer"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=dev-libs/glib-2.5
-	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.6
-	>=gnome-base/gnome-vfs-2.2
-	>=gnome-base/gnome-desktop-2.2
-	>=gnome-base/gnome-menus-2.9.1
-	dev-libs/libxml2
-	media-sound/esound
-	>=x11-wm/metacity-2.8.6-r1
-	>=x11-libs/libxklavier-1.14
-	!arm? ( alsa? ( >=media-libs/alsa-lib-0.9 ) )
-	gstreamer? ( >=media-libs/gst-plugins-0.8 )
-	!gnome-extra/fontilus
-	!gnome-extra/themus
-	!gnome-extra/acme"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-0.3.11
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS ChangeLog README TODO NEWS"
-
-G2CONF="${G2CONF} \
-	--disable-schemas-install\
-	--enable-vfs-methods \
-	$(use_enable alsa) \
-	$(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 workaround for a problematic behaviour with acme.
-	epatch ${FILESDIR}/control-center-2.6.0-remove-pmu.patch
-
-	# Fix the logout keyboard shortcut by moving it out of
-	# the control-center here, and into metacity, bug #52034
-	epatch ${FILESDIR}/control-center-2.9-logout.patch
-
-	# Fix the hardcoding of tar, bzip2, and gzip paths in
-	# gnome-theme-installer.  bug #84977
-	epatch ${FILESDIR}/${P}-pathfix.patch
-
-}
diff --git a/gnome-base/control-center/control-center-2.10.2.ebuild b/gnome-base/control-center/control-center-2.10.2.ebuild
index eebe28130965..f29a4a8d8c3e 100644
--- a/gnome-base/control-center/control-center-2.10.2.ebuild
+++ b/gnome-base/control-center/control-center-2.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.2.ebuild,v 1.12 2005/10/17 13:07:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.10.2.ebuild,v 1.13 2005/10/28 17:21:28 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -40,7 +40,8 @@ RDEPEND=">=x11-libs/gtk+-2.4
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	dev-util/intltool"
+	dev-util/intltool
+	dev-util/desktop-file-utils"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
diff --git a/gnome-base/control-center/control-center-2.12.1.ebuild b/gnome-base/control-center/control-center-2.12.1.ebuild
index 1894008594c0..f810059f0d49 100644
--- a/gnome-base/control-center/control-center-2.12.1.ebuild
+++ b/gnome-base/control-center/control-center-2.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.1.ebuild,v 1.1 2005/10/06 02:05:13 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/control-center/control-center-2.12.1.ebuild,v 1.2 2005/10/28 17:21:28 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -40,7 +40,8 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.28
-	>=app-text/gnome-doc-utils-0.3.2"
+	>=app-text/gnome-doc-utils-0.3.2
+	dev-util/desktop-file-utils"
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 USE_DESTDIR="1"
diff --git a/gnome-base/control-center/files/digest-control-center-2.10.0 b/gnome-base/control-center/files/digest-control-center-2.10.0
deleted file mode 100644
index 59d6b969b819..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23ee64b8e559cce4aa6beb70ad675130 control-center-2.10.0.tar.bz2 2617716
diff --git a/gnome-base/control-center/files/digest-control-center-2.10.1-r1 b/gnome-base/control-center/files/digest-control-center-2.10.1-r1
deleted file mode 100644
index 558324993206..000000000000
--- a/gnome-base/control-center/files/digest-control-center-2.10.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d95a5746aa349536dc0f59c61cdaf19f control-center-2.10.1.tar.bz2 2648247