[gentoo-commits] proj/gnome:master commit in: media-libs/clutter/

[Alexandre Restovtsev]

commit:     714ac3c42cd04074f50e1211c0fe4040d464c766
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:37:47 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:37:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=714ac3c4

media-libs/clutter: moved 1.8.2 to gx86 + qa

Add missing gdk-pixbuf dep.

---
 media-libs/clutter/clutter-1.8.2.ebuild |   93 -------------------------------
 media-libs/clutter/clutter-9999.ebuild  |    3 +-
 2 files changed, 2 insertions(+), 94 deletions(-)

diff --git a/media-libs/clutter/clutter-1.8.2.ebuild b/media-libs/clutter/clutter-1.8.2.ebuild
deleted file mode 100644
index 7194721..0000000
--- a/media-libs/clutter/clutter-1.8.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-9999.ebuild,v 1.3 2011/02/21 20:56:53 nirbheek Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-WANT_AUTOMAKE="1.11"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-IUSE="debug doc +introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# XXX: uprof needed for profiling
-# >=libX11-1.3.1 needed for X Generic Event support
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/atk-2.1.5[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.8.0:1.0[introspection?,pango]
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.10[glib]
-	>=x11-libs/pango-1.20[introspection?]
-	
-	virtual/opengl
-	x11-libs/libdrm
-	>=x11-libs/libX11-1.3.1
-	x11-libs/libXext
-	x11-libs/libXdamage
-	x11-proto/inputproto
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )"
-
-pkg_setup() {
-	DOCS="README NEWS ChangeLog*"
-
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
-	#      Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
-	myconf="--enable-debug=minimum"
-	use debug && myconf="--enable-debug=yes"
-	G2CONF="${G2CONF} ${myconf}
-		--enable-conformance=no
-		--disable-gcov
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-flavour=glx
-		$(use_enable introspection)
-		$(use_enable doc docs)"
-}
-
-src_prepare() {
-	# Some gettext stuff, we can't run gettextize because that does too much
-	[[ ${PV} = 9999 ]] && cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" "${S}/po"
-
-	gnome2_src_prepare
-
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-}
-
-src_install() {
-	clutter_src_install
-}

diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index 7194721..0b1112f 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -33,8 +33,9 @@ RDEPEND="
 	>=media-libs/cogl-1.8.0:1.0[introspection?,pango]
 	media-libs/fontconfig
 	>=x11-libs/cairo-1.10[glib]
+	x11-libs/gdk-pixbuf:2
 	>=x11-libs/pango-1.20[introspection?]
-	
+
 	virtual/opengl
 	x11-libs/libdrm
 	>=x11-libs/libX11-1.3.1