gentoo resync : 28.04.2019

3 files changed, 8 insertions, 78 deletions

diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 852acb292558..27bd583c4e79 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,5 +1,3 @@
-DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239 SHA512 64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
 DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0
-EBUILD eom-1.18.3.ebuild 1478 BLAKE2B 648972bae8be6e4e4b564569d2abd953f8bfd5fdf82e1509f89787a7234afb3815067796d9f6fd1a310a5b2b6dd127708476625c01a59748261890b6a9c5648d SHA512 0f9daa87cd84f89ddb0175de079f29acc000161abb2eec166f68a004e1083240e6a791df58099f29532ef1bfd72eed5013190e58402b4a6fefdf6c0e9f5f81ce
-EBUILD eom-1.22.0.ebuild 1456 BLAKE2B 4bb777d8bf23c1c894acda59e6063d682b79d2b18bfbd7ac3d070f8c177ff881c9375c669e53fb10c01cb4f839c69acbe31066783c7ae3d36a92b0ef9e1141ae SHA512 e7744c76d2555db058b56e1773d47d3b86291395fe83036af263a12a54099990ba2cf463c89a61e6dfacdadc5a73b6ef0e265dd5e2a51a4f3dbeacd0c97a3eeb
+EBUILD eom-1.22.0.ebuild 1368 BLAKE2B 974c39063c4666a9c6c7a5748d41d5f7f80748423e6941cb120aab9369a52f2f23888013e1bf1519ade27abb540290c607a95357ad48db2899a4ed21be2e8ac4 SHA512 56ef038a5e994fea720703b4cdb5a7b7b9d6f6202a76d2e40f3973899e0b78546e3ac1fce01799225712bd0ead9f91570b05eac4b4943d186688030c99e7ecdd
 MISC metadata.xml 332 BLAKE2B f99f5d545ed10be2869ef90b4b80eeb7a8ffbdc291f5808a121842d7f6faa1de8ebd0b2cbe13db7ae04b6073387a29dcf78fa90dc6ef3b31cab07551f7c02f5d SHA512 e915e0cb254f2e1a431eccd93b45be28d85b33f0d988508031dea48a87be182a54cea01fcffecc202c029b0b6156860471841ed871e00c929fde1fb0dceb4317
diff --git a/media-gfx/eom/eom-1.18.3.ebuild b/media-gfx/eom/eom-1.18.3.ebuild
deleted file mode 100644
index 8b4d2d8201bc..000000000000
--- a/media-gfx/eom/eom-1.18.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus 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]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=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 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	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}"
-
-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:*"
-
-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) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild
index b0edd30076c5..c0f71f634ca6 100644
--- a/media-gfx/eom/eom-1.22.0.ebuild
+++ b/media-gfx/eom/eom-1.22.0.ebuild
@@ -6,16 +6,16 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="The MATE image viewer"
 LICENSE="GPL-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="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libpeas-1.8.0[gtk]
@@ -29,7 +29,6 @@ COMMON_DEPEND="
 	x11-libs/libX11
 	>=x11-misc/shared-mime-info-0.20
 	virtual/libintl
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	exif? (
 		>=media-libs/libexif-0.6.14
 		virtual/jpeg:0
@@ -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}
+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:*"
+	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) \