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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

7 files changed, 37 insertions, 199 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/Manifest b/x11-libs/mx/Manifest
index 2067fa404260..d7698275caa4 100644
--- a/x11-libs/mx/Manifest
+++ b/x11-libs/mx/Manifest
@@ -1,12 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mx-1.4.2-gold.patch 1009 SHA256 87daf7170d06e581d8cde3a375cfce3adf03b909b3aeee9c240048a47aece3b9 SHA512 c2b7ed52e39a4bfdf7b50f55a40d3cf6b60d7f253eae250192eec2596e96310575c7ee630cf9d9680eaa3be7d74f4c77f04f1c36dd1d8f5073d3e6ed06938ce6 WHIRLPOOL 04ed6ba832197cfca55b78440778e91a0333dd6d89686bbbbf608252d73730dc3fcc9eb41701253b52fa3f42800aae02386c6e807f6d4b9522fb8bc80675fd46
 AUX mx-1.4.7-gl-types.patch 1730 SHA256 1529d27ecf45dc9073e2e3fef1360c37a63f630b771147d71a407f26d8d036b5 SHA512 bbb2e8fc95b054b23982ff031f6298b2a9addebec557ab234ef88ef6fe67ac4cc1bd35545c73aee162e59113b0c49f8337e5f98efcb997d22a6f4b2410fdbbfe WHIRLPOOL c83e67aac377a5971a08568e332be5f8961e9dfdfa0a53c44646f7394329a54ea15e2fad282706d713d08d28b20c46216e334cd5797267e83099d7bf8644c193
-DIST mx-1.2.1.tar.bz2 1233711 SHA256 51370a475bce658c6448831b973e7160ef25b5012319f77573a4f27eabd1a187 SHA512 76633f1db6907ae0f111d24cfc3e25a43ebf20c3738f4f14cd78af1cf2419f234e911d3c4b3c4cd669a3ad5c3bd428848409081f7c166fee7fcb70e8d65f3a33 WHIRLPOOL 37b0a85898c12cfd80e7fa86cda87d1e2fdce0d3971f3798dc906f23eef1b8e607497521b8ac12fac111598d1489c27c50d06516fe2d41bfdbeb54445943477b
-DIST mx-1.3.1.tar.bz2 1252948 SHA256 1ba018dfd39a44dd0f9d62d95cba9070e8c0b9735ce8531ef7f8a0e4e4a66111 SHA512 7139d86b81fc3ed8850be47a9a0201f1482900ac319f458a43652cfdcf4893a3d1533fd0f83c7d1bf36892b20e693af72ebc8699a8364faf1661e6bc466676bc WHIRLPOOL 62219261dc9b630709145a2ce7cc72bd692121bc532e27a96c1f06f5bda86bf2f2089976096223949834caa247b295ae5ea1cac1d3092c3ac188805dadde9a3f
-DIST mx-1.4.2.tar.bz2 1135098 SHA256 9d40dd48a8e3d098cc75c05163f77305ffb83439783dc91be50681c9502660ce SHA512 2c42d40fad09c29ba3d413804e03fed4c5d7b8a131c35fd73699f01cefc9e6c5b5a6762e2039a2c0671d83a2df0d3f392a33db8dfb55a79c86932d7f744af72d WHIRLPOOL e6844aca1b1aa4c178a17486b77d29c67ca488636074bea935d32acb4cd61e88fee5ffb90e002473be60cc00b592e44bcbafa1a2d8f1513efdbdf9cec1818d40
 DIST mx-1.4.7.tar.xz 939672 SHA256 1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349 WHIRLPOOL bab7df74f07569b06a7793a42980c8fe56c337fae0ee05d752b7382db6c31c086a1388dfedfe628e97902d9cb44514aad9ea1def199ddfe3e866dd63215ff4ea
