Add cairo[glib] dependency according to bug 365159, remove old

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 22 insertions, 115 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 505259a4db3c..6c1657a4e2e0 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.33 2011/04/26 05:23:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.34 2011/04/29 12:23:52 nirbheek Exp $
+
+  29 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -clutter-1.6.10.ebuild, clutter-1.6.14.ebuild:
+  Add cairo[glib] dependency according to bug 365159, remove old
 
   26 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org> clutter-1.6.10.ebuild,
   clutter-1.6.14.ebuild:
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 159615606e0d..da01116ab3b9 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -2,27 +2,25 @@
 Hash: SHA1
 
 DIST clutter-1.2.14.tar.bz2 2405660 RMD160 2498feed53d78946b6336b501711493d99abfe74 SHA1 bd8f770c3f3b48954652e87a100d2659bee2176d SHA256 f9b7e6b8338662f8b0961579f6ad0f56b6696e65f2f122353fa0390959acc744
-DIST clutter-1.6.10.tar.bz2 5179885 RMD160 f66f3af36cabcd20c781858f931a6c4fb10cfb82 SHA1 046951673654dff3f4fa7ee94430a211a2fdc72f SHA256 3f8f0908f6a39b9f36a6cda6aab0b06ca4e2d95aa9fd4807cd865f20dbaad59e
 DIST clutter-1.6.14.tar.bz2 5213488 RMD160 cb98c765c1185bea043f6a26a363cbce92379310 SHA1 a6039a1d48bc90a387e54a99788786abc3043c05 SHA256 0564e57ca8eb24e76014627c0bb28a80a6c01b620ba14bc4198365562549576d
 EBUILD clutter-1.2.14.ebuild 1783 RMD160 ac19744af1524c10463b0c91e66dbff6fd227e8a SHA1 108fbd832e5f5c1b589fe66134fdf4243aedb396 SHA256 0409fcbec6465414ea08985fdf5494f519a5492556fb174ff551bb91b99c70e1
