Version bump with various fixes and clutter-1.11 compatibility.

Package-Manager: portage-2.2.0_alpha128/cvs/Linux x86_64

4 files changed, 101 insertions, 19 deletions

diff --git a/x11-libs/mx/ChangeLog b/x11-libs/mx/ChangeLog
index 1d94ae870029..d5b662006794 100644
--- a/x11-libs/mx/ChangeLog
+++ b/x11-libs/mx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/mx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/ChangeLog,v 1.7 2012/07/09 14:31:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/ChangeLog,v 1.8 2012/09/15 07:14:22 tetromino Exp $
+
+*mx-1.4.7 (15 Sep 2012)
+
+  15 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> -mx-1.1.12.ebuild,
+  +mx-1.4.7.ebuild, +files/mx-1.4.7-gl-types.patch:
+  Version bump with various fixes and clutter-1.11 compatibility. Drop old.
 
   09 Jul 2012; Brent Baude <ranger@gentoo.org> mx-1.4.2.ebuild:
   Marking mx-1.4.2 ~ppc for bug 379649
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
index ab9ca8925223..c5c27caf4ec3 100644
--- a/x11-libs/mx/Manifest
+++ b/x11-libs/mx/Manifest
@@ -1,11 +1,26 @@
-AUX mx-1.4.2-gold.patch 1009 RMD160 b12b4700b261ff2269278602620977d981523dfb SHA1 d04c3d2368f3400a84ce1d241c3fc6f4f4018ee4 SHA256 87daf7170d06e581d8cde3a375cfce3adf03b909b3aeee9c240048a47aece3b9
-DIST mx-1.1.12.tar.bz2 1206723 RMD160 0e0832ed3f007e95c7eca7981374ed5c29fe9389 SHA1 f32bb235ff232ec8c254e92fe64a7b4b0adb4fe2 SHA256 6208505e3ef6fb7b770c5044aa9197310c33990647ca84407785758e873a71f4
-DIST mx-1.2.1.tar.bz2 1233711 RMD160 ad2a1b4d3d552f82137b06a18c12424733630a06 SHA1 d4fb27eb76c7d4521613d1261f57975918b0c5df SHA256 51370a475bce658c6448831b973e7160ef25b5012319f77573a4f27eabd1a187
-DIST mx-1.3.1.tar.bz2 1252948 RMD160 4a82e68362228563b141a143fd864ffe5990716f SHA1 f6887155749fa54a25251ba76aee7675eadcd7fa SHA256 1ba018dfd39a44dd0f9d62d95cba9070e8c0b9735ce8531ef7f8a0e4e4a66111
-DIST mx-1.4.2.tar.bz2 1135098 RMD160 619b606392806b741aa1e70236a3e8b951ed5005 SHA1 0b59d4e6c6dd6c7f4f0f49367f61ef90bb32e3f2 SHA256 9d40dd48a8e3d098cc75c05163f77305ffb83439783dc91be50681c9502660ce
-EBUILD mx-1.1.12.ebuild 1405 RMD160 810c778963c76ee7f1374c70d54812338f56c78a SHA1 bc281337b3108bd1c45a1845659d655459565ce7 SHA256 14701c26ef381cdd3c9fc880cc165faad45e4d4c77bd2696ea17ebb5ed2dd947
-EBUILD mx-1.2.1.ebuild 1399 RMD160 d6d0f2ac4b886a43fcbea257d97a46ba31e0550e SHA1 93895e6fc01a5f93286c8749f2b833d624cb9070 SHA256 d67663326888a4a5a6bbee33f4143dcfc0eb10264f32e39569232c990d98f34d
-EBUILD mx-1.3.1.ebuild 1399 RMD160 76dd75ceb07a805c63eeee693490e98a7cb34f26 SHA1 ad5c4c8ab5f9071692c2fa74f872f5b9b0f644d5 SHA256 c1fdb62547815a5618237c1444811e5b7f74f3aca1a90e25fdfdd28812a6bdeb
-EBUILD mx-1.4.2.ebuild 1460 RMD160 aa7079d152be766a2aaeeef43c5aa422aa091b05 SHA1 4661307903aa7102f195be056006e43273e054cd SHA256 a8d5911a1fa774915c71ead7234df00c0d4c2a563e2296973a8291ffc61cf735
-MISC ChangeLog 1163 RMD160 1acf335fa21fb129de1af0f1734c2eb11d8c0371 SHA1 64544ff538824510f1b5ee9881b6721117cfc993 SHA256 49d6fed3db9498475e4bb20af1fc52bdf1309fdd2cd1f96fff4548eebe1535cc
-MISC metadata.xml 358 RMD160 925c4ca51c6f3b902fd56c7b335b6017dcbd8c06 SHA1 557a48b7ef1fb6c51bc6749d95b5d28b8588e4e5 SHA256 fe090476594a1a9520817dd1308c7ac91b54b2319ec6ee19dfeae3ca4404e7d2
+-----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 1590 SHA256 b126748b46c8a377d44832d858ea52496efe50924d0b682230150bc8c610452b SHA512 9a83f86e9f9352b4907eb9d3d5f9a6636e6b026ecf0844dfb728ab7cf0507be4a665f91dc69d853b91e4676d19f9acf3bc391e55f07ad261cd43c0c87ed9a0bd WHIRLPOOL 1a2d7c29995ad0ef70c6a1d0ade5f3d83f8de9972205e94a2051c9251b3a0846ff680bb6cbf96c8613ed3eebb59a28f7452c8c09f68f6e7eeb6873e854b4d461
+MISC ChangeLog 1398 SHA256 84121915f068cd7f245c9eda725ed45fe3bba6120b70c798a9461411179146b2 SHA512 aa1299e3eb0c570b89247f5eb6798279c5bee6d1774c12fab3c23f005ea2628632b815abfc9cc0be268e722a0894a72cefc9acf4645f9fdec579bbac2bcb3c08 WHIRLPOOL ff665c4a1d29f2bf6516846d6decbc574b0e5ab448bc3ed6eb1bd6e79bed159be8e4a468a20de64c84e5a01c1c97ed8c3f7c9e65be6941dd8f1175335bb5f701
+MISC metadata.xml 358 SHA256 fe090476594a1a9520817dd1308c7ac91b54b2319ec6ee19dfeae3ca4404e7d2 SHA512 a7fc8ac79b2364f4d7156c13cb10dd2cdf4fde9ab60ec7a9d45c0e78d7551cd4e1970d32bcf5520482f0dd763e3b2c455c1430a44b651085428e4a0121e484aa WHIRLPOOL afce889c60f6adf790a09eb93bf0f5531e8d960d097a3160ccc6cae59359006c79bf77f7bd6ab2238fb8514a1945d671c4a8ef595c81d7ef2ad8310a0c06113f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQVCreAAoJEJ0WA1zPCt1hvSEH+wSmiiCElTb50Ho8KQpEu0Va
+eK/a/vbUOUgp8kRW2ZNCh8nKVUZaPWm1Q+uH464sduJM9xbO1KTLQzGw9wfsP0g+
+MDerrk8JpaIg6gvtf/NndyaIggMjWloXT6CDTzbCW/tpjsoW0SqBIOlQ3els013O
+EuISc2gxFssyy3hxhangOlxhgBWSFl0NixrH7bjuF+UUP29HEP3HsaQ1VBumR08S
+gteMgD9LSk/5tU2FWx6YPhj3PtY4slVQYeapRcDUJVL5MsBSy4MkZxYEz5esWL/z
+WGWm+1MHEROnwFFmhcKVLvmL7br4zlBvWp0O9h13oaEcbnU9Xz0oMRtseElaKcA=
+=W7qn
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/mx/files/mx-1.4.7-gl-types.patch b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
new file mode 100644
index 000000000000..85c691378d84
--- /dev/null
+++ b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
@@ -0,0 +1,53 @@
+From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001
+From: Brian Pepple <bpepple@fedoraproject.org>
+Date: Sat, 25 Aug 2012 17:41:59 -0400
+Subject: [PATCH] Replace GL data types with equivalent glib types.
+
+---
+ mx/mx-deform-texture.c | 8 ++++----
+ mx/mx-texture-frame.c  | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mx/mx-deform-texture.c b/mx/mx-deform-texture.c
+index 93c54d7..466cc9f 100644
+--- a/mx/mx-deform-texture.c
++++ b/mx/mx-deform-texture.c
+@@ -493,9 +493,9 @@ mx_deform_texture_class_init (MxDeformTextureClass *klass)
+ static void
+ mx_deform_texture_init_arrays (MxDeformTexture *self)
+ {
+-  GLushort *idx, *bf_idx;
++  gushort *idx, *bf_idx;
+   gint x, y, direction;
+-  GLushort *static_indices, *static_bf_indices;
++  gushort *static_indices, *static_bf_indices;
+   MxDeformTexturePrivate *priv = self->priv;
+ 
+   mx_deform_texture_free_arrays (self);
+@@ -503,8 +503,8 @@ mx_deform_texture_init_arrays (MxDeformTexture *self)
+   priv->n_indices = (2 + 2 * priv->tiles_x) *
+                     priv->tiles_y +
+                     (priv->tiles_y - 1);
+-  static_indices = g_new (GLushort, priv->n_indices);
+-  static_bf_indices = g_new (GLushort, priv->n_indices);
++  static_indices = g_new (gushort, priv->n_indices);
++  static_bf_indices = g_new (gushort, priv->n_indices);
+ 
+ #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X)
+ 
+diff --git a/mx/mx-texture-frame.c b/mx/mx-texture-frame.c
+index bde57ff..a88985f 100644
+--- a/mx/mx-texture-frame.c
++++ b/mx/mx-texture-frame.c
+@@ -200,7 +200,7 @@ mx_texture_frame_paint (ClutterActor *self)
+ 
+ 
+   {
+-    GLfloat rectangles[] =
++    gfloat rectangles[] =
+     {
+       /* top left corner */
+       0, 0,
+-- 
+1.7.12
+
diff --git a/x11-libs/mx/mx-1.1.12.ebuild b/x11-libs/mx/mx-1.4.7.ebuild
index 62fb025fe240..c1979cc4fdb7 100644
--- a/x11-libs/mx/mx-1.1.12.ebuild
+++ b/x11-libs/mx/mx-1.4.7.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.1.12.ebuild,v 1.1 2011/08/18 05:23:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/mx/mx-1.4.7.ebuild,v 1.1 2012/09/15 07:14:22 tetromino Exp $
 
 EAPI="4"
-CLUTTER_LA_PUNT="yes"
 
-inherit clutter
+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"
 
 LICENSE="LGPL-2.1"
 SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~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
+	>=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?]
@@ -30,6 +30,7 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
 	startup-notification? ( >=x11-libs/startup-notification-0.9 )"
 DEPEND="${RDEPEND}
+	app-arch/xz-utils
 	>=dev-util/intltool-0.35.0
 	sys-devel/gettext
 	doc? ( >=dev-util/gtk-doc-1.14 )"
@@ -40,6 +41,8 @@ src_prepare() {
 	# Tests are interactive, no use for us
 	sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
 		-i Makefile.am -i Makefile.in || die
+	# In 1.4.8
+	epatch "${FILESDIR}/${P}-gl-types.patch"
 }
 
 src_configure() {
@@ -55,3 +58,8 @@ src_configure() {
 
 	econf ${myconf}
 }
+
+src_install() {
+	default
+	prune_libtool_files
+}