Fix USE=debug doing nothing. Simplify ebuild. Clean up old revisions.

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key C6085806)

6 files changed, 24 insertions, 190 deletions

diff --git a/x11-libs/mx/ChangeLog b/x11-libs/mx/ChangeLog
index 1e5eb631d139..56f6813edaad 100644
--- a/x11-libs/mx/ChangeLog
+++ b/x11-libs/mx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/mx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/ChangeLog,v 1.11 2013/01/06 11:20:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/ChangeLog,v 1.12 2013/02/01 22:06:12 eva Exp $
+
+  01 Feb 2013; Gilles Dartiguelongue <eva@gentoo.org> -mx-1.2.1.ebuild,
+  -mx-1.3.1.ebuild, -mx-1.4.2.ebuild, mx-1.4.7.ebuild, metadata.xml:
+  Fix USE=debug doing nothing. Simplify ebuild. Clean up old revisions.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> mx-1.4.7.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
index 3271177936c4..819f47669909 100644
--- a/x11-libs/mx/metadata.xml
+++ b/x11-libs/mx/metadata.xml
@@ -8,4 +8,7 @@
 		<flag name="glade">Build the <pkg>dev-util/glade</pkg> catalog
 			files</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">clutter-project/mx</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/mx/mx-1.2.1.ebuild b/x11-libs/mx/mx-1.2.1.ebuild
