Version bump, drop old, stop using clutter.eclass (#486362)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 28 insertions, 48 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index b1571f6f40b2..0389d6b48749 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.87 2014/07/23 15:19:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.88 2014/09/02 10:05:05 pacho Exp $
+
+*clutter-1.18.4 (02 Sep 2014)
+
+  02 Sep 2014; Pacho Ramos <pacho@gentoo.org> +clutter-1.18.4.ebuild,
+  -clutter-1.16.4-r1.ebuild:
+  Version bump, drop old, stop using clutter.eclass (#486362)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> clutter-1.18.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 96c554f0bd77..441bb261a718 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -2,26 +2,16 @@
 Hash: SHA256
 
 AUX clutter-1.16.4-buffer-age.patch 1565 SHA256 e254b26663c88dfba756934f011451c0551e52bb70e2de037835aea267ed7bda SHA512 17c89a67f0d4db00cc0d9bb329b197b3a7ab08d4718d9b832644e482d6849b5dbcc82d494d911bcd39eaed1546c74a30fae23706c543906c41f67088251ec356 WHIRLPOOL 7ed910e52b47c878bfa456f039cb92ca1a3103224163f11575e8580511ed8ecc31e3767195c97a05112a94c8ec99de465ba87ed3d88357097a7631a45b560ad6
-DIST clutter-1.16.4.tar.xz 5224132 SHA256 cf50836ec5503577b73f75f984577610881b3e2ff7a327bb5b6918b431b51b65 SHA512 2629d3dd56af75066a42e71569b5a5bb1bb63c0ce1296d8fca20e04f44a339489f77c071a5afc38c19b8ae5206f69c05c940e865b222f766161d92ed48f144c8 WHIRLPOOL 045d61bb78f4350e5a7c40cbb591253a194361f96916e3aa28318f5560b71fcf838cb0e21e6cf91fe5d19ef19963cc7f82d72888f7b9b67e6cde3115794eece6
 DIST clutter-1.18.2.tar.xz 5215180 SHA256 f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63 SHA512 d7cf0d523dfd95f62910376d3958d50b9fd0debee0fd2e0c7c284500c78b5899fb0bb30dd279c638b4bc1cefaf63af376328f5e1c476d38c34ce4a79bd772b18 WHIRLPOOL e52c97e7c429b2a428e3749e8a6cafb2c9e5174a8437cd1f427b5c24c9df91f911a7ce76614d5131f6e6028504d5b23bf70ccf8b3e9b63a90af5a87329366f19
-EBUILD clutter-1.16.4-r1.ebuild 3096 SHA256 2bd53a0ad0597943da83cf6370c025b9370b62ba6d2b59ea7a7131af6d5b4fa8 SHA512 1aa0de5b800e825c119da8b1aab1bc043db2239945aef034ae8dffeb2617bb3f318a46fd67c9b13ca68d1d11971fd643cdf5f8267644920bfb0243912e0d91a6 WHIRLPOOL 71dcaa5e5a0d1575904c6375c4c50b24548da1005b12c58c0f052b7961c1ad9ca83b52054c63f79b38e10437acbeeb984a95bc9ac94ae9924028f49752ce3c7b
+DIST clutter-1.18.4.tar.xz 5237900 SHA256 4eea1015cd6d4b4945cb5d4a60e52275b0d70e13852d6d99c9abc0cd4deeb60c SHA512 a2ef71c3114cda5861cc88a3c826e6144dc44b8e63a1ece58d2bb7999e731cea612231c1f67af85f2bdddf02bbd80d27e5e35b4867fb378d6698c7b1b654aa62 WHIRLPOOL f03d6aaeca310da29b03b273a0695cd3407a9b76507195a6eca64d60bc4f0de6fac3f01eaf16b71dc1f0e04c0c40dd2e08caeb6dd44d47728ad7ceb2903146e5
 EBUILD clutter-1.18.2.ebuild 2949 SHA256 668b239a5aa49a7440d95083a928910b854cb6bafe34255dab8cdcfa153b35cb SHA512 edf03724607e8893c95fdbd1843f18dd158298df4866cffab8b56122e5481fd96e0b9dd8e299c329b969105634c15eceb72bfb1675ad3361b413ebc3d40e48b9 WHIRLPOOL cd456d0d4cddd1d6f8b79080f6efe6a9ec3f7fea36bf725e03d44b888c242a57a745f333fc1c2522a6bfc77f936bd9af491f5201a678f6e705ee5b6cd7166e3f
-MISC ChangeLog 13861 SHA256 553be170dd15d9434e699675d39f113dc48ca88a50cd442c7de85e886a019cb6 SHA512 ab56268808ebd79e0853e0a59427b9437ff3dc6d93095384f56ecccbd31140739ee8ba1c1e5528506a479a608272d9eed1630def86817293a8e4e6462f7edf4c WHIRLPOOL f62a8197f4cf9db296f224fbadd6f993010ddfa0560204b7041135a94d95d77d6b4a06bce6eb39107a0bc4c90d250cb354d208958e705aa77f57eda277961d94
+EBUILD clutter-1.18.4.ebuild 2817 SHA256 0022e5ed06da9e3eca189a3959cb8e713483e7fea3e4349f656af0fff7fa4528 SHA512 be919abcdfe7c1d7c9df31e2bdf7f1040c3c8edc785f96984e7af94c36917ee130e8446425d2372386e2f058d2147a2ff478ceb0ae8fc0898b98bd44168ae894 WHIRLPOOL 7ef836d41d3eb924220ee29cbd919b54c69007b5c7355d8d3802ca6c88cc54d175ebf229314665aa71ce4770445ff1cc667cff6a6670348f96d8c0b03cfcee67
+MISC ChangeLog 14056 SHA256 b548d47156d30520f84d50b22937141ee3e2b9b689f88776df625d6c73cba97b SHA512 6ef22c0cec690e74e57603afaae9cbae7eb5777dfae74d9ab2eabd9caf5b1ea0b3c70c7656d24b7a928d4a16a270a0cb72edf153ecf5042522739473991a5ffe WHIRLPOOL fb1e1d2669950afd70e1f1e46d57c7b621bdbf3f65c89ed30c66aa8c6c84e1c829b0ab0223bb77025d18961c8679d499a318f11708e65e1e8deb385f52014d43
 MISC metadata.xml 277 SHA256 7eb2ab11288fed65f3083eb88772f16ee9be5eb9d955aac3fdec7a22844e23b8 SHA512 b00a33228a347399f5ca4196f8c246663034543aaf2d6a285f33fb7c01ffed1304205e4316656177a28a730640b48b92290f84138cf2631ed8606c4320f3c372 WHIRLPOOL 7673455902c0e45cdc27b25661eecf106d65973590b6b82af90911a60d8f865b03ebb8e0f1292e23027b21f4c78dcc00d4abb9b47dc23785f5d60c9ef0c5ae22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9JsAAoJELp701BxlEWfKI8QAKqTJC1aoMVx/4RGNSPWdsZM
-XRU0AjXgXpaHAGsof6mTQYyTOZoVu8bqGoSOE896IcFKNkRhAiOBKy0bjF3zj8Ot
-JlULl1Zep1OGcFlcXS3SP0DfMxcOodMh/IIxDBj0y8k+2/rXIF+ScuUd7nEt2XhV
-d4VVjdCbfOPDrH+LwAFfckk3aBt05roDK8maik+Znxb8OnyFhGMWk/QA7W+hJk3Q
-3tkx4kU6vxeNJ3LqGfZR/7cjztlJxGlcoEgDz/S2IyCK3GrNDyM1zyLSfRb+Amxv
-g7zADICt+vkE9spiXWe7wQSJefRJTuL1VhUmEy8HOO0rAfC225ZtgytviDb/erj4
-o7YnsyCNU3Y8HhiChpetwkMhWtaxMFTb2JSTElwUUfBHhAiNEdsCfiWjhmIbN/lA
-CduxHzagc4oZi/3++uPVPGGAoltR4ddhp0/WE5pGzv504CBBfUOsM/vOtkO4U8Nm
-3YKazYefFnQExC/AhPMkzTCiwDnQ5cp56Wib494KBQZEqj89Gi9p3AYMHAdZ33fY
-pTb4xVHwXOYtZ0RfAaCjL+CVmwlVWf4qj8/WX5ZxfnRRmegG9moV7PMtp6jZntb0
-nBBLX3eif4BF4OzSOKPLdqhH6yk9PIKqaNb5OALWCpRhNpEzBQ/To4XXQ36VvYcP
-7TXdmxGnePCjPQiRPiJq
-=3Goe
+iEYEAREIAAYFAlQFllIACgkQCaWpQKGI+9Q7LQCghtEcay6gqy31TQ5Zwe4rOaMv
+XdMAnj46l7afFv0+Ts2jQx9RZphK0EDv
+=iCx9
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.16.4-r1.ebuild b/media-libs/clutter/clutter-1.18.4.ebuild
index 47b908d27433..c053f99fc6f6 100644
--- a/media-libs/clutter/clutter-1.16.4-r1.ebuild
+++ b/media-libs/clutter/clutter-1.18.4.ebuild
@@ -1,31 +1,32 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.16.4-r1.ebuild,v 1.3 2014/03/09 12:02:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.18.4.ebuild,v 1.1 2014/09/02 10:05:05 pacho Exp $
 
 EAPI="5"
-CLUTTER_LA_PUNT="yes"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-# Inherit gnome2 after clutter to download sources from gnome.org
-# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter eutils gnome2 virtualx
+inherit gnome2 virtualx
 
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
 
 LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
 IUSE="debug doc gtk +introspection test" # evdev tslib
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 # NOTE: glx flavour uses libdrm + >=mesa-7.3
 # XXX: uprof needed for profiling
 # >=libX11-1.3.1 needed for X Generic Event support
+# XXX: evdev input requires libinput and gudev >= 136
 RDEPEND="
 	>=dev-libs/glib-2.37.3:2
 	>=dev-libs/atk-2.5.3[introspection?]
 	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.15.9:1.0=[introspection?,pango]
+	>=media-libs/cogl-1.17.5:1.0=[introspection?,pango]
 	media-libs/fontconfig
-	>=x11-libs/cairo-1.10:=[glib]
+	>=x11-libs/cairo-1.12:=[glib]
 	>=x11-libs/pango-1.30[introspection?]
 
 	virtual/opengl
@@ -41,35 +42,30 @@ RDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
+	>=dev-util/gtk-doc-am-1.20
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.17
 	doc? (
-		>=dev-util/gtk-doc-1.15
+		>=dev-util/gtk-doc-1.20
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
 		dev-libs/libxslt )
 	test? ( x11-libs/gdk-pixbuf )"
 
 # Tests fail with both swrast and llvmpipe
 # They pass under r600g or i965, so the bug is in mesa
-RESTRICT="test"
+#RESTRICT="test"
 
 src_prepare() {
 	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility data conform/g' \
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
 		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility data conform/g' \
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
 		-i tests/Makefile.in || die "in tests sed failed"
 
-	# Fix buffer_age code path, bug #503560
-	epatch "${FILESDIR}/${P}-buffer-age.patch"
-
 	gnome2_src_prepare
 }
 
 src_configure() {
-	DOCS="README NEWS ChangeLog*"
-
 	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
 	# (GLX error blabla)
 	# XXX: Profiling, coverage disabled for now
@@ -92,21 +88,9 @@ src_configure() {
 		$(use_enable doc docs) \
 		$(use_enable gtk gdk-backend) \
 		$(use_enable introspection) \
-		$(use_enable test conformance) \
 		$(use_enable test gdk-pixbuf)
 }
 
-src_compile() {
-	default
-	if use test; then
-		emake -C tests/conform
-	fi
-}
-
 src_test() {
-	Xemake check
-}
-
-src_install() {
-	clutter_src_install
+	Xemake check -C tests/conform
 }