-EBUILD clutter-1.6.10.ebuild 2543 RMD160 aa810a7787692428e20cc83c6865b17efb458b71 SHA1 f72b59543e1acf34073b2a17d2b187b23591127e SHA256 e13f88fb7001d0c58545808e1887a8a8b40e8b79b93aef27b6bb83bc67ec9460
-EBUILD clutter-1.6.14.ebuild 2216 RMD160 50ef4ad587bf1a7669c211c5d843999a9f8dc27f SHA1 cf45c884ad9daf2daec71a4a38066a788894acaa SHA256 25f6485a8f9bc12b804652d683ec5ebf88b982dc333696312af1c4a9b0f3f702
-MISC ChangeLog 5502 RMD160 1af9970b9d02c2786a604ba414f8dadcc026068a SHA1 960b7e7abfa8aa53c6c27f1b9082d035126a430e SHA256 e4ded5eda8405511029d3b658cfcbeacd58dd6c1ce60a975923f0703c8934308
+EBUILD clutter-1.6.14.ebuild 2222 RMD160 edb693e26674e4cb68ed23c69db523283149afce SHA1 cad0061804cbd649c3ea3e38a9d7b15bf3c26dd3 SHA256 ffa102bcfc785b97756075be1f4d87e794edf54fb1c09772eb75e54ecec69018
+MISC ChangeLog 5671 RMD160 bd83634fb18221511fff21a29881088ef60db8ae SHA1 3082ee4b3af69f410cb0a0a4dbd1662934f312de SHA256 4b4bec460a7d7a647541e4fea0e6b5a2631a738729dd3bcf568814fae5b3e7a3
 MISC metadata.xml 369 RMD160 e3e3636a5afeb148f237e04d5fdbbcd59290d615 SHA1 7d2624a645199395fc46f07da920dc024dc7918e SHA256 32aaa1d48a8c5b7837ada4c3d705d4a4d58280b4454d53cc6ef34f43e0675696
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNtlbDAAoJEO/kOhxWD91kMs4P/jMBx7Jo6MM1QzAI3TDmKFtI
-HEMHspq/nBpxXFijtdR+Lo5M/jgaHBoci1C1QuJFfQ0V/MrwvYfifpm4exf0IJIm
-fKBNgqfzTrOSJW6S4IPKgocR6XsP72WHyP4OUWl6W6i5anLMktsgOeju0RvuTnhU
-f6jDlTm0nMpYYTDZt4YCIEjSZ2gHngA2NWmQeQ9YTpxCUuM9YBVo2Kwt0Nn0CxO/
-WbiWwvxo1wHBiKe4rV+DF43tOzzpkSIgLAMBatQfVxk2P1T+RL3LYHDoVpU3YQlu
-Opy2i3901nXQaOIIe5Bu83sM+KYptsIaqRV2zDmcspKJtx4HwOFByA4+NE3fz3gi
-STzEyvDvd78ZXmItjBh5l84Sviy6/LOcY5dGSiQUBIJkgEmXwHQu3iE4O63YunPt
-3HNxHRuIQCHgo7OnZNDrSEJnTWk4nrftG/OWu6GiHnazz3JUX3vqwFS60cnWt0GP
-+Z0PO/htNRFv+YR4b4IdRHftYeXRkttGT4CP7hA+1EF6k891mRfSDIcTMtpoyRHm
-Ddqzm+3c6FQ6KTm50pcS0CSiq51aFbWdED7aOK3Ypj24s3yvsIT3hivz3kWx/uhI
-lj7rLS8RcRmNdc59vZm/6Be1y4F9S9KJh4qJMvRUGujRrACb5cZGmJRsmeLrk0p0
-YFK5dY+Y4+2AFS6KI4UE
-=YxJH
+iQIcBAEBAgAGBQJNuq3eAAoJEO/kOhxWD91kCekP/jtm4PcV12YUeEIjxfHoQDZQ
+cczbwcfDW1ZaAJTfUGvmrbdkZsmMjRZQqOUcH52FLA5lOtY7fzFb6w0TZ8C74WKP
+Y+sA7nnNdp7/93CBi+EG6QvNZrlpkhXo5lHCI3Vd0EDjmJURunnI8CsFx76+W+gn
+2ajACNXSeHK0pw5wIpvtL8gUG0f0J0o1Sm4WhtZa2Kb/wwzRSh+eoc3FNkJJr7g+
+F0oFjj/AOjR2QULPgZrVllwKqOmWnvYMUgbCUsH+tIWchkSg1wuUe0sN+zvfXaBb
+eN+hIBpmh6gD5K6OZ0vDGmGOt1o9f0oMl7J+l30eDWv77137B0yZhDBC0wpRT5iy
+IZglbzCAAlgG5UmIW7azRY/id+/06iz4xQFrXalV2tymN8gCl45kVUgzg0ii0g2k
+35RBuesFkUhOjRryMtGqxx8YTMrHgXCfSJgK9/4D9spW2Hx3cbPMuuXooZecY8wt
+TBEjlju9/FsxvMJIsNu1ySYk+spx1DrgALSL3miD9pVIssAyA9ApgxMQzMiX3BFD
++r2tnjDTRh0zYhgGIUeRTOqVYOiCCcBZy5uvqAW/eszWL950pwq96Ir2lNGa5Qku
+Y9pRMKBoO10qP9M/FrAuaKVvVoF7+iNxGs3ih4agqO9kJgsiyVfgN2KHN1NqPldc
+bzj5jy8zXLAgQgQ/PlaU
+=d78G
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.6.10.ebuild b/media-libs/clutter/clutter-1.6.10.ebuild
deleted file mode 100644
index 0100d5ef0e32..000000000000
--- a/media-libs/clutter/clutter-1.6.10.ebuild
+++ /dev/null
@@ -1,95 +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-1.6.10.ebuild,v 1.2 2011/04/26 05:23:08 nirbheek Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="1.11"
-[[ ${PV} = 9999 ]] && GIT_ECLASS="autotools git"
-
-inherit clutter ${GIT_ECLASS}
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-IUSE="debug doc +introspection"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_BOOTSTRAP="echo > build/config.rpath
-		gtkdocize
-		cp "${ROOT}/usr/share/gettext/po/Makefile.in.in" po/
-		eautoreconf"
-	EGIT_REPO_URI="git://git.clutter-project.org/${PN}.git"
-	SRC_URI=""
-	KEYWORDS=""
-	DEPEND=">=dev-util/gtk-doc-1.13"
-else
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-fi
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# We always use the gdk-pixbuf backend now since it's been split out
-RDEPEND="${RDEPEND}
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.10
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=dev-libs/atk-1.17[introspection?]
-
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXdamage
-	x11-proto/inputproto
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	|| ( x11-libs/gdk-pixbuf:2
-		 >=x11-libs/gtk+-2.0:2 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-DEPEND="${RDEPEND}
-	${DEPEND}
-	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 )
-"
-DOCS="AUTHORS README NEWS ChangeLog*"
-
-src_configure() {
-	# 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"
-
-	# 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
-	local myconf="
-		--enable-debug=minimum
-		--enable-cogl-debug=minimum
-		--enable-conformance=no
-		--disable-gcov
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-flavour=glx
-		--with-imagebackend=gdk-pixbuf
-		$(use_enable introspection)
-		$(use_enable doc docs)"
-
-	if use debug; then
-		myconf="${myconf}
-			--enable-debug=yes
-			--enable-cogl-debug=yes"
-	fi
-
-	econf ${myconf}
-}
diff --git a/media-libs/clutter/clutter-1.6.14.ebuild b/media-libs/clutter/clutter-1.6.14.ebuild
index c89009dda7a4..6e87ecaafa5e 100644
--- a/media-libs/clutter/clutter-1.6.14.ebuild
+++ b/media-libs/clutter/clutter-1.6.14.ebuild
@@ -1,6 +1,6 @@
 # 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-1.6.14.ebuild,v 1.2 2011/04/26 05:23:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.6.14.ebuild,v 1.3 2011/04/29 12:23:52 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOMAKE="1.11"
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 # We always use the gdk-pixbuf backend now since it's been split out
 RDEPEND="${RDEPEND}
 	>=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.10
+	>=x11-libs/cairo-1.10[glib]
 	>=x11-libs/pango-1.20[introspection?]
 	>=dev-libs/json-glib-0.12[introspection?]
 	>=dev-libs/atk-1.17[introspection?]