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

[Alexandre Restovtsev]

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

media-libs/mash: 0.2.0-r1 moved to gx86 + qa

---
 media-libs/mash/mash-0.2.0-r1.ebuild |   62 ----------------------------------
 media-libs/mash/mash-9999.ebuild     |    8 +---
 2 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/media-libs/mash/mash-0.2.0-r1.ebuild b/media-libs/mash/mash-0.2.0-r1.ebuild
deleted file mode 100644
index b44acf0..0000000
--- a/media-libs/mash/mash-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-# 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.2"
-IUSE="doc examples +introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-# Automagically detects x11-libs/mx, but only uses it for building examples.
-# Note: mash is using a bundled copy of rply because mash developers have
-# modified its API by adding extra arguments to various functions.
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=media-libs/clutter-1.5.10:1.0[introspection?]
-	virtual/opengl
-
-	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"
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)"
-}
-
-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 b44acf0..c69244c 100644
--- a/media-libs/mash/mash-9999.ebuild
+++ b/media-libs/mash/mash-9999.ebuild
@@ -7,7 +7,7 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 # clutter.eclass does not support .xz tarballs
-inherit autotools eutils gnome2 versionator
+inherit gnome2 versionator
 if [[ ${PV} = 9999 ]]; then
 	SRC_URI=""
 	EGIT_REPO_URI="git://github.com/clutter-project/mash.git"
@@ -36,11 +36,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
 	>=media-libs/clutter-1.5.10:1.0[introspection?]
 	virtual/opengl
 
-	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
+	introspection? ( >=dev-libs/gobject-introspection-0.6.1 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.14 )"