commit: 450eb49092f9124e8f1ba7842e24854d222e5c31
Author: Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 23:06:27 2020 +0000
Commit: Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 22:49:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=450eb490
media-gfx/eom: Drop old, sync with Gentoo
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>
media-gfx/eom/Manifest | 9 ++-
media-gfx/eom/eom-1.12.2-r3.ebuild | 83 ----------------------
media-gfx/eom/eom-1.14.2.ebuild | 83 ----------------------
media-gfx/eom/eom-1.16.0.ebuild | 83 ----------------------
media-gfx/eom/eom-1.16.1.ebuild | 83 ----------------------
.../eom/{eom-9999.ebuild => eom-1.22.0.ebuild} | 49 ++++++-------
.../eom/{eom-1.18.3.ebuild => eom-1.22.1.ebuild} | 47 ++++++------
.../eom/{eom-1.18.3.ebuild => eom-1.22.2.ebuild} | 47 ++++++------
.../eom/{eom-1.18.3.ebuild => eom-1.24.0.ebuild} | 53 ++++++++------
media-gfx/eom/eom-9999.ebuild | 55 +++++++-------
media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch | 33 ---------
media-gfx/eom/metadata.xml | 3 +-
12 files changed, 134 insertions(+), 494 deletions(-)
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 270b37d..6d59d34 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,5 +1,4 @@
-DIST eom-1.12.2.tar.xz 2213260 BLAKE2B
f05264c5b0a5185d1bda8a27e140910e8a1bcf23104a20ff9af78052b9b0a513da50e797ac90da7973dab7d868d10f72098c3ac13f22d369b4c2561a981def69
SHA512
03283cb1cae817c7c21219913fe2f3ab64e0fa6662a63193d4fa012bd0b5c286cbd25131a5bd5e52c1d9304b4b10ae8c37d38a88ea985215c5b277303d7b8cc4
-DIST eom-1.14.2.tar.xz 2254180 BLAKE2B
4ee974fa38fb10ae6984bf32bdbe428e6eefd6b9871fb7bc93df809659d3faaff76ef8afe9c0581bb8f34da64a2b58fdbf4a12d520524fde6c94e6387d3e4e06
SHA512
87d7c5e62249d598474324f24bac1f5f3388bb11517fc54531792fc0291ef42199f3339e492dfc1a1caafed575cf3b21e36ea91f15d0a03b8e912a3d16e5f3b7
-DIST eom-1.16.0.tar.xz 2214612 BLAKE2B
d95b478262b16e67e6d4a431a68bee782c2f11bb3ae18c935aef249a72e1078a7daf960938f82a2bf4da21db7a4eea9e4486c74bb67e48926f062876d72cce0c
SHA512
ed1dfb8bfd8af6e74def133c38bcbaef81adbbc98df428479cf8a4037379f1cea0df2033eeb4ea28e5cba2c5996b0c248012be34e5450b2cfda575f2f79a5f36
-DIST eom-1.16.1.tar.xz 2215676 BLAKE2B
78ac0049c36008ae56fe4d59b908728b49925a1e678ad6b61dcc4dcf450633bc56279bc04d9f64c2631f9a78c957a0f51ab385cdb770b48d3c5dad6ab38f2e01
SHA512
6154f8423eb825fea3cba975e15ac46bd9c46c139966c02365c1fe5d0a0144c4a4bffc80801eddd41506ae0ef86909ca8acb1591f39260aedb6cbb0db9335b4f
-DIST eom-1.18.3.tar.xz 2198324 BLAKE2B
efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239
SHA512
64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
+DIST eom-1.22.0.tar.xz 2171992 BLAKE2B
5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698
SHA512
1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0
+DIST eom-1.22.1.tar.xz 2142132 BLAKE2B
c68f6d6ee4284de7dea3f3d9761f4b67a2edc0a169b3c3ac04ac6efd13e9f1044cf0be023e36891672b31ff73815d7ce765d8db656bbeb69f324e0ee412eb231
SHA512
f510de62b9b6f11d02df067128042d6905484e0509a939b7919405d0c1dd03fe4b6735dcd8ccf780d36c5713f4585b50b2727645a454da148307a74cf542be87
+DIST eom-1.22.2.tar.xz 2158376 BLAKE2B
88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f
SHA512
1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe
+DIST eom-1.24.0.tar.xz 2433420 BLAKE2B
58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c
SHA512
17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
diff --git a/media-gfx/eom/eom-1.12.2-r3.ebuild
b/media-gfx/eom/eom-1.12.2-r3.ebuild
deleted file mode 100644
index fb8419a..0000000
--- a/media-gfx/eom/eom-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )
- "
-
-RDEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.9.1[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
- gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
-
-DEPEND="${RDEPEND}
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${P}-gtk3-svg.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_with X x) \
- $(use_with dbus) \
- $(use_with exif libexif) \
- $(use_with jpeg libjpeg) \
- $(use_with lcms cms) \
- $(use_with svg librsvg) \
- $(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.14.2.ebuild b/media-gfx/eom/eom-1.14.2.ebuild
deleted file mode 100644
index 293481b..0000000
--- a/media-gfx/eom/eom-1.14.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )
- "
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.9.1[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
- gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_with X x) \
- $(use_with dbus) \
- $(use_with exif libexif) \
- $(use_with jpeg libjpeg) \
- $(use_with lcms cms) \
- $(use_with svg librsvg) \
- $(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.16.0.ebuild b/media-gfx/eom/eom-1.16.0.ebuild
deleted file mode 100644
index 293481b..0000000
--- a/media-gfx/eom/eom-1.16.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )
- "
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.9.1[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
- gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_with X x) \
- $(use_with dbus) \
- $(use_with exif libexif) \
- $(use_with jpeg libjpeg) \
- $(use_with lcms cms) \
- $(use_with svg librsvg) \
- $(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.16.1.ebuild b/media-gfx/eom/eom-1.16.1.ebuild
deleted file mode 100644
index 1bf8859..0000000
--- a/media-gfx/eom/eom-1.16.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
- gtk3? ( !python )
- python? ( ${PYTHON_REQUIRED_USE} )
- "
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.9.1[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
- gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
- >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
- )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- mate_src_configure \
- --with-gtk=$(usex gtk3 3.0 2.0) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable python) \
- $(use_with X x) \
- $(use_with dbus) \
- $(use_with exif libexif) \
- $(use_with jpeg libjpeg) \
- $(use_with lcms cms) \
- $(use_with svg librsvg) \
- $(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-9999.ebuild b/media-gfx/eom/eom-1.22.0.ebuild
similarity index 52%
copy from media-gfx/eom/eom-9999.ebuild
copy to media-gfx/eom/eom-1.22.0.ebuild
index 4293772..9e84c4e 100644
--- a/media-gfx/eom/eom-9999.ebuild
+++ b/media-gfx/eom/eom-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,32 +6,31 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
SLOT="0"
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libpeas-1.2.0[gtk]
+RDEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.50:2
+ >=dev-libs/libpeas-1.8.0[gtk]
>=dev-libs/libxml2-2:2
- gnome-base/dconf:0
+ gnome-base/dconf
>=mate-base/mate-desktop-1.17.0
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- >=x11-libs/gtk+-3.14:3[introspection?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libX11
+ >=x11-misc/shared-mime-info-0.20
+ virtual/libintl
exif? (
- >=media-libs/libexif-0.6.14:0
+ >=media-libs/libexif-0.6.14
virtual/jpeg:0
)
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
@@ -41,22 +40,20 @@ COMMON_DEPEND="
xmp? ( >=media-libs/exempi-1.99.5:2 )
!!media-gfx/mate-image-viewer"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig"
src_configure() {
mate_src_configure \
$(use_enable debug) \
$(use_enable introspection) \
$(use_with X x) \
- $(use_with dbus) \
$(use_with exif libexif) \
$(use_with jpeg libjpeg) \
$(use_with lcms cms) \
diff --git a/media-gfx/eom/eom-1.18.3.ebuild b/media-gfx/eom/eom-1.22.1.ebuild
similarity index 54%
copy from media-gfx/eom/eom-1.18.3.ebuild
copy to media-gfx/eom/eom-1.22.1.ebuild
index 3bb3c8b..9732879 100644
--- a/media-gfx/eom/eom-1.18.3.ebuild
+++ b/media-gfx/eom/eom-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,28 +10,27 @@ if [[ ${PV} != 9999 ]]; then
fi
DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
SLOT="0"
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libpeas-1.2.0[gtk]
+RDEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.50:2
+ >=dev-libs/libpeas-1.8.0[gtk]
>=dev-libs/libxml2-2:2
- gnome-base/dconf:0
+ gnome-base/dconf
>=mate-base/mate-desktop-1.17.0
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- >=x11-libs/gtk+-3.14:3[introspection?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libX11
+ >=x11-misc/shared-mime-info-0.20
+ virtual/libintl
exif? (
- >=media-libs/libexif-0.6.14:0
+ >=media-libs/libexif-0.6.14
virtual/jpeg:0
)
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
@@ -41,22 +40,20 @@ COMMON_DEPEND="
xmp? ( >=media-libs/exempi-1.99.5:2 )
!!media-gfx/mate-image-viewer"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig"
src_configure() {
mate_src_configure \
$(use_enable debug) \
$(use_enable introspection) \
$(use_with X x) \
- $(use_with dbus) \
$(use_with exif libexif) \
$(use_with jpeg libjpeg) \
$(use_with lcms cms) \
diff --git a/media-gfx/eom/eom-1.18.3.ebuild b/media-gfx/eom/eom-1.22.2.ebuild
similarity index 54%
copy from media-gfx/eom/eom-1.18.3.ebuild
copy to media-gfx/eom/eom-1.22.2.ebuild
index 3bb3c8b..cd0a1d6 100644
--- a/media-gfx/eom/eom-1.18.3.ebuild
+++ b/media-gfx/eom/eom-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,28 +10,27 @@ if [[ ${PV} != 9999 ]]; then
fi
DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
SLOT="0"
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libpeas-1.2.0[gtk]
+RDEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.52:2
+ >=dev-libs/libpeas-1.8.0[gtk]
>=dev-libs/libxml2-2:2
- gnome-base/dconf:0
+ gnome-base/dconf
>=mate-base/mate-desktop-1.17.0
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- >=x11-libs/gtk+-3.14:3[introspection?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libX11
+ >=x11-misc/shared-mime-info-0.20
+ virtual/libintl
exif? (
- >=media-libs/libexif-0.6.14:0
+ >=media-libs/libexif-0.6.14
virtual/jpeg:0
)
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
@@ -41,22 +40,20 @@ COMMON_DEPEND="
xmp? ( >=media-libs/exempi-1.99.5:2 )
!!media-gfx/mate-image-viewer"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig"
src_configure() {
mate_src_configure \
$(use_enable debug) \
$(use_enable introspection) \
$(use_with X x) \
- $(use_with dbus) \
$(use_with exif libexif) \
$(use_with jpeg libjpeg) \
$(use_with lcms cms) \
diff --git a/media-gfx/eom/eom-1.18.3.ebuild b/media-gfx/eom/eom-1.24.0.ebuild
similarity index 50%
rename from media-gfx/eom/eom-1.18.3.ebuild
rename to media-gfx/eom/eom-1.24.0.ebuild
index 3bb3c8b..c1052d3 100644
--- a/media-gfx/eom/eom-1.18.3.ebuild
+++ b/media-gfx/eom/eom-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,54 +10,61 @@ if [[ ${PV} != 9999 ]]; then
fi
DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
SLOT="0"
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp"
COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libpeas-1.2.0[gtk]
+ dev-libs/atk
+ >=dev-libs/glib-2.52:2
+ >=dev-libs/libpeas-1.8.0[gtk]
>=dev-libs/libxml2-2:2
- gnome-base/dconf:0
+ gnome-base/dconf
>=mate-base/mate-desktop-1.17.0
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- >=x11-libs/gtk+-3.14:3[introspection?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libX11
+ >=x11-misc/shared-mime-info-0.20
exif? (
- >=media-libs/libexif-0.6.14:0
+ >=media-libs/libexif-0.6.14
virtual/jpeg:0
)
+ imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
jpeg? ( virtual/jpeg:0 )
lcms? ( media-libs/lcms:2 )
svg? ( >=gnome-base/librsvg-2.36.2:2 )
xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
+"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+ !!media-gfx/mate-image-viewer
+"
DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig
+"
src_configure() {
mate_src_configure \
+ --enable-thumbnailer \
$(use_enable debug) \
$(use_enable introspection) \
$(use_with X x) \
- $(use_with dbus) \
$(use_with exif libexif) \
+ $(usex imagemagick \
+ --without-gdk-pixbuf-thumbnailer \
+ --with-gdk-pixbuf-thumbnail \
+ ) \
$(use_with jpeg libjpeg) \
$(use_with lcms cms) \
$(use_with svg librsvg) \
diff --git a/media-gfx/eom/eom-9999.ebuild b/media-gfx/eom/eom-9999.ebuild
index 4293772..c1052d3 100644
--- a/media-gfx/eom/eom-9999.ebuild
+++ b/media-gfx/eom/eom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,58 +6,65 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
SLOT="0"
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
+IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp"
COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libpeas-1.2.0[gtk]
+ dev-libs/atk
+ >=dev-libs/glib-2.52:2
+ >=dev-libs/libpeas-1.8.0[gtk]
>=dev-libs/libxml2-2:2
- gnome-base/dconf:0
+ gnome-base/dconf
>=mate-base/mate-desktop-1.17.0
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- >=x11-libs/gtk+-3.14:3[introspection?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+ sys-libs/zlib
+ x11-libs/cairo
+ >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
+ >=x11-libs/gtk+-3.22:3[introspection?]
+ x11-libs/libX11
+ >=x11-misc/shared-mime-info-0.20
exif? (
- >=media-libs/libexif-0.6.14:0
+ >=media-libs/libexif-0.6.14
virtual/jpeg:0
)
+ imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
jpeg? ( virtual/jpeg:0 )
lcms? ( media-libs/lcms:2 )
svg? ( >=gnome-base/librsvg-2.36.2:2 )
xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
+"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl
+ !!media-gfx/mate-image-viewer
+"
DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
+ app-text/yelp-tools
+ dev-util/glib-utils
dev-util/gtk-doc
dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
+ >=sys-devel/gettext-0.19.8:*
+ virtual/pkgconfig
+"
src_configure() {
mate_src_configure \
+ --enable-thumbnailer \
$(use_enable debug) \
$(use_enable introspection) \
$(use_with X x) \
- $(use_with dbus) \
$(use_with exif libexif) \
+ $(usex imagemagick \
+ --without-gdk-pixbuf-thumbnailer \
+ --with-gdk-pixbuf-thumbnail \
+ ) \
$(use_with jpeg libjpeg) \
$(use_with lcms cms) \
$(use_with svg librsvg) \
diff --git a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
b/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
deleted file mode 100644
index ccff8ae..0000000
--- a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 038530ed2e9b844f75e2af24e44e0421ad1ccdc8 Mon Sep 17 00:00:00 2001
-From: monsta <mon...@inbox.ru>
-Date: Wed, 24 Feb 2016 16:47:08 +0300
-Subject: [PATCH] fix svg rendering that's broken with GTK+3
-
-from
-https://git.gnome.org/browse/eog/commit/?id=a33950c14d7b8da8e1c6289709022affb910be2a
----
- src/eom-scroll-view.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
-index 6385f29..6d1b290 100644
---- a/src/eom-scroll-view.c
-+++ b/src/eom-scroll-view.c
-@@ -1306,7 +1306,7 @@ display_expose_event (GtkWidget *widget, GdkEventExpose
*event, gpointer data)
-
- #ifdef HAVE_RSVG
- if (eom_image_is_svg (view->priv->image)) {
-- cairo_matrix_t matrix, translate, scale;
-+ cairo_matrix_t matrix, translate, scale, original;
- EomTransform *transform = eom_image_get_transform (priv->image);
- cairo_matrix_init_identity (&matrix);
- if (transform) {
-@@ -1343,6 +1343,8 @@ display_expose_event (GtkWidget *widget, GdkEventExpose
*event, gpointer data)
- cairo_matrix_init_translate (&translate, xofs, yofs);
- cairo_matrix_multiply (&matrix, &matrix, &translate);
-
-+ cairo_get_matrix (cr, &original);
-+ cairo_matrix_multiply (&matrix, &matrix, &original);
- cairo_set_matrix (cr, &matrix);
-
- rsvg_handle_render_cairo (eom_image_get_svg (priv->image), cr);
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
index 90e9ee9..97d9881 100644
--- a/media-gfx/eom/metadata.xml
+++ b/media-gfx/eom/metadata.xml
@@ -6,7 +6,8 @@
<name>Gentoo MATE Desktop</name>
</maintainer>
<use>
- <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+ <flag name="imagemagick">Use
<pkg>media-gfx/imagemagick</pkg> as
+ an external backend for the thumbnailer</flag>
</use>
<upstream>
<remote-id type="github">mate-desktop/eom</remote-id>
