diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2013-01-13 22:46:06 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-01-13 22:46:06 +0000 |
| commit | 3253290726b8ba01f06dd9cc6f3ec49e8b754352 (patch) | |
| tree | a28d5c616ea097782dfd37c4abe4d557980cc10e /media-libs/cogl | |
| parent | Remove boost versioning for remaining versions, bug #445180 (diff) | |
| download | gentoo-2-3253290726b8ba01f06dd9cc6f3ec49e8b754352.tar.gz gentoo-2-3253290726b8ba01f06dd9cc6f3ec49e8b754352.tar.bz2 gentoo-2-3253290726b8ba01f06dd9cc6f3ec49e8b754352.zip | |
Revert changes for gtk-doc, upstream managed to tight this too well :(.
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'media-libs/cogl')
| -rw-r--r-- | media-libs/cogl/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/cogl/cogl-1.12.2.ebuild | 19 |
2 files changed, 8 insertions, 16 deletions
diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog index e0b6c1e7cb6a..2e7bd74f2354 100644 --- a/media-libs/cogl/ChangeLog +++ b/media-libs/cogl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/cogl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.23 2013/01/13 22:37:09 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.24 2013/01/13 22:46:06 eva Exp $ + + 13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.12.2.ebuild: + Revert changes for gtk-doc, upstream managed to tight this too well :(. 13 Jan 2013; Gilles Dartiguelongue <eva@gentoo.org> cogl-1.12.2.ebuild: Actually make gtk-doc installation work. Needs latest gnome2.eclass changes. diff --git a/media-libs/cogl/cogl-1.12.2.ebuild b/media-libs/cogl/cogl-1.12.2.ebuild index be7617b41725..5b2e7e2ec9be 100644 --- a/media-libs/cogl/cogl-1.12.2.ebuild +++ b/media-libs/cogl/cogl-1.12.2.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/cogl/cogl-1.12.2.ebuild,v 1.3 2013/01/13 22:37:09 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.12.2.ebuild,v 1.4 2013/01/13 22:46:06 eva Exp $ EAPI="5" CLUTTER_LA_PUNT="yes" @@ -13,7 +13,7 @@ HOMEPAGE="http://www.clutter-project.org/" LICENSE="LGPL-2.1+ FDL-1.1+" SLOT="1.0/11" -IUSE="examples +introspection +opengl gles2 +pango" +IUSE="doc examples +introspection +opengl gles2 +pango" KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" # XXX: need uprof for optional profiling support @@ -41,19 +41,12 @@ DEPEND="${COMMON_DEPEND} >=dev-util/gtk-doc-am-1.13 sys-devel/gettext virtual/pkgconfig + doc? ( >=dev-util/gtk-doc-1.13 ) test? ( app-admin/eselect-opengl media-libs/mesa[classic] ) " # Need classic mesa swrast for tests, llvmpipe causes a test failure -src_prepare() { - # Workaround silly upstream forcing gtk-doc build for simple install - sed -e "s/\(SUBDIRS += .*\)doc/\1/" \ - -i Makefile.am Makefile.in || die - - gnome2_src_prepare -} - src_configure() { # XXX: think about kms-egl, quartz, sdl, wayland # Prefer gl over gles2 if both are selected @@ -65,7 +58,7 @@ src_configure() { --enable-deprecated \ --enable-gdk-pixbuf \ --enable-glib \ - --enable-gtk-doc \ + $(use_enable doc gtk-doc) \ $(use_enable opengl glx) \ $(use_enable opengl gl) \ $(use_enable gles2) \ @@ -94,10 +87,6 @@ src_install() { clutter_src_install - # Make sure gtk-doc is installed - cd "${S}"/doc || die - emake install DESTDIR="${D}" || die - # Remove silly examples-data directory rm -rvf "${ED}/usr/share/cogl/examples-data/" || die } |