Version bump, remove development versions.

(Portage version: 2.1.10.27/cvs/Linux x86_64)

3 files changed, 24 insertions, 68 deletions

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index fa415d2dcb62..ce09c17b2054 100644
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.16 2011/09/09 17:14:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.17 2011/10/15 22:59:07 pacho Exp $
+
+*clutter-gst-1.4.2 (15 Oct 2011)
+
+  15 Oct 2011; Pacho Ramos <pacho@gentoo.org> -clutter-gst-1.3.12.ebuild,
+  -clutter-gst-1.3.14.ebuild, +clutter-gst-1.4.2.ebuild:
+  Version bump, remove development versions.
 
 *clutter-gst-1.3.14 (09 Sep 2011)
 
diff --git a/media-libs/clutter-gst/clutter-gst-1.3.12.ebuild b/media-libs/clutter-gst/clutter-gst-1.3.12.ebuild
deleted file mode 100644
index d3e87f29caea..000000000000
--- a/media-libs/clutter-gst/clutter-gst-1.3.12.ebuild
+++ /dev/null
@@ -1,51 +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-gst/clutter-gst-1.3.12.ebuild,v 1.2 2011/08/24 07:31:33 nirbheek Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2" # Just a build-time dependency
-GNOME_TARBALL_SUFFIX="xz"
-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
-inherit python gnome2 clutter gnome.org
-
-DESCRIPTION="GStreamer Integration library for Clutter"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.20:2
-	>=media-libs/clutter-1.4.0:1.0[introspection?]
-	>=media-libs/gstreamer-0.10.20:0.10[introspection?]
-	media-libs/gst-plugins-base:0.10[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )"
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-
-DOCS="AUTHORS NEWS README"
-EXAMPLES="examples/{*.c,*.png,README}"
-
-src_prepare() {
-	# XXX: debug default is "minimum" in even releases; "yes" in odd releases
-	G2CONF="${G2CONF}
-		$(use_enable introspection)"
-
-	gnome2_src_prepare
-	python_convert_shebangs 2 "${S}"/scripts/pso2h.py
-}
-
-src_compile() {
-	# Clutter tries to access dri without userpriv
-	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-	shopt -s nullglob
-	local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
-	shopt -u nullglob
-	test -n "${cards}" && addpredict "${cards}"
-
-	emake || die "emake failed"
-}
diff --git a/media-libs/clutter-gst/clutter-gst-1.3.14.ebuild b/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
index f83e806f3060..626f39d7f59b 100644
--- a/media-libs/clutter-gst/clutter-gst-1.3.14.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.3.14.ebuild,v 1.1 2011/09/09 17:14:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.4.2.ebuild,v 1.1 2011/10/15 22:59:07 pacho Exp $
 
-EAPI="3"
+EAPI="4"
+GCONF_DEBUG="yes"
 PYTHON_DEPEND="2" # Just a build-time dependency
-GNOME_TARBALL_SUFFIX="xz"
 CLUTTER_LA_PUNT="yes"
 
 # inherit clutter after gnome2 so that defaults aren't overriden
@@ -15,7 +15,7 @@ DESCRIPTION="GStreamer Integration library for Clutter"
 
 SLOT="1.0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc examples +introspection"
+IUSE="doc examples +introspection"
 
 RDEPEND="
 	>=dev-libs/glib-2.20:2
@@ -27,25 +27,26 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	doc? ( >=dev-util/gtk-doc-1.8 )"
 
-DOCS="AUTHORS NEWS README"
-EXAMPLES="examples/{*.c,*.png,README}"
-
-src_prepare() {
-	# XXX: debug default is "minimum" in even releases; "yes" in odd releases
+pkg_setup() {
+	DOCS="AUTHORS NEWS README"
+	EXAMPLES="examples/{*.c,*.png,README}"
 	G2CONF="${G2CONF}
 		$(use_enable introspection)"
 
+	python_pkg_setup
+}
+
+src_prepare() {
 	gnome2_src_prepare
 	python_convert_shebangs 2 "${S}"/scripts/pso2h.py
+
+	# Remove *_DISABLE_DEPRECATED, bug #385171
+	sed -e 's/-D.*_DISABLE_DEPRECATED//g' \
+		-i clutter-gst/Makefile.am clutter-gst/Makefile.in || die
 }
 
 src_compile() {
-	# Clutter tries to access dri without userpriv
+	# Clutter tries to access dri without userpriv, upstream bug #661873
 	# Massive failure of a hack, see bug 360219, bug 360073, bug 363917
-	shopt -s nullglob
-	local cards=$(echo -n /dev/{dri,ati}/card* /dev/nvidiactl* | sed 's/ /:/g')
-	shopt -u nullglob
-	test -n "${cards}" && addpredict "${cards}"
-
-	emake || die "emake failed"
+	DISPLAY="999invalid" emake
 }