-EBUILD mx-1.2.1.ebuild 1399 SHA256 d67663326888a4a5a6bbee33f4143dcfc0eb10264f32e39569232c990d98f34d SHA512 6507740463df0ee18ac14117a4eadea62d9cf71d9023ebb5a160e9fc3f25d555daa4d4d3f9fbb895198952d53cfd9a437128be54c0db16cb829a9d1ead333922 WHIRLPOOL 1e86db8b9c0ef52d0544b347f419591ef167b3961a18e2011a0464a7f6cd1a33cc3a550bceb142b78315777a460ce6bd1f5880f7cada0d0f3f2886a0c8f1b28f
-EBUILD mx-1.3.1.ebuild 1399 SHA256 c1fdb62547815a5618237c1444811e5b7f74f3aca1a90e25fdfdd28812a6bdeb SHA512 69cf64158e6a763eea930c1c57fd75c14846a501871090727448e222b3209a2b8a8561c35cb6643adce59187e7c0a26cf6043a5ae676eac60e2889008ef5c09c WHIRLPOOL b7c820228a85f0788d27d36d43e50b47ac1ff216e95c76b6ec268461a74b92937bd2f83f5e08119f05be5ad51e4455ebe7f6449a804df8277c3694e7b741a15b
-EBUILD mx-1.4.2.ebuild 1460 SHA256 a8d5911a1fa774915c71ead7234df00c0d4c2a563e2296973a8291ffc61cf735 SHA512 3ec6a350623825c698e23b643262762da60186e8e726eef9361ec87931877c7fd36a4c6383a8573aa111c6e32b34575a55c8732870e1c5fd7b752a5c284cf21b WHIRLPOOL 9e230cd77c5c98e1ab9a904066391b2fb947744da8765f5ff4661af7c02da96bca9baa88f5fd1e60cb998c2eba6a4f5978ce57a2b185e77f7d37076a103b9437
-EBUILD mx-1.4.7.ebuild 1604 SHA256 163674be62db9417334fd59b38685fdc7c20075683fd69ac9ecd457801aa8707 SHA512 d2d66a739c8ddbd3d8a146af6b183795ad837d98ccc8e9f9315c2bdb42cbb750525d1c83dcc83f5c4995353ea96126b2dae8c0a7641afc389fd05933931bdb3a WHIRLPOOL 163c031690007504fc44e21e6034e3f544338463de8b8df3a816485c48c0acea69c0399812cfde4c9183879b9109538790f003b6cfc6fca0da0fbe8b29557b46
-MISC ChangeLog 1688 SHA256 ca64a7899e1244c06cd94b28aaa1803d4e0cf823f28c59469a76ab1a914e67e4 SHA512 f4466acfe8db19330ba736ed8fecffb91359b80317902546acb5f5dafb487f1c55d40e75592c86c719ff9404afff746a3b43b0a3a5549f194de93084bd7823a3 WHIRLPOOL f06a75b52c089a0b7d5827b4e95ac813db9a73251e4910f4046fa816c1c014fbc09d5ebff95532819049e34c4b43a04e124170ef163cc1eaa96cbba37e9370b7
-MISC metadata.xml 358 SHA256 fe090476594a1a9520817dd1308c7ac91b54b2319ec6ee19dfeae3ca4404e7d2 SHA512 a7fc8ac79b2364f4d7156c13cb10dd2cdf4fde9ab60ec7a9d45c0e78d7551cd4e1970d32bcf5520482f0dd763e3b2c455c1430a44b651085428e4a0121e484aa WHIRLPOOL afce889c60f6adf790a09eb93bf0f5531e8d960d097a3160ccc6cae59359006c79bf77f7bd6ab2238fb8514a1945d671c4a8ef595c81d7ef2ad8310a0c06113f
+EBUILD mx-1.4.7.ebuild 1600 SHA256 78194f3f3a21bddd175e191dd4239c161011e946fd047080a0b055a6d367f15f SHA512 64df5219c551787fae4582095f33e917ca77c7675b0a3ab354382c682a11bd238bf11115e10906c0192a05f2d962083bcca4606e05ab852ce6c2a5038cc2b0d9 WHIRLPOOL 15be9b2feef2d410e5a59e9700f6bed6237db6f916185a7d5dfb390307f89fa3adc4ff8bcddd4f0076763944cfe8e9c4bcfee7845601876c28e7dec62529d1c4
+MISC ChangeLog 1902 SHA256 b6dd04f3be9c7eb07539f07e604bf2d0a5e057d7232171ecd70379c1d347042f SHA512 f2574371b624b0e24ed51814986db5a5b1ecb351aa3b30a015fda291730b2917b97b99a4dcfddd922a03126f42b854e14d2da8dceb2056719715996b8e7c50b2 WHIRLPOOL 45e94d354ec85b7b0b68072cfb0424eeea161d843b6b993447c0e99c263d692a4e56f22f1cc718129cd315b23caa332c72a9c8d391ff2d8d3c719df51a1a005e
+MISC metadata.xml 441 SHA256 0df990730ce555e0e55ff874cbd041fd403a8edba743ec8bc7e53c4fd09980e7 SHA512 7ac8cfb3391759c684b04e1e783923d4b43e571c25683c08f2396c2d5aa9a5f9ba9d86780812cbe5f943a606f2a708abe0abd4562f1630271e1ded89ddb5105c WHIRLPOOL d9519c13cc42bda1c9149c05a0e64cdb5f2fe8ba4b013aacb3e0485e1d9effd22be443a0b60b7430b0d53d99cedad7893fa2785e5165a91ff009fdb052e14fe1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEMPFUACgkQ1fmVwcYIWAbe4wCdEjiA9AA7q4YYlx6pX7zLbQT/
+W5UAoJVHU9zUZdCiXEKaMjqZDH8X09hT
+=kc6G
+-----END PGP SIGNATURE-----
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() {