Version bump. Cosmetic description fix. Drop old.

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

6 files changed, 93 insertions, 70 deletions

diff --git a/media-libs/clutter-gst/ChangeLog b/media-libs/clutter-gst/ChangeLog
index 73f7bbf00823..437707fe8957 100644
--- a/media-libs/clutter-gst/ChangeLog
+++ b/media-libs/clutter-gst/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/clutter-gst
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.37 2013/01/06 09:46:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/ChangeLog,v 1.38 2013/01/23 04:53:18 tetromino Exp $
+
+*clutter-gst-2.0.0 (23 Jan 2013)
+
+  23 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  clutter-gst-1.4.6.ebuild, -clutter-gst-1.6.0.ebuild,
+  clutter-gst-1.6.0-r1.ebuild, clutter-gst-1.9.92.ebuild,
+  +clutter-gst-2.0.0.ebuild:
+  Version bump. Cosmetic description fix. Drop old.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> clutter-gst-1.6.0-r1.ebuild,
   clutter-gst-1.9.92.ebuild:
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 ae4963869274..26ffef64a1fc 100644
--- a/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.7 2012/12/06 00:08:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.4.6.ebuild,v 1.8 2013/01/23 04:53:18 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ CLUTTER_LA_PUNT="yes"
 # no PYTHON_DEPEND, python2 is just a build-time dependency
 inherit autotools python gnome2 clutter gnome.org
 
-DESCRIPTION="GStreamer Integration library for Clutter"
+DESCRIPTION="GStreamer integration library for Clutter"
 
 SLOT="1.0"
 KEYWORDS="~alpha amd64 ~ppc x86"
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
index 4aa14d42bbd3..642cf5b90ebe 100644
--- a/media-libs/clutter-gst/clutter-gst-1.6.0-r1.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.6.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4 2013/01/06 09:46:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.6.0-r1.ebuild,v 1.5 2013/01/23 04:53:18 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ CLUTTER_LA_PUNT="yes"
 # no PYTHON_DEPEND, python2 is just a build-time dependency
 inherit python gnome2 clutter gnome.org
 
-DESCRIPTION="GStreamer Integration library for Clutter"
+DESCRIPTION="GStreamer integration library for Clutter"
 
 SLOT="1.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild b/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
deleted file mode 100644
index 977c4c48fe3b..000000000000
--- a/media-libs/clutter-gst/clutter-gst-1.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.6 2012/12/19 03:02:32 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 ~ppc ~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"
-
-	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.9.92.ebuild b/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild
index 01ffd81930c3..f0edc9b0b15c 100644
--- a/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.4 2013/01/06 09:46:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-1.9.92.ebuild,v 1.5 2013/01/23 04:53:18 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ CLUTTER_LA_PUNT="yes"
 # no PYTHON_DEPEND, python2 is just a build-time dependency
 inherit python gnome2 clutter gnome.org
 
-DESCRIPTION="GStreamer Integration library for Clutter"
+DESCRIPTION="GStreamer integration library for Clutter"
 
 SLOT="2.0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild b/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild
new file mode 100644
index 000000000000..7dacde883405
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter-gst/clutter-gst-2.0.0.ebuild,v 1.1 2013/01/23 04:53:18 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples +introspection"
+
+# FIXME: Support for gstreamer-basevideo-0.10 (HW decoder support) is automagic
+COMMON_DEPEND="
+	>=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 )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gst-plugins-good:1.0
+"
+DEPEND="${COMMON_DEPEND}
+	>=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}"
+
+	# 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_configure() {
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		$(use_enable introspection)
+}
+
+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
+}