[gentoo-commits] proj/gnome:gnome-next commit in: media-libs/mash/

[gentoo-commits] proj/gnome:gnome-next commit in: media-libs/mash/

[Alexandre Restovtsev]

commit:     c26b1c5bb89f96eb3b5a1254de7dfc650aed4843
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 07:55:36 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 08:28:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c26b1c5b

media-libs/mash: 0.1.0 → 0.2.0

Version bump. Bump the slot version (since the .pc file, library name,
etc. were all renamed from mash-0.1 to mash-0.2), but add a blocker due
to file collisions on documentation. The blocker should be automatically
resolvable via the upcoming gnome-color-manager update.

Also, stop using clutter.eclass; the ebuild was only using it to set
SRC_URI - and to use .xz tarballs, it would have to set SRC_URI manually
anyway.

---
 .../mash/{mash-0.1.0.ebuild => mash-0.2.0.ebuild}  |   28 ++++++++++++++-----
 media-libs/mash/mash-9999.ebuild                   |   26 +++++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/media-libs/mash/mash-0.1.0.ebuild b/media-libs/mash/mash-0.2.0.ebuild
similarity index 61%
rename from media-libs/mash/mash-0.1.0.ebuild
rename to media-libs/mash/mash-0.2.0.ebuild
index 02cafd2..91006df 100644
--- a/media-libs/mash/mash-0.1.0.ebuild
+++ b/media-libs/mash/mash-0.2.0.ebuild
@@ -4,20 +4,24 @@
 
 EAPI="4"
 GCONF_DEBUG="no"
-CLUTTER_LA_PUNT="yes"
+GNOME2_LA_PUNT="yes"
 
-# Inherit clutter after gnome2 to download sources from clutter-project.org
-inherit autotools eutils gnome2 clutter
+# clutter.eclass does not support .xz tarballs
+inherit autotools eutils gnome2 versionator
 if [[ ${PV} = 9999 ]]; then
+	SRC_URI=""
 	EGIT_REPO_URI="git://github.com/clutter-project/mash.git"
 	inherit gnome2-live
+else
+	RV=($(get_version_components))
+	SRC_URI="http://source.clutter-project.org/sources/${PN}/${RV[0]}.${RV[1]}/${P}.tar.xz"
 fi
 
 DESCRIPTION="A library for rendering 3D models with Clutter"
 HOMEPAGE="http://wiki.clutter-project.org/wiki/Mash"
 
 LICENSE="LGPL-2.1"
-SLOT="0.1"
+SLOT="0.2"
 IUSE="doc examples +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -27,18 +31,21 @@ fi
 
 # Automagically detects x11-libs/mx, but only uses it for building examples
 RDEPEND=">=dev-libs/glib-2.16:2
-	>=media-libs/clutter-1.2:1.0[introspection?]
+	>=media-libs/clutter-1.5.10:1.0[introspection?]
 	media-libs/rply
 	virtual/opengl
 
-	introspection? ( >=dev-libs/gobject-introspection-0.6.1 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.6.1 )
+
+	!media-libs/mash:0.1"
+# Block on slot 0.1 due to file collisions in /usr/share/gtk-doc
+# XXX: remove blocker in Oct 2011
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.14 )"
 
 pkg_setup() {
 	DOCS="AUTHORS NEWS README"
-	EXAMPLES="example/{*.c,*.ply}"
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable introspection)"
@@ -51,5 +58,10 @@ src_prepare() {
 }
 
 src_install() {
-	clutter_src_install
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins example/{*.c,*.ply}
+	fi
 }

diff --git a/media-libs/mash/mash-9999.ebuild b/media-libs/mash/mash-9999.ebuild
index 29a5720..91006df 100644
--- a/media-libs/mash/mash-9999.ebuild
+++ b/media-libs/mash/mash-9999.ebuild
@@ -4,20 +4,24 @@
 
 EAPI="4"
 GCONF_DEBUG="no"
-CLUTTER_LA_PUNT="yes"
+GNOME2_LA_PUNT="yes"
 
-# Inherit clutter after gnome2 to download sources from clutter-project.org
-inherit autotools eutils gnome2 clutter
+# clutter.eclass does not support .xz tarballs
+inherit autotools eutils gnome2 versionator
 if [[ ${PV} = 9999 ]]; then
+	SRC_URI=""
 	EGIT_REPO_URI="git://github.com/clutter-project/mash.git"
 	inherit gnome2-live
+else
+	RV=($(get_version_components))
+	SRC_URI="http://source.clutter-project.org/sources/${PN}/${RV[0]}.${RV[1]}/${P}.tar.xz"
 fi
 
 DESCRIPTION="A library for rendering 3D models with Clutter"
 HOMEPAGE="http://wiki.clutter-project.org/wiki/Mash"
 
 LICENSE="LGPL-2.1"
-SLOT="0.1"
+SLOT="0.2"
 IUSE="doc examples +introspection"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
@@ -31,14 +35,17 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	media-libs/rply
 	virtual/opengl
 
-	introspection? ( >=dev-libs/gobject-introspection-0.6.1 )"
+	introspection? ( >=dev-libs/gobject-introspection-0.6.1 )
+
+	!media-libs/mash:0.1"
+# Block on slot 0.1 due to file collisions in /usr/share/gtk-doc
+# XXX: remove blocker in Oct 2011
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.14 )"
 
 pkg_setup() {
 	DOCS="AUTHORS NEWS README"
-	EXAMPLES="example/{*.c,*.css,*.ply}"
 	G2CONF="${G2CONF}
 		--disable-static
 		$(use_enable introspection)"
@@ -51,5 +58,10 @@ src_prepare() {
 }
 
 src_install() {
-	clutter_src_install
+	gnome2_src_install
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins example/{*.c,*.ply}
+	fi
 }