diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-06-14 13:32:27 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-06-14 13:32:27 +0000 |
| commit | 753aaa7c907d61b76f79ea311ec745d28c2524ac (patch) | |
| tree | eaeca0439b3918b5eaab73ba39f73c96433b7e1a | |
| parent | Add ~x86, fix test depends (diff) | |
| download | gentoo-2-753aaa7c907d61b76f79ea311ec745d28c2524ac.tar.gz gentoo-2-753aaa7c907d61b76f79ea311ec745d28c2524ac.tar.bz2 gentoo-2-753aaa7c907d61b76f79ea311ec745d28c2524ac.zip | |
Stop using clutter.eclass
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
| -rw-r--r-- | media-libs/cogl/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/cogl/cogl-1.20.0.ebuild | 22 | ||||
| -rw-r--r-- | media-libs/cogl/metadata.xml | 7 |
3 files changed, 20 insertions, 14 deletions
diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog index c8410c4de3f5..1bc88be5a8b1 100644 --- a/media-libs/cogl/ChangeLog +++ b/media-libs/cogl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/cogl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.58 2015/06/11 20:53:18 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.59 2015/06/14 13:32:27 pacho Exp $ + + 14 Jun 2015; Pacho Ramos <pacho@gentoo.org> cogl-1.20.0.ebuild, metadata.xml: + Stop using clutter.eclass 11 Jun 2015; Pacho Ramos <pacho@gentoo.org> -cogl-1.18.2.ebuild: Drop old diff --git a/media-libs/cogl/cogl-1.20.0.ebuild b/media-libs/cogl/cogl-1.20.0.ebuild index fc94998e5a61..84293f6ae5de 100644 --- a/media-libs/cogl/cogl-1.20.0.ebuild +++ b/media-libs/cogl/cogl-1.20.0.ebuild @@ -1,21 +1,22 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.20.0.ebuild,v 1.1 2015/06/08 22:21:49 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.20.0.ebuild,v 1.2 2015/06/14 13:32:27 pacho Exp $ EAPI="5" -CLUTTER_LA_PUNT="yes" +GCONF_DEBUG="yes" -# Inherit gnome2 after clutter to download sources from gnome.org -inherit clutter gnome2 multilib virtualx +inherit gnome2 multilib virtualx DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures" HOMEPAGE="http://www.cogl3d.org/" LICENSE="MIT BSD" SLOT="1.0/20" # subslot = .so version + # doc and profile disable for now due bugs #484750 and #483332 IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test wayland" # doc profile REQUIRED_USE="wayland? ( gles2 )" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" COMMON_DEPEND=" @@ -34,7 +35,7 @@ COMMON_DEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) - introspection? ( >=dev-libs/gobject-introspection-1.34.2 ) + introspection? ( >=dev-libs/gobject-introspection-1.34.2:= ) kms? ( media-libs/mesa[gbm] x11-libs/libdrm:= ) @@ -45,7 +46,8 @@ COMMON_DEPEND=" " # before clutter-1.7, cogl was part of clutter RDEPEND="${COMMON_DEPEND} - !<media-libs/clutter-1.7" + !<media-libs/clutter-1.7 +" DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.13 sys-devel/gettext @@ -118,10 +120,12 @@ src_test() { } src_install() { - DOCS="NEWS README" - EXAMPLES="examples/{*.c,*.jpg}" + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/{*.c,*.jpg} + fi - clutter_src_install + gnome2_src_install # Remove silly examples-data directory rm -rvf "${ED}/usr/share/cogl/examples-data/" || die diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml index e3cc8551b059..465b183131a8 100644 --- a/media-libs/cogl/metadata.xml +++ b/media-libs/cogl/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <herd>gnome</herd> <use> - <flag name="gles2">Enable OpenGL ES 2.0 support</flag> - <flag name="kms">Enable KMS support.</flag> - <flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg> - integration</flag> + <flag name="gles2">Enable OpenGL ES 2.0 support</flag> + <flag name="kms">Enable KMS support.</flag> + <flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg> integration</flag> </use> </pkgmetadata> |