From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R87ZG-0001WW-JV for garchives@archives.gentoo.org; Mon, 26 Sep 2011 09:33:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2AE321C03D; Mon, 26 Sep 2011 09:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7ED6C21C03D for ; Mon, 26 Sep 2011 09:33:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EA72E1B401A for ; Mon, 26 Sep 2011 09:33:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 38C5880048 for ; Mon, 26 Sep 2011 09:33:32 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: Subject: [gentoo-commits] proj/gnome:gnome-next commit in: media-libs/mash/ X-VCS-Repository: proj/gnome X-VCS-Files: media-libs/mash/mash-0.1.0.ebuild media-libs/mash/mash-0.2.0.ebuild media-libs/mash/mash-9999.ebuild X-VCS-Directories: media-libs/mash/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: c26b1c5bb89f96eb3b5a1254de7dfc650aed4843 Date: Mon, 26 Sep 2011 09:33:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5bd2b7441a3bc4568d6cde7cc26f4539 commit: c26b1c5bb89f96eb3b5a1254de7dfc650aed4843 Author: Alexandre Rostovtsev gmail com> AuthorDate: Mon Sep 26 07:55:36 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Mon Sep 26 08:28:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc26b1c5b media-libs/mash: 0.1.0 =E2=86=92 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 =3D> 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 @@ =20 EAPI=3D"4" GCONF_DEBUG=3D"no" -CLUTTER_LA_PUNT=3D"yes" +GNOME2_LA_PUNT=3D"yes" =20 -# 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} =3D 9999 ]]; then + SRC_URI=3D"" EGIT_REPO_URI=3D"git://github.com/clutter-project/mash.git" inherit gnome2-live +else + RV=3D($(get_version_components)) + SRC_URI=3D"http://source.clutter-project.org/sources/${PN}/${RV[0]}.${R= V[1]}/${P}.tar.xz" fi =20 DESCRIPTION=3D"A library for rendering 3D models with Clutter" HOMEPAGE=3D"http://wiki.clutter-project.org/wiki/Mash" =20 LICENSE=3D"LGPL-2.1" -SLOT=3D"0.1" +SLOT=3D"0.2" IUSE=3D"doc examples +introspection" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" @@ -27,18 +31,21 @@ fi =20 # Automagically detects x11-libs/mx, but only uses it for building examp= les RDEPEND=3D">=3Ddev-libs/glib-2.16:2 - >=3Dmedia-libs/clutter-1.2:1.0[introspection?] + >=3Dmedia-libs/clutter-1.5.10:1.0[introspection?] media-libs/rply virtual/opengl =20 - introspection? ( >=3Ddev-libs/gobject-introspection-0.6.1 )" + introspection? ( >=3Ddev-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=3D"${RDEPEND} dev-util/pkgconfig doc? ( >=3Ddev-util/gtk-doc-1.14 )" =20 pkg_setup() { DOCS=3D"AUTHORS NEWS README" - EXAMPLES=3D"example/{*.c,*.ply}" G2CONF=3D"${G2CONF} --disable-static $(use_enable introspection)" @@ -51,5 +58,10 @@ src_prepare() { } =20 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 @@ =20 EAPI=3D"4" GCONF_DEBUG=3D"no" -CLUTTER_LA_PUNT=3D"yes" +GNOME2_LA_PUNT=3D"yes" =20 -# 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} =3D 9999 ]]; then + SRC_URI=3D"" EGIT_REPO_URI=3D"git://github.com/clutter-project/mash.git" inherit gnome2-live +else + RV=3D($(get_version_components)) + SRC_URI=3D"http://source.clutter-project.org/sources/${PN}/${RV[0]}.${R= V[1]}/${P}.tar.xz" fi =20 DESCRIPTION=3D"A library for rendering 3D models with Clutter" HOMEPAGE=3D"http://wiki.clutter-project.org/wiki/Mash" =20 LICENSE=3D"LGPL-2.1" -SLOT=3D"0.1" +SLOT=3D"0.2" IUSE=3D"doc examples +introspection" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" @@ -31,14 +35,17 @@ RDEPEND=3D">=3Ddev-libs/glib-2.16:2 media-libs/rply virtual/opengl =20 - introspection? ( >=3Ddev-libs/gobject-introspection-0.6.1 )" + introspection? ( >=3Ddev-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=3D"${RDEPEND} dev-util/pkgconfig doc? ( >=3Ddev-util/gtk-doc-1.14 )" =20 pkg_setup() { DOCS=3D"AUTHORS NEWS README" - EXAMPLES=3D"example/{*.c,*.css,*.ply}" G2CONF=3D"${G2CONF} --disable-static $(use_enable introspection)" @@ -51,5 +58,10 @@ src_prepare() { } =20 src_install() { - clutter_src_install + gnome2_src_install + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins example/{*.c,*.ply} + fi }