deleted file mode 100644
index 6e166f0b318c..000000000000
--- a/x11-libs/mx/mx-1.2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/mx-1.2.1.ebuild,v 1.1 2011/09/15 22:10:39 eva Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-
-inherit clutter
-
-DESCRIPTION="A widget toolkit using Clutter"
-HOMEPAGE="http://clutter-project.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug doc glade +gtk +introspection startup-notification"
-
-RDEPEND="
-	>=dev-libs/glib-2.26.0:2
-	>=media-libs/clutter-1.4.0:1.0
-	>=x11-apps/xrandr-1.2.0
-
-	x11-libs/gdk-pixbuf:2[introspection?]
-
-	dbus? ( >=dev-libs/dbus-glib-0.82 )
-	glade? (
-		>=dev-util/glade-3.4.5:3
-		<dev-util/glade-3.9.1:3 )
-	gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	startup-notification? ( >=x11-libs/startup-notification-0.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-
-DOCS="ChangeLog NEWS README"
-
-src_prepare() {
-	# Tests are interactive, no use for us
-	sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
-		-i Makefile.am -i Makefile.in || die
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--enable-maintainer-flags=no
-		--with-winsys=x11
-		$(use_enable gtk gtk-widgets)
-		$(use_enable introspection)
-		$(use_with dbus)
-		$(use_with glade)
-		$(use_with startup-notification)"
-
-	econf ${myconf}
-}
diff --git a/x11-libs/mx/mx-1.3.1.ebuild b/x11-libs/mx/mx-1.3.1.ebuild
deleted file mode 100644
index 5f3ee8fab927..000000000000
--- a/x11-libs/mx/mx-1.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/mx-1.3.1.ebuild,v 1.1 2011/09/15 22:10:39 eva Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-
-inherit clutter
-
-DESCRIPTION="A widget toolkit using Clutter"
-HOMEPAGE="http://clutter-project.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug doc glade +gtk +introspection startup-notification"
-
-RDEPEND="
-	>=dev-libs/glib-2.26.0:2
-	>=media-libs/clutter-1.4.0:1.0
-	>=x11-apps/xrandr-1.2.0
-
-	x11-libs/gdk-pixbuf:2[introspection?]
-
-	dbus? ( >=dev-libs/dbus-glib-0.82 )
-	glade? (
-		>=dev-util/glade-3.4.5:3
-		<dev-util/glade-3.9.1:3 )
-	gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	startup-notification? ( >=x11-libs/startup-notification-0.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-
-DOCS="ChangeLog NEWS README"
-
-src_prepare() {
-	# Tests are interactive, no use for us
-	sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
-		-i Makefile.am -i Makefile.in || die
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--enable-maintainer-flags=no
-		--with-winsys=x11
-		$(use_enable gtk gtk-widgets)
-		$(use_enable introspection)
-		$(use_with dbus)
-		$(use_with glade)
-		$(use_with startup-notification)"
-
-	econf ${myconf}
-}
diff --git a/x11-libs/mx/mx-1.4.2.ebuild b/x11-libs/mx/mx-1.4.2.ebuild
deleted file mode 100644
index 1855550224ca..000000000000
--- a/x11-libs/mx/mx-1.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/mx-1.4.2.ebuild,v 1.5 2012/07/09 14:31:47 ranger Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-
-inherit clutter eutils
-
-DESCRIPTION="A widget toolkit using Clutter"
-HOMEPAGE="http://clutter-project.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="dbus debug doc glade +gtk +introspection startup-notification"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=media-libs/clutter-1.7.91:1.0
-	>=x11-apps/xrandr-1.2.0
-
-	x11-libs/gdk-pixbuf:2[introspection?]
-
-	dbus? ( >=dev-libs/dbus-glib-0.82 )
-	glade? (
-		>=dev-util/glade-3.4.5:3
-		<dev-util/glade-3.9.1:3 )
-	gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	startup-notification? ( >=x11-libs/startup-notification-0.9 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-
-DOCS="ChangeLog NEWS README"
-
-src_prepare() {
-	# Tests are interactive, no use for us
-	sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
-		-i Makefile.am -i Makefile.in || die
-	epatch "${FILESDIR}"/${P}-gold.patch
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--enable-maintainer-flags=no
-		--with-winsys=x11
-		$(use_enable gtk gtk-widgets)
-		$(use_enable introspection)
-		$(use_with dbus)
-		$(use_with glade)
-		$(use_with startup-notification)"
-
-	econf ${myconf}
-}
diff --git a/x11-libs/mx/mx-1.4.7.ebuild b/x11-libs/mx/mx-1.4.7.ebuild
index eb28bd2f1fdd..aa02dc6ade90 100644
--- a/x11-libs/mx/mx-1.4.7.ebuild
+++ b/x11-libs/mx/mx-1.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/mx-1.4.7.ebuild,v 1.4 2013/01/06 11:20:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/mx-1.4.7.ebuild,v 1.5 2013/02/01 22:06:12 eva Exp $
 
 EAPI="4"
 
@@ -8,12 +8,12 @@ inherit eutils
 
 DESCRIPTION="A widget toolkit using Clutter"
 HOMEPAGE="http://clutter-project.org/"
-SRC_URI="https://github.com/downloads/clutter-project/${PN}/${P}.tar.xz"
+SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus debug doc glade +gtk +introspection startup-notification"
+IUSE="dbus debug glade +gtk +introspection startup-notification"
 
 RDEPEND="
 	>=dev-libs/glib-2.28.0:2
@@ -31,11 +31,11 @@ RDEPEND="
 	startup-notification? ( >=x11-libs/startup-notification-0.9 )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
+	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.35.0
 	sys-devel/gettext
-	doc? ( >=dev-util/gtk-doc-1.14 )"
-
-DOCS="ChangeLog NEWS README"
+	virtual/pkgconfig
+"
 
 src_prepare() {
 	# Tests are interactive, no use for us
@@ -46,17 +46,16 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
-
-	myconf="--enable-maintainer-flags=no
-		--with-winsys=x11
-		$(use_enable gtk gtk-widgets)
-		$(use_enable introspection)
-		$(use_with dbus)
-		$(use_with glade)
-		$(use_with startup-notification)"
-
-	econf ${myconf}
+	econf \
+		--disable-maintainer-flags \
+		--disable-silent-rules \
+		--with-winsys=x11 \
+		$(use_enable gtk gtk-widgets) \
+		$(use_enable introspection) \
+		$(use_enable debug) \
+		$(use_with dbus) \
+		$(use_with glade) \
+		$(use_with startup-notification)
 }
 
 src_install() {