Add version 1.9.92 for gstreamer-1.0 support. Fix build failure with cogl-1.12 (bug #445982, thanks to Rick Harris). Drop useless doc USE flag. Update to EAPI5.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

8 files changed, 252 insertions, 31 deletions

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index 71d4cb117fe0..2f6a1cc51759 100644
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.32 2012/10/25 20:26:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.33 2012/12/06 00:08:01 tetromino Exp $
+
+*clutter-gst-1.9.92 (06 Dec 2012)
+*clutter-gst-1.6.0-r1 (06 Dec 2012)
+
+  06 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  clutter-gst-1.4.6.ebuild, clutter-gst-1.6.0.ebuild,
+  +clutter-gst-1.6.0-r1.ebuild, +files/clutter-gst-1.6.0-GL_TEXTURE_2D.patch,
+  +files/clutter-gst-1.6.0-gluint.patch, +clutter-gst-1.9.92.ebuild:
+  Add version 1.9.92 for gstreamer-1.0 support. Fix build failure with
+  cogl-1.12 (bug #445982, thanks to Rick Harris). Drop useless doc USE flag.
+  Update to EAPI5.
 
   25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org>
   -clutter-gst-1.0.0.ebuild, -clutter-gst-1.4.4.ebuild,
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 062f0e7da333..31a7c553ecb1 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,18 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX clutter-gst-1.6.0-GL_TEXTURE_2D.patch 1057 SHA256 3389c5afec78645886ec6e1e7574a0def51d35cdb4b1ae1f035888186c758e63 SHA512 5c28ffe8c234c620b9c2c9a7d89aa7c79cb961c4158be781f36807742a62ef9fc35132a9787d35e1042a826bcb2c0fb86fec9b1114992758b10618c7f9c3deb2 WHIRLPOOL d08a916be683b9325bb94bacbdcf1b513f195fc5300f7af059bc37784e50dcf92c7f05d47ef2a9042b6ddbfb1477b85efc5832ad3d963a90b1f88fc0ba6791c2
 AUX clutter-gst-1.6.0-doc-fixes.patch 1322 SHA256 e3f822b0b8c3d3169680330379c9afa931521b57196d08a9ac9e984002db50fd SHA512 c5511318cf12b80858b6e7446a78a88db8f8ae21f882a41959a8e0562662e80c5336c53101fc829e77c3196a09750ba97431143fa3c8b887ee635cd4df8ca43d WHIRLPOOL cced709158d4f8a817957b4cd80acab3a63f1d83846ede880bbaa02632b13df92761cc4cdb3d8b017a5a6ed943b5375b35df20f1ae9008159c569964e78b37e9
 AUX clutter-gst-1.6.0-glint.patch 926 SHA256 56a5e937036dbc3407e23407735fe92db8befa86e380acb2a0f668f696202f4b SHA512 d9a92425df831d4bde3a0dc6ff73c92680b88cffb184703228809e58bef936fed4e679153b7f5436bcdc699fa0b68ffaa6df6ee192d51633e670e5c814b6d21a WHIRLPOOL 1fa6b619cbe5f09fa56abcb514599aa826f6501f25119d7fdd6f50a157d41f9f69efdf1b35eb0d24f9d86ac4e71d11a682bc4dd13c9b961260a8ed63b49e8b7e
+AUX clutter-gst-1.6.0-gluint.patch 1203 SHA256 6c33962355604f97e03b596555c1dc3947763d57eaf1711de3adacd32ef25b66 SHA512 758a82ee95470f287422979671c32ff2c12a3b59b70026b27213716306cb4f4270ec06765924ed253a5482b71bd8c5317f0aee01c73a5683cd512ac4d6055b39 WHIRLPOOL efef99112235361def01cd4a331ffb3dc1d97a5aa6aa62b53962d843b20455337abc266d2a82002bc0e972fa5d49a26675e6b155452fe1242a29f35d9951a390
 DIST clutter-gst-1.4.6.tar.xz 338608 SHA256 5368ded143b2f73c3128315dab7b45c5dd8d681341cbae8f83664d2f9bbba3c3 SHA512 3bc7d3a18af57accde26ad51162a751157dbff706127acd1d2b1075e6d6bb58cdde76e92ed4ad86df0090bcccbeae1243d66810efc8dcd5f2834639a86871669 WHIRLPOOL 5a4c793d55c1ea0c88a829b27e2588b6ec72bb9d41cc10368acef1bbb38b43bcb56b19ca032428e5439bc2f77bfdd6de1d31b694ec9aa777a9c38a4ff23e8e06
 DIST clutter-gst-1.6.0.tar.xz 349332 SHA256 abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622 SHA512 5641326567aea1d5c19f84768a94ee329412e6d4958a980de8ec835ce6eb80794ea5b23cd16f041f3dca3d3fe9f2cf371cedffb16b0522aaa124ca1e50552d97 WHIRLPOOL c79d7ae5e39c5d9b05ff38ba329f428f08c8e44f9f439ef5e5e4a1da6cf72d851c6d6cbb11718eabfd2bb2b04312b6fcba85c3b927d641b914d7d26437a901a2
-EBUILD clutter-gst-1.4.6.ebuild 1551 SHA256 de6abb353d62825a88564f27bf1c3eb4cdaae0852d7d64ad901d8eb28f2c59dd SHA512 44b68b115903a8129db5105bb510cbcb3774f1f35cf81b0e938b545496babc9492999e6e6561e8e5a44c8e0d6eb4c0d6d0291f78d575ea25be5781e4d6dc5759 WHIRLPOOL 61ba431f17e385ce1a2dd6c122b55d1d133af92376be62540a681aa504a1a668e7beb9094a9f27a971eab09f710b2ce8fa8a7ababdd27dfa20f523df8d874bd0
-EBUILD clutter-gst-1.6.0.ebuild 1922 SHA256 3a073de61410f5b57f6f9ed49895e1ada6fc28fa7aced0829bc361e81c1623ec SHA512 df26bd6e0cc3a3de723c46e4a7e41af422e603ccd0d8284b9e20e3f1005a1af92e3c68e965e23aac9f5a8c8edc909ff2bc7ba6ab4bd4525a4d4d9a69a63ad999 WHIRLPOOL 779eac43ff38ec9695e7ae6da1c8aae4632a0082715d49e46e1cb9dfa45e5ea84c03503112e125a5cc23b8b428da67f1c1b03b47c7b0b0abbcd71df66a6fa66e
-MISC ChangeLog 5456 SHA256 41cde866f4ed233760f9029d9ea087776318121433aff1b167d95ef04b4564a7 SHA512 41697a2b9df82cbf6285ff2db17fa6b0de64050176f565804e76562fa165b120eaa08e276b1239c08191619511a5d47cf191adaed2dea18946e9f6d38ff26056 WHIRLPOOL 6262e7c6368066a1f51543081d59cfed94933a192999f170817050bd34ff09de7b19f5f5fb1fc473838ddf70e56abbd50547cd99a58571eeecd3dd758d1b69bf
+DIST clutter-gst-1.9.92.tar.xz 349488 SHA256 5c09dce218f711a44bd4d741e2dd10ffc47e7fcd7b0cf514ca0e92b825c76c45 SHA512 e5c626b478541358bd9cf8a97ff63042dd1679ef7327e407629083e4342433c7fd9d8158887fd9391f8e5b4337981b278a9ec92d07fdbe51f8e331226c939b7d WHIRLPOOL a561bda4c2ec562796fe373b190a60a8b5267bf2498f6f3b7d6d2a91f66f46682322882956b633ac8c180c0b31d5032f4ac8ab188d2a9f28209dbc32701a29ad
+EBUILD clutter-gst-1.4.6.ebuild 1518 SHA256 52d4c98589d24ebedf42ca57a979715fd4d0f0719b48afcab688f669a1de10d6 SHA512 e35fe3e8f5fa973a794cc25c6edd35ce6d2167282c8a49a79f8bc68f5598be7c34a7031406534d5d5f517ebf078a5ff2a40893a7efa5af90a516702656e4e1df WHIRLPOOL 244a7a31457d531583313ada69c2cfa3a0554989d006b87226c889e40e8bb050ce4900ae9b3d03f83953c876befdcfec873377e5d9ec84a54909e213b040af6d
+EBUILD clutter-gst-1.6.0-r1.ebuild 1957 SHA256 bd77fcaf378ef979cdf21aab1f4792434cd3fd19927463fe84184000ccd70fc2 SHA512 6122edb4bcdea9e38f59da49494968c9fdb39ce3f0c72c02c7ef5c58f8736b617245036dbc27ef274a86bfeab1284cce47c61382c1b848558758b83f9d353a7a WHIRLPOOL 63bcc2b9ac5265c350714bfe9590ef28e244893fee88ada9b252d1e7088287722ae96fd2a65f52b17388bed72f9e26627cf5590976f59a16108583a868867a44
+EBUILD clutter-gst-1.6.0.ebuild 1841 SHA256 9a19f523d92808b6d540b54c337f24b50c9327030d00fcc10851cd4c7d521aed SHA512 c9063e0b7595597a1d21e05134fd1c57f145cf48df0cd84aa245083ebdc1049b0f4b00fcd1517a3200c2075600014d82f96a121caac2e6e8ab14d9df66901a84 WHIRLPOOL ae0075b717db5909333520c4d47997a6e02f045b4128b23324082b06ac50ac5ea6f80e4ca1a86e672d743fb052b75f518b0a1231657259c6940b3ad61e6cc24d
+EBUILD clutter-gst-1.9.92.ebuild 2119 SHA256 fea5adcfb77160e04f0fa2192245510ee851f815756fb678e365c3f3ebd44a7c SHA512 0ae4505032082a9ec8d31fe7c3a16c864ae7a65ee60efeaeeabdd380fed612050b317f41455f00bb48c930edb11bac0009c9064973c7dcf554cba9caf99a60c2 WHIRLPOOL 8abb592add5b08bfda63a2722bda2d246550f5d3b8a40ef3d0171a8b9329d426ba07c9a63d46305dcfd87b0ae7a4bf5344b28d26054ddbe637a55365d67b8ba8
+MISC ChangeLog 5961 SHA256 5d59f785f5938fc60bf28994f45b2fbc5e1de652ff2157a5e213a41fc50394bb SHA512 4aedf981a835654e89f872678cc37ee868fdcaa0f1a694df8feeedaa80306080575e4fbfe9b0fdcea8987c487a598f9ce645ed23559e3e0dfcb90d92c378cbf8 WHIRLPOOL 578d9b5f29e5aca9848738c5caa896805c36207ccf7f41df288cb165df5fc55da32561abdc19e5a43e9d3e935198bfb9292e085c9a9dfedd369b314fbbddfd73
 MISC metadata.xml 272 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314 SHA512 f3e9cc433eb6e6475a4281ad4dbb021bd050e00e194e9dd1b7ea619ea55a7f09ea2f4952e1e192e38764aba9260a6b15f06082685def060aa9ac7ead67d97237 WHIRLPOOL ed5cb90610d66f50314f1269b41424aff0990c4ff733c10d2f1424492cd01e4f7de682f1677c15b3e70508fe72dca8d04fccac6282395f0adb27b0df99a307cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCJoHYACgkQ1fmVwcYIWAZ/VgCg3ejr8bip1KP+xPP93XgxytUo
-zkkAn2GZVYHjcfWwYTRCW9uTJYpgSBcj
-=NLEa
+iQEcBAEBCAAGBQJQv+HjAAoJEJ0WA1zPCt1h5b4IAJrwFDrrq72kZsYp8ogcCAel
++S5HHaRNuAubGICKyc5IQxXXXE4jIW6OMaq3oF5E8qp4NGPI+tCy9mvuXcYhKp8Q
+DhPastZN/oMchvxQlO0Qy4gCVPbR6RtLg+syYo/QXVtFUmUutuUSLFcZ+He8qgM1
+Rp5E/teqnHlTk+XGxiSnar5mqc07TArkEQi/fNTuElYu5aKh/BX0/wFDPPTXg+/m
+ej+ueYsHdm9Ee8xCDI9NG2E2x+AktcbSMaM1C0MYx88VRbiRXmdBk+Xc1iVGyX5M
+LK3MdmJx3QCcjLHLmh+D/osPq31bBVKCReH2cacUzhn4n/rk3GaIN68FflaQuMs=
+=yPQy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild b/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild
index d79e9beb1085..ae4963869274 100644
--- a/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild,v 1.6 2012/07/09 14:29:41 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild,v 1.7 2012/12/06 00:08:01 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 CLUTTER_LA_PUNT="yes"
 
@@ -15,30 +15,31 @@ DESCRIPTION="GStreamer Integration library for Clutter"
 
 SLOT="1.0"
 KEYWORDS="~alpha amd64 ~ppc x86"
-IUSE="doc examples +introspection"
+IUSE="examples +introspection"
 
 RDEPEND="
 	>=dev-libs/glib-2.20:2
 	>=media-libs/clutter-1.4.0:1.0[introspection?]
+	media-libs/cogl:1.0=[introspection?]
 	>=media-libs/gstreamer-0.10.26:0.10[introspection?]
 	media-libs/gst-plugins-base:0.10[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-# eautoreconf does *not* need gtk-doc-am, see build/autotools/ directory
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
 
 pkg_setup() {
-	DOCS="AUTHORS NEWS README"
-	EXAMPLES="examples/{*.c,*.png,README}"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
+	DOCS="AUTHORS NEWS README"
+	EXAMPLES="examples/{*.c,*.png,README}"
+	G2CONF="${G2CONF}
+		$(use_enable introspection)"
+
 	# bug #401383, https://bugzilla.gnome.org/show_bug.cgi?id=669054
 	eautoreconf
 
@@ -48,5 +49,6 @@ src_prepare() {
 src_compile() {
 	# Clutter tries to access dri without userpriv, upstream bug #661873
 	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-	DISPLAY="999invalid" emake
+	unset DISPLAY
+	default
 }
diff --git a/media-libs/clutter-gst/clutter-gst-1.6.0-r1.ebuild b/media-libs/clutter-gst/clutter-gst-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..9aed348c5690
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-1.6.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.6.0-r1.ebuild,v 1.1 2012/12/06 00:08:01 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+CLUTTER_LA_PUNT="yes"
+
+# inherit clutter after gnome2 so that defaults aren't overriden
+# inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
+# no PYTHON_DEPEND, python2 is just a build-time dependency
+inherit python gnome2 clutter gnome.org
+
+DESCRIPTION="GStreamer Integration library for Clutter"
+
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+IUSE="examples +introspection"
+
+# FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.6.0:1.0=[introspection?]
+	>=media-libs/cogl-1.8:1.0=[introspection?]
+	>=media-libs/gstreamer-0.10.26:0.10[introspection?]
+	>=media-libs/gst-plugins-bad-0.10.22:0.10
+	media-libs/gst-plugins-base:0.10[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
+DEPEND="${RDEPEND}
+	=dev-lang/python-2*
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS NEWS README"
+	EXAMPLES="examples/{*.c,*.png,README}"
+	G2CONF="${G2CONF}
+		--disable-maintainer-flags
+		$(use_enable introspection)"
+
+	# bug #401383, https://bugzilla.gnome.org/show_bug.cgi?id=669054
+	# FIXME: is this still needed? I don't think so, but not sure. ~nirbheek
+	#eautoreconf
+
+	# In 1.6.1
+	epatch "${FILESDIR}/${P}-glint.patch"
+	epatch "${FILESDIR}/${P}-doc-fixes.patch"
+	# In 1.9.2
+	epatch "${FILESDIR}/${PN}-1.6.0-gluint.patch"
+	epatch "${FILESDIR}/${PN}-1.6.0-GL_TEXTURE_2D.patch"
+
+	gnome2_src_prepare
+}
+
+src_compile() {
+	# Clutter tries to access dri without userpriv, upstream bug #661873
+	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
+	unset DISPLAY
+	default
+}
diff --git a/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild b/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
index ccd24cac5da5..20d67457b5f2 100644
--- a/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild,v 1.4 2012/10/25 20:26:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild,v 1.5 2012/12/06 00:08:01 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 CLUTTER_LA_PUNT="yes"
 
@@ -15,35 +15,34 @@ DESCRIPTION="GStreamer Integration library for Clutter"
 
 SLOT="1.0"
 KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
-IUSE="doc examples +introspection"
+IUSE="examples +introspection"
 
 # FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic
 RDEPEND="
 	>=dev-libs/glib-2.20:2
-	>=media-libs/clutter-1.6.0:1.0[introspection?]
-	>=media-libs/cogl-1.8:1.0[introspection?]
+	>=media-libs/clutter-1.6.0:1.0=[introspection?]
+	>=media-libs/cogl-1.8:1.0=[introspection?]
 	>=media-libs/gstreamer-0.10.26:0.10[introspection?]
 	>=media-libs/gst-plugins-bad-0.10.22:0.10
 	media-libs/gst-plugins-base:0.10[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-# eautoreconf does *not* need gtk-doc-am, see build/autotools/ directory
+	dev-util/gtk-doc-am
+	virtual/pkgconfig"
 
 pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="AUTHORS NEWS README"
 	EXAMPLES="examples/{*.c,*.png,README}"
 	G2CONF="${G2CONF}
 		--disable-maintainer-flags
 		$(use_enable introspection)"
 
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
 	# bug #401383, https://bugzilla.gnome.org/show_bug.cgi?id=669054
 	# FIXME: is this still needed? I don't think so, but not sure. ~nirbheek
 	#eautoreconf
diff --git a/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild b/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild
new file mode 100644
index 000000000000..2f2151a29427
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild,v 1.1 2012/12/06 00:08:01 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+CLUTTER_LA_PUNT="yes"
+
+# inherit clutter after gnome2 so that defaults aren't overriden
+# inherit gnome.org in the end so we use gnome mirrors and get the xz tarball
+# no PYTHON_DEPEND, python2 is just a build-time dependency
+inherit python gnome2 clutter gnome.org
+
+DESCRIPTION="GStreamer Integration library for Clutter"
+
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
+IUSE="examples +introspection"
+
+# FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic
+RDEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.6.0:1.0=[introspection?]
+	>=media-libs/cogl-1.8:1.0=[introspection?]
+	media-libs/gstreamer:1.0[introspection?]
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-base:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	=dev-lang/python-2*
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS NEWS README"
+	EXAMPLES="examples/{*.c,*.png,README}"
+	G2CONF="${G2CONF}
+		--disable-maintainer-flags
+		$(use_enable introspection)"
+
+	# Make doc parallel installable
+	cd "${S}"/doc/reference
+	sed -e "s/\(DOC_MODULE.*=\).*/\1${PN}-${SLOT}/" \
+		-e "s/\(DOC_MAIN_SGML_FILE.*=\).*/\1${PN}-docs-${SLOT}.sgml/" \
+		-i Makefile.am Makefile.in || die
+	sed -e "s/\(<book.*name=\"\)clutter-gst/\1${PN}-${SLOT}/" \
+		-i html/clutter-gst.devhelp2 || die
+	mv clutter-gst-docs{,-${SLOT}}.sgml || die
+	mv clutter-gst-overrides{,-${SLOT}}.txt || die
+	mv clutter-gst-sections{,-${SLOT}}.txt || die
+	mv clutter-gst{,-${SLOT}}.types || die
+	mv html/clutter-gst{,-${SLOT}}.devhelp2
+
+	cd "${S}"
+	gnome2_src_prepare
+}
+
+src_compile() {
+	# Clutter tries to access dri without userpriv, upstream bug #661873
+	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
+	unset DISPLAY
+	default
+}
diff --git a/media-libs/clutter-gst/files/clutter-gst-1.6.0-GL_TEXTURE_2D.patch b/media-libs/clutter-gst/files/clutter-gst-1.6.0-GL_TEXTURE_2D.patch
new file mode 100644
index 000000000000..f5aecede0ffe
--- /dev/null
+++ b/media-libs/clutter-gst/files/clutter-gst-1.6.0-GL_TEXTURE_2D.patch
@@ -0,0 +1,29 @@
+From deec4709404c0c26f8fe57bcd8bf5c04f7b6ed0b Mon Sep 17 00:00:00 2001
+From: Edward Hervey <edward.hervey@collabora.co.uk>
+Date: Wed, 19 Sep 2012 11:01:18 +0200
+Subject: [PATCH] video-sink: Remove usage of GL_TEXTURE_2D
+
+GL header files are no longer exposed, and the Clutter Texture we use
+are always 2D textures.
+---
+ clutter-gst/clutter-gst-video-sink.c | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index f8d3954..b6e4ad0 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -1090,10 +1090,6 @@ clutter_gst_hw_upload (ClutterGstVideoSink * sink, GstBuffer * buffer)
+ 
+     tex = clutter_texture_get_cogl_texture (priv->texture);
+     cogl_texture_get_gl_texture (tex, &gl_texture, &gl_target);
+-    /* GL_TEXTURE_2D is always used in GLES2 */
+-#ifndef COGL_HAS_GLES2
+-    g_return_if_fail (gl_target == GL_TEXTURE_2D);
+-#endif
+ 
+     g_value_init (&value, G_TYPE_UINT);
+     g_value_set_uint (&value, gl_texture);
+-- 
+1.8.0
+
diff --git a/media-libs/clutter-gst/files/clutter-gst-1.6.0-gluint.patch b/media-libs/clutter-gst/files/clutter-gst-1.6.0-gluint.patch
new file mode 100644
index 000000000000..d6bb127788c3
--- /dev/null
+++ b/media-libs/clutter-gst/files/clutter-gst-1.6.0-gluint.patch
@@ -0,0 +1,36 @@
+From b33739b1442f3486e6aef85c5fb1fec312b32f2b Mon Sep 17 00:00:00 2001
+From: Edward Hervey <edward.hervey@collabora.co.uk>
+Date: Wed, 22 Aug 2012 15:23:51 +0200
+Subject: [PATCH] video-sink: Don't use GL* values
+
+And only check for target type if using full GL
+---
+ clutter-gst/clutter-gst-video-sink.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 9b4b53c..8160d14 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -1097,13 +1097,16 @@ clutter_gst_hw_upload (ClutterGstVideoSink *sink,
+ 
+   if (G_UNLIKELY (priv->converter == NULL)) {
+     CoglHandle tex;
+-    GLuint gl_texture;
+-    GLenum gl_target;
++    unsigned int gl_texture;
++    unsigned int gl_target;
+     GValue value = {0};
+ 
+     tex = clutter_texture_get_cogl_texture (priv->texture);
+     cogl_texture_get_gl_texture (tex, &gl_texture, &gl_target);
++    /* GL_TEXTURE_2D is always used in GLES2 */
++#ifndef COGL_HAS_GLES2
+     g_return_if_fail (gl_target == GL_TEXTURE_2D);
++#endif
+ 
+     g_value_init (&value, G_TYPE_UINT);
+     g_value_set_uint (&value, gl_texture);
+-- 
+1.8.0
+