7 files changed, 17 insertions, 79 deletions
diff --git a/gnome-extra/gcursor/ChangeLog b/gnome-extra/gcursor/ChangeLog
index 24c207e63a2d..bbc2786b852e 100644
--- a/gnome-extra/gcursor/ChangeLog
+++ b/gnome-extra/gcursor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gcursor
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcursor/ChangeLog,v 1.8 2007/02/09 03:20:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcursor/ChangeLog,v 1.9 2007/02/12 18:40:46 drac Exp $
+
+  12 Feb 2007; Samuli Suominen <drac@gentoo.org> metadata.xml,
+  gcursor-0.061-r1.ebuild:
+  From gnome to desktop-misc. Fix HOMEPAGE, remove empty lines, clean up.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/gnome-extra/gcursor/files/digest-gcursor-0.06 b/gnome-extra/gcursor/files/digest-gcursor-0.06
deleted file mode 100644
index 01c664ed2bd8..000000000000
--- a/gnome-extra/gcursor/files/digest-gcursor-0.06
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80cb9f3da98b595d298731aafc6c1384 gcursor-0.06.tar.gz 142932
-RMD160 4b3fbf4ee0384bb41a36b083da0fd59aba3e80d0 gcursor-0.06.tar.gz 142932
-SHA256 37aa5eba9d2581a777eaa779de825cee49aa9abbd1372220511f89d817b8c9fb gcursor-0.06.tar.gz 142932
diff --git a/gnome-extra/gcursor/files/digest-gcursor-0.061 b/gnome-extra/gcursor/files/digest-gcursor-0.061
deleted file mode 100644
index e27b8c9974dd..000000000000
--- a/gnome-extra/gcursor/files/digest-gcursor-0.061
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 233810996bc7f69879f8978c523ae723 gcursor-0.061.tar.gz 143719
-RMD160 531d3c14468d371e2bc07952610cf164f3001a7a gcursor-0.061.tar.gz 143719
-SHA256 c4f71ac3ea3c4e18906aa5a8b6c60116e19863ca6404bbfe10d78abb319b5aae gcursor-0.061.tar.gz 143719
diff --git a/gnome-extra/gcursor/gcursor-0.06.ebuild b/gnome-extra/gcursor/gcursor-0.06.ebuild
deleted file mode 100644
index d056d64b8ae0..000000000000
--- a/gnome-extra/gcursor/gcursor-0.06.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcursor/gcursor-0.06.ebuild,v 1.5 2005/01/31 15:02:52 gustavoz Exp $
-
-inherit gnome2
-
-DESCRIPTION="An X11 mouse cursor theme selector"
-HOMEPAGE="http://qballcow.nl/?s=14"
-SRC_URI="http://download.qballcow.nl/programs/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	>=app-arch/file-roller-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12"
-
-DOCS="AUTHORS ChangeLog TODO"
-
diff --git a/gnome-extra/gcursor/gcursor-0.061-r1.ebuild b/gnome-extra/gcursor/gcursor-0.061-r1.ebuild
index a32620815ea8..043293ce7fab 100644
--- a/gnome-extra/gcursor/gcursor-0.061-r1.ebuild
+++ b/gnome-extra/gcursor/gcursor-0.061-r1.ebuild
@@ -1,37 +1,33 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcursor/gcursor-0.061-r1.ebuild,v 1.2 2005/04/19 20:08:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcursor/gcursor-0.061-r1.ebuild,v 1.3 2007/02/12 18:40:46 drac Exp $
 
 inherit gnome2 eutils
 
-DESCRIPTION="An X11 mouse cursor theme selector"
-HOMEPAGE="http://qballcow.nl/?s=14"
+DESCRIPTION="GTK+ based xcursor theme selector"
+HOMEPAGE="http://download.qballcow.nl/programs/gcursor"
 SRC_URI="http://download.qballcow.nl/programs/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
-IUSE=""
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ia64"
+IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/gtk+-2
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	>=app-arch/file-roller-2"
-
+	>=gnome-base/gconf-2"
 DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12"
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
 
 DOCS="AUTHORS ChangeLog TODO"
 
 src_unpack() {
-
 	unpack ${A}
-	# Use xorg-x11 cursors path, instead of xfree,
-	# see bug #83450
+	# Use xorg-x11 cursors path, bug 83450
 	epatch ${FILESDIR}/gcursor-0.6-xorg-x11.patch
-
 }
-
diff --git a/gnome-extra/gcursor/gcursor-0.061.ebuild b/gnome-extra/gcursor/gcursor-0.061.ebuild
deleted file mode 100644
index 67ccb19bfb23..000000000000
--- a/gnome-extra/gcursor/gcursor-0.061.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcursor/gcursor-0.061.ebuild,v 1.2 2005/01/31 15:02:52 gustavoz Exp $
-
-inherit gnome2
-
-DESCRIPTION="An X11 mouse cursor theme selector"
-HOMEPAGE="http://qballcow.nl/?s=14"
-SRC_URI="http://download.qballcow.nl/programs/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gconf-2
-	>=app-arch/file-roller-2"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12"
-
-DOCS="AUTHORS ChangeLog TODO"
-
diff --git a/gnome-extra/gcursor/metadata.xml b/gnome-extra/gcursor/metadata.xml
index da6fd63d0085..40838bc36783 100644
--- a/gnome-extra/gcursor/metadata.xml
+++ b/gnome-extra/gcursor/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+<herd>desktop-misc</herd>
 </pkgmetadata>