From 39f6a49693e4df98ee4505211e702b615977dd12 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sat, 19 Oct 2019 13:15:00 -0700 Subject: media-gfx/gthumb: Depend on media-plugins/gst-plugins-gtk Closes: https://bugs.gentoo.org/691568 Signed-off-by: Matt Turner --- media-gfx/gthumb/gthumb-3.6.2-r1.ebuild | 98 +++++++++++++++++++++++++++++++++ media-gfx/gthumb/gthumb-3.6.2.ebuild | 97 -------------------------------- 2 files changed, 98 insertions(+), 97 deletions(-) create mode 100644 media-gfx/gthumb/gthumb-3.6.2-r1.ebuild delete mode 100644 media-gfx/gthumb/gthumb-3.6.2.ebuild diff --git a/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild new file mode 100644 index 000000000000..c06bbec3e549 --- /dev/null +++ b/media-gfx/gthumb/gthumb-3.6.2-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 + +DESCRIPTION="Image viewer and browser for Gnome" +HOMEPAGE="https://wiki.gnome.org/Apps/gthumb" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp" + +RDEPEND=" + >=dev-libs/glib-2.36.0:2[dbus] + >=x11-libs/gtk+-3.16.0:3 + exif? ( >=media-gfx/exiv2-0.21:= ) + slideshow? ( + >=media-libs/clutter-1.12.0:1.0 + >=media-libs/clutter-gtk-1:1.0 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + media-plugins/gst-plugins-gtk:1.0 ) + raw? ( >=media-libs/libraw-0.14:= ) + http? ( >=net-libs/libsoup-2.42.0:2.4 ) + gnome-keyring? ( >=app-crypt/libsecret-0.11 ) + cdr? ( >=app-cdr/brasero-3.2 ) + svg? ( >=gnome-base/librsvg-2.34:2 ) + webp? ( >=media-libs/libwebp-0.2.0 ) + json? ( >=dev-libs/json-glib-0.15.0 ) + webkit? ( >=net-libs/webkit-gtk-1.10.0:4 ) + lcms? ( >=media-libs/lcms-2.6:2 ) + colord? ( >=x11-misc/colord-1.3 + >=media-libs/lcms-2.6:2 ) + + media-libs/libpng:0= + sys-libs/zlib + >=gnome-base/gsettings-desktop-schemas-0.1.4 + jpeg? ( virtual/jpeg:0= ) + tiff? ( media-libs/tiff:= ) +" +DEPEND="${RDEPEND} + dev-util/glib-utils + >=dev-util/intltool-0.50.1 + dev-util/itstool + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + test? ( ~app-text/docbook-xml-dtd-4.1.2 ) +" +# eautoreconf needs: +# gnome-base/gnome-common + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092 + +src_prepare() { + # Remove unwanted CFLAGS added with USE=debug + sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \ + -i configure.ac -i configure || die + + gnome2_src_prepare +} + +src_configure() { + # Upstream says in configure help that libchamplain support + # crashes frequently + local myeconfargs=( + --disable-static + --disable-libchamplain + $(use_enable cdr libbrasero) + $(use_enable colord) + $(use_enable debug) + $(use_enable exif exiv2) + $(use_enable gnome-keyring libsecret) + $(use_enable gstreamer) + $(use_enable http libsoup) + $(use_enable jpeg) + $(use_enable json libjson-glib) + $(use_enable raw libraw) + $(use_enable slideshow clutter) + $(use_enable svg librsvg) + $(use_enable test test-suite) + $(use_enable tiff) + $(use_enable webkit webkit2) + $(use_enable webp libwebp) + ) + # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2 + if use lcms || use colord; then + myeconfargs+=( --enable-lcms2 ) + else + myeconfargs+=( --disable-lcms2 ) + fi + gnome2_src_configure "${myeconfargs[@]}" +} diff --git a/media-gfx/gthumb/gthumb-3.6.2.ebuild b/media-gfx/gthumb/gthumb-3.6.2.ebuild deleted file mode 100644 index b8cf22ade78b..000000000000 --- a/media-gfx/gthumb/gthumb-3.6.2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="Image viewer and browser for Gnome" -HOMEPAGE="https://wiki.gnome.org/Apps/gthumb" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="cdr colord debug exif gnome-keyring gstreamer http jpeg json lcms raw slideshow svg tiff test webkit webp" - -RDEPEND=" - >=dev-libs/glib-2.36.0:2[dbus] - >=x11-libs/gtk+-3.16.0:3 - exif? ( >=media-gfx/exiv2-0.21:= ) - slideshow? ( - >=media-libs/clutter-1.12.0:1.0 - >=media-libs/clutter-gtk-1:1.0 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 ) - raw? ( >=media-libs/libraw-0.14:= ) - http? ( >=net-libs/libsoup-2.42.0:2.4 ) - gnome-keyring? ( >=app-crypt/libsecret-0.11 ) - cdr? ( >=app-cdr/brasero-3.2 ) - svg? ( >=gnome-base/librsvg-2.34:2 ) - webp? ( >=media-libs/libwebp-0.2.0 ) - json? ( >=dev-libs/json-glib-0.15.0 ) - webkit? ( >=net-libs/webkit-gtk-1.10.0:4 ) - lcms? ( >=media-libs/lcms-2.6:2 ) - colord? ( >=x11-misc/colord-1.3 - >=media-libs/lcms-2.6:2 ) - - media-libs/libpng:0= - sys-libs/zlib - >=gnome-base/gsettings-desktop-schemas-0.1.4 - jpeg? ( virtual/jpeg:0= ) - tiff? ( media-libs/tiff:= ) -" -DEPEND="${RDEPEND} - dev-util/glib-utils - >=dev-util/intltool-0.50.1 - dev-util/itstool - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - test? ( ~app-text/docbook-xml-dtd-4.1.2 ) -" -# eautoreconf needs: -# gnome-base/gnome-common - -PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) # bug 674092 - -src_prepare() { - # Remove unwanted CFLAGS added with USE=debug - sed -e 's/CFLAGS="$CFLAGS -g -O0 -DDEBUG"//' \ - -i configure.ac -i configure || die - - gnome2_src_prepare -} - -src_configure() { - # Upstream says in configure help that libchamplain support - # crashes frequently - local myeconfargs=( - --disable-static - --disable-libchamplain - $(use_enable cdr libbrasero) - $(use_enable colord) - $(use_enable debug) - $(use_enable exif exiv2) - $(use_enable gnome-keyring libsecret) - $(use_enable gstreamer) - $(use_enable http libsoup) - $(use_enable jpeg) - $(use_enable json libjson-glib) - $(use_enable raw libraw) - $(use_enable slideshow clutter) - $(use_enable svg librsvg) - $(use_enable test test-suite) - $(use_enable tiff) - $(use_enable webkit webkit2) - $(use_enable webp libwebp) - ) - # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2 - if use lcms || use colord; then - myeconfargs+=( --enable-lcms2 ) - else - myeconfargs+=( --disable-lcms2 ) - fi - gnome2_src_configure "${myeconfargs[@]}" -} -- cgit v1.2.3-65-gdbad