tetromino 15/05/25 23:49:49 Modified: gegl-0.2.0-r2.ebuild ChangeLog gegl-9999.ebuild metadata.xml Added: gegl-0.3.0_pre20150304.ebuild Log: Non-maintainer version bump from the gnome overlay, needed for gnome-3.16 (bug #550108). Update live ebuild. Slotify deps. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)
Revision Changes Path 1.17 media-libs/gegl/gegl-0.2.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild?r1=1.16&r2=1.17 Index: gegl-0.2.0-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gegl-0.2.0-r2.ebuild 2 Apr 2015 18:49:57 -0000 1.16 +++ gegl-0.2.0-r2.ebuild 25 May 2015 23:49:49 -0000 1.17 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.16 2015/04/02 18:49:57 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.2.0-r2.ebuild,v 1.17 2015/05/25 23:49:49 tetromino Exp $ EAPI=5 @@ -32,10 +32,10 @@ libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) - jpeg? ( virtual/jpeg ) + jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) openexr? ( media-libs/openexr ) - png? ( media-libs/libpng ) + png? ( media-libs/libpng:0 ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) 1.109 media-libs/gegl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/ChangeLog?rev=1.109&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/ChangeLog?rev=1.109&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/ChangeLog?r1=1.108&r2=1.109 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- ChangeLog 26 Feb 2015 18:25:41 -0000 1.108 +++ ChangeLog 25 May 2015 23:49:49 -0000 1.109 @@ -1,6 +1,14 @@ # ChangeLog for media-libs/gegl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.108 2015/02/26 18:25:41 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.109 2015/05/25 23:49:49 tetromino Exp $ + +*gegl-0.3.0_pre20150304 (25 May 2015) + + 25 May 2015; Alexandre Rostovtsev <tetrom...@gentoo.org> + gegl-0.2.0-r2.ebuild, +gegl-0.3.0_pre20150304.ebuild, gegl-9999.ebuild, + metadata.xml: + Non-maintainer version bump from the gnome overlay, needed for gnome-3.16 + (bug #550108). Update live ebuild. Slotify deps. 26 Feb 2015; Michał Górny <mgo...@gentoo.org> gegl-0.2.0-r2.ebuild, gegl-9999.ebuild: 1.11 media-libs/gegl/gegl-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-9999.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-9999.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-9999.ebuild?r1=1.10&r2=1.11 Index: gegl-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gegl-9999.ebuild 2 Apr 2015 18:49:57 -0000 1.10 +++ gegl-9999.ebuild 25 May 2015 23:49:49 -0000 1.11 @@ -1,61 +1,93 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.10 2015/04/02 18:49:57 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-9999.ebuild,v 1.11 2015/05/25 23:49:49 tetromino Exp $ EAPI=5 -VALA_MIN_API_VERSION=0.14 +# vala and introspection support is broken, bug #468208 +VALA_MIN_API_VERSION=0.20 VALA_USE_DEPEND=vapigen -inherit vala gnome2-utils eutils autotools git-2 +inherit versionator gnome2-utils eutils autotools vala + +if [[ ${PV} == *9999* ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="git://git.gnome.org/gegl" + SRC_URI="" +else + SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${PN}-0.3.0-c9bbc81.tar.bz2 -> ${P}.tar.bz2" + # ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi DESCRIPTION="A graph based image processing framework" HOMEPAGE="http://www.gegl.org/" -EGIT_REPO_URI="git://git.gnome.org/${PN}" LICENSE="|| ( GPL-3 LGPL-3 )" -SLOT="0" -KEYWORDS="" +SLOT="0.3" -IUSE="cairo debug ffmpeg introspection jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack vala" +IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg umfpack vala v4l webp" +REQUIRED_IUSE="vala? ( introspection )" -RDEPEND=">=media-libs/babl-0.1.10[introspection?] - >=dev-libs/glib-2.28:2 +RDEPEND=" + >=dev-libs/glib-2.36:2 + dev-libs/json-glib + >=media-libs/babl-0.1.12 + sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango - sys-libs/zlib + cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) - jpeg? ( virtual/jpeg ) + introspection? ( + >=dev-libs/gobject-introspection-1.32 + >=dev-python/pygobject-3.2:3 ) + jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) + lcms? ( >=media-libs/lcms-2.2:2 ) + lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) - png? ( media-libs/libpng ) - raw? ( >=media-libs/libopenraw-0.0.5 ) + png? ( media-libs/libpng:0= ) + raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) - introspection? ( >=dev-libs/gobject-introspection-0.10 - >=dev-python/pygobject-2.26:2 ) - lensfun? ( >=media-libs/lensfun-0.2.5 )" + v4l? ( >=media-libs/libv4l-1.0.1 ) + webp? ( media-libs/libwebp ) +" DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 - vala? ( $(vala_depend) )" - -DOCS=( ChangeLog NEWS ) + vala? ( $(vala_depend) ) +" src_prepare() { + # FIXME: the following should be proper patch sent to upstream # fix OSX loadable module filename extension sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi + + #epatch "${FILESDIR}"/${P}-g_log_domain.patch + + # gegl test fail on 64bits and a later commit switch the break to 32bits + sed -e '/gegl.xml/d' \ + -e '/contrast-curve.xml/d' \ + -i tests/compositions/Makefile.am || die + + # Skip broken test with >=dev-python/pygobject-3.14 + sed -e '/test_buffer/ i\ @unittest.skip("broken")\' \ + -i tests/python/test-gegl-format.py || die + + epatch_user eautoreconf use vala && vala_src_prepare @@ -79,20 +111,23 @@ # - Parameter --disable-workshop disables any use of Lua, effectivly # # - v4l support does not work with our media-libs/libv4l-0.8.9, - # upstream bug https://bugzilla.gnome.org/show_bug.cgi?id=654675 + # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 # - # - There are two checks for dot, one controlled by --with(out)-graphviz + # - There are two checks for dot, one controllable by --with(out)-graphviz # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. # # So that's why USE="exif graphviz lua v4l" got resolved. More at: # https://bugs.gentoo.org/show_bug.cgi?id=451136 # econf \ - --disable-silent-rules \ + --disable-docs \ --disable-profile \ + --disable-silent-rules \ + --disable-workshop \ + --program-suffix=-${SLOT} \ + --with-gdk-pixbuf \ + --with-pango \ --without-libspiro \ - --disable-docs --disable-workshop \ - --with-pango --with-gdk-pixbuf \ $(use_enable cpu_flags_x86_mmx mmx) \ $(use_enable cpu_flags_x86_sse sse) \ $(use_enable debug) \ @@ -103,6 +138,8 @@ --without-graphviz \ $(use_with jpeg libjpeg) \ $(use_with jpeg2k jasper) \ + $(use_with lcms) \ + $(use_with lensfun) \ --without-lua \ $(use_with openexr) \ $(use_with png libpng) \ @@ -110,10 +147,11 @@ $(use_with sdl) \ $(use_with svg librsvg) \ $(use_with umfpack) \ - --without-libv4l \ + $(use_with v4l libv4l) \ + $(use_with v4l libv4l2) \ $(use_enable introspection) \ - $(use_with lensfun) \ - $(use_with vala) + $(use_with vala) \ + $(use_with webp) } src_test() { @@ -125,10 +163,10 @@ gnome2_environment_reset # sandbox issues (bug #396687) default - emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." + [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." } src_install() { default - find "${ED}" -name '*.la' -delete + prune_libtool_files --all } 1.7 media-libs/gegl/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/metadata.xml?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/metadata.xml?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/metadata.xml?r1=1.6&r2=1.7 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/gegl/metadata.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- metadata.xml 5 Nov 2012 08:49:40 -0000 1.6 +++ metadata.xml 25 May 2015 23:49:49 -0000 1.7 @@ -9,5 +9,6 @@ <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag> <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag> <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag> + <flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag> </use> </pkgmetadata> 1.1 media-libs/gegl/gegl-0.3.0_pre20150304.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-0.3.0_pre20150304.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/gegl/gegl-0.3.0_pre20150304.ebuild?rev=1.1&content-type=text/plain Index: gegl-0.3.0_pre20150304.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.3.0_pre20150304.ebuild,v 1.1 2015/05/25 23:49:49 tetromino Exp $ EAPI=5 # vala and introspection support is broken, bug #468208 VALA_MIN_API_VERSION=0.20 VALA_USE_DEPEND=vapigen inherit versionator gnome2-utils eutils autotools vala if [[ ${PV} == *9999* ]]; then inherit autotools git-r3 EGIT_REPO_URI="git://git.gnome.org/gegl" SRC_URI="" else SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${PN}-0.3.0-c9bbc81.tar.bz2 -> ${P}.tar.bz2" # ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" HOMEPAGE="http://www.gegl.org/" LICENSE="|| ( GPL-3 LGPL-3 )" SLOT="0.3" IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg umfpack vala v4l webp" REQUIRED_IUSE="vala? ( introspection )" RDEPEND=" >=dev-libs/glib-2.36:2 dev-libs/json-glib >=media-libs/babl-0.1.12 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango cairo? ( x11-libs/cairo ) ffmpeg? ( libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) introspection? ( >=dev-libs/gobject-introspection-1.32 >=dev-python/pygobject-3.2:3 ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lcms? ( >=media-libs/lcms-2.2:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng:0= ) raw? ( =media-libs/libopenraw-0.0.9 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( media-libs/libwebp ) " DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40.1 dev-lang/perl virtual/pkgconfig >=sys-devel/libtool-2.2 vala? ( $(vala_depend) ) " # Only needed for snapshot S="${WORKDIR}/${PN}-0.3.0" src_prepare() { # FIXME: the following should be proper patch sent to upstream # fix OSX loadable module filename extension sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die fi #epatch "${FILESDIR}"/${P}-g_log_domain.patch # gegl test fail on 64bits and a later commit switch the break to 32bits sed -e '/gegl.xml/d' \ -e '/contrast-curve.xml/d' \ -i tests/compositions/Makefile.am || die # Skip broken test with >=dev-python/pygobject-3.14 sed -e '/test_buffer/ i\ @unittest.skip("broken")\' \ -i tests/python/test-gegl-format.py || die epatch_user eautoreconf use vala && vala_src_prepare } src_configure() { # never enable altering of CFLAGS via profile option # libspiro: not in portage main tree # disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch # Also please note that: # # - Some auto-detections are not patched away since the docs are # not built (--disable-docs, lack of --enable-gtk-doc) and these # tools affect re-generation of docs, only # (e.g. ruby, asciidoc, dot (of graphviz), enscript) # # - Parameter --with-exiv2 compiles a noinst-app only, no use # # - Parameter --disable-workshop disables any use of Lua, effectivly # # - v4l support does not work with our media-libs/libv4l-0.8.9, # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 # # - There are two checks for dot, one controllable by --with(out)-graphviz # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. # # So that's why USE="exif graphviz lua v4l" got resolved. More at: # https://bugs.gentoo.org/show_bug.cgi?id=451136 # econf \ --disable-docs \ --disable-profile \ --disable-silent-rules \ --disable-workshop \ --program-suffix=-${SLOT} \ --with-gdk-pixbuf \ --with-pango \ --without-libspiro \ $(use_enable cpu_flags_x86_mmx mmx) \ $(use_enable cpu_flags_x86_sse sse) \ $(use_enable debug) \ $(use_with cairo) \ $(use_with cairo pangocairo) \ --without-exiv2 \ $(use_with ffmpeg libavformat) \ --without-graphviz \ $(use_with jpeg libjpeg) \ $(use_with jpeg2k jasper) \ $(use_with lcms) \ $(use_with lensfun) \ --without-lua \ $(use_with openexr) \ $(use_with png libpng) \ $(use_with raw libopenraw) \ $(use_with sdl) \ $(use_with svg librsvg) \ $(use_with umfpack) \ $(use_with v4l libv4l) \ $(use_with v4l libv4l2) \ $(use_enable introspection) \ $(use_with vala) \ $(use_with webp) } src_test() { gnome2_environment_reset # sandbox issues default } src_compile() { gnome2_environment_reset # sandbox issues (bug #396687) default [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." } src_install() { default prune_libtool_files --all }