gentoo resync : 19.03.2019

3 files changed, 76 insertions, 2 deletions

diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index d0551297da11..c23a1594d6c6 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -5,10 +5,12 @@ DIST feh-2.27.tar.bz2 2131975 BLAKE2B 84100beaff26454c8d33a479171b1b59402b74d048
 DIST feh-2.28.tar.bz2 2132687 BLAKE2B 92e428250a7fc01b5ecc8783d1a0f325ab168935eb6533a5726681389c05f662d9f7b978a50c2f1ef4d5cfd6f356e758cfff781072143902dbdab41f2310b705 SHA512 565a5aa0ce1c29fb2f09995283dbf2e12e0f228294df7c1b744a545e4f550126e0b327e9903c9eb35cb7dbd96d69e4653c57f3b3cb2dc2475680b3c62b71e1d8
 DIST feh-3.1.1.tar.bz2 2109534 BLAKE2B ea02ab09791ef61a9ac5db84b5a0f69ddc76f994343660cf4072a41769a59ddd2936e0f047eeed26be0b3676711b1e440c0483325e6bb621205788ebe13c1fca SHA512 cbdf6e36831a750a6bdb9f1a5735c814662b5274d9c453392de88b98926b539cc54e2041fc0cd2a393762f14ec24b81435de6d506d9efc1ee4c7d80105aa6243
 DIST feh-3.1.2.tar.bz2 2109860 BLAKE2B eb3c4b0d93a6b18477626d1cf4d99fa96e0ccd2bd21ad646ef7afa31c5f9e318c7b20eca2615f13d537806caee16a7ae6f789ebdf2dc3eb7b53ba8824e807333 SHA512 a81ee5d8d0ac3ce13cfc5af6e1f5854235755ea54dd92a1019ff206617f1c46196a5e3a0794bbc886e89854b221f99b6e3fe387fa7d50bb0cbc3a2d9e834bbbc
+DIST feh-3.1.3.tar.bz2 2110285 BLAKE2B ee42b766eccf7e4661a47bd6c748b2e0cc6345fb9c08de425b0f4ef87c7fb383dd20140fb2c8b2fc540b70a6c01bb612b48aa76fc1f47a117f2503257bf3b403 SHA512 dc4960706e4134bbe6c34036a9c9b7cd98eb8935e13e2354504664a1599d4af193c6b977433a40c7e3638b2b3e2928960e0c755b04f7c48076ef15445f792583
 EBUILD feh-2.18.3.ebuild 1194 BLAKE2B a9ba56ee28f45ba475db7373f3caf7534fb9cb1e020b85b6f4fa19fecd00cd23c493d862b662639e73cd2e9b38bc8703e42a36107e26cee636b0ad871b1d6990 SHA512 f23c472d2686a21fb3c81111415682d059a121eb5e0a14a6a71298395407e3aea0f5a16b9d91ca8c46c2e7a1ce455656832863ba63de2a142e056dac132e7346
 EBUILD feh-2.26.4.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 EBUILD feh-2.27.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
 EBUILD feh-2.28.ebuild 1470 BLAKE2B 495d4329c2ba76a0715a7cb543b488e25770d0ddc93065c4a8dd94b39830cdc753e3fcecc3661e681aca176595a67bf52377bca3afe361b4c055dcca4ef2eddd SHA512 62e7f3e5c35080196eeeeb348ddf72e692b92914718c8ced8222248694ba99d04d49585fc5c8dcce430ff109c2ebd4ff958b7db492677debb67ec8eb76761b69
-EBUILD feh-3.1.1.ebuild 1466 BLAKE2B 255d6fb69535b31a1775c5be3779e72550c03ddf67f77c22bd237ee468bfc85f9eca7641d1f1a8ef051c2c8172dd8c8e6b1ffefef065c86b72ea665fa2ab5c85 SHA512 b240119bbc8adede6ca0232770d755f00ed0fa37eca2984defe148cb3fa28cb6e61bb075eb18407dca7b3b3a01e68a9289d5cea9d759b419040dab714736bd14
+EBUILD feh-3.1.1.ebuild 1465 BLAKE2B 7b9dff611b47e425b139fc5e463b8f431b7e236070b933f2cff911e70a8a9bb9b2a8cfc98cfd8a69aa1e4032f3b3fd6e99b5989ed323ea0a2d2a43b303b96df8 SHA512 c26f1b0f8358833fd0e148cbf57e505154aee520d246bba740c589b780b265cf2215b6e02ed9b1acb8839b44cbb20ed9f286ed023d1ff7e8225a049bebf59099
 EBUILD feh-3.1.2.ebuild 1467 BLAKE2B 39c5f81f461a816de37e2bbdbb1b4aab6beca6c285981db80922d82b728a0ef539268d845b17c0413774fd7cc3d9e6019559d6c0949266f34521773b22d0dece SHA512 fca2377658182715b3d0c139a75a35e9ff834ec3ce8e813666f229178f033a9614f29cc0d2992dbb594a008d6cb07233928382b17496bf545ec87a48cc68e550
+EBUILD feh-3.1.3.ebuild 1467 BLAKE2B 39c5f81f461a816de37e2bbdbb1b4aab6beca6c285981db80922d82b728a0ef539268d845b17c0413774fd7cc3d9e6019559d6c0949266f34521773b22d0dece SHA512 fca2377658182715b3d0c139a75a35e9ff834ec3ce8e813666f229178f033a9614f29cc0d2992dbb594a008d6cb07233928382b17496bf545ec87a48cc68e550
 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19
diff --git a/media-gfx/feh/feh-3.1.1.ebuild b/media-gfx/feh/feh-3.1.1.ebuild
index 461f8261e5f2..98f7cb6d011b 100644
--- a/media-gfx/feh/feh-3.1.1.ebuild
+++ b/media-gfx/feh/feh-3.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
 
 LICENSE="feh"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~x86"
 IUSE="debug curl exif test xinerama"
 
 COMMON_DEPEND="media-libs/imlib2[X]
diff --git a/media-gfx/feh/feh-3.1.3.ebuild b/media-gfx/feh/feh-3.1.3.ebuild
new file mode 100644
index 000000000000..06c60d87c45b
--- /dev/null
+++ b/media-gfx/feh/feh-3.1.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs gnome2-utils xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}