gentoo resync : 13.06.2020

5 files changed, 12 insertions, 78 deletions

diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index b1d0e3367795..381d0ede373b 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,7 +1,5 @@
 AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f75e7c4e6e8f994ec2881f173919c34625d80357882b28157f72ea6d0bbd6331473c6b213857c3e8a5db92bad SHA512 8e7b30bb73b87981b2d2c4e9bff8f62b5e59d341410dee0d4ecb889a0f39cfb38539a8d6ef2a738517ab5034c035e6588a4d2b7220bd408a2dd040f6cb8d7088
-DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
 DIST sxiv-26.tar.gz 48569 BLAKE2B a73707e2fd699b53e38ddc48710a73b945d4e102743567283d7351c92c513e4e57a32c409267593a2c5808caf811b7caeb555f8ba2762f1cc76a421aceff0e95 SHA512 c4bd56ea14e520ea9b116e275009f2089e5c434d6894281215b09d07572b2d3190c3c3eca015a2933328d704afb7d443a66e858b4e6904a3d4d45378b35d22cb
-EBUILD sxiv-25.ebuild 1293 BLAKE2B 715b77644c20bae1c82681a17ad3dd2d2faa8944148c5df2bd1fe13394aa579fea2ca6d1e903d1512c010a3042e6314ab98a03c59dfdf9079a7413981b177eb6 SHA512 1a1c372246eba6f11fff1fd4821b2f9e20e2fbf45d222d05480c4761417302e05b427654b5ec632b92d4b4865e5749348985dae4c3e09725729bb45d92e2d9dc
-EBUILD sxiv-26.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
-EBUILD sxiv-9999.ebuild 1239 BLAKE2B c860e96538e8bfe6712ce11d13fcd27d91af12a463dcb6963314d4757f96fa271b0f2bbe403f96cba534c5f3700d551653ac1d765dd7273ffe16cdc9be3739a5 SHA512 f5fed5f22046c485b8f7b621f10a29aaa44496287199752ef26e59db3b5980d307440afcce925ded90403e13d2de689f5eb844660725693864fff9060a603d44
-MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
+EBUILD sxiv-26.ebuild 1242 BLAKE2B dace256bd75c7e7421929c73c8ac19aa1efff88272ec252978cdda82c6b0569caf8accd2064695776d4e4a9a5e71c7770718f8406aeefc2a7e7ae52ea049a8de SHA512 5137f18cf6724384fe870261efd191235d45c272f5d0e1cd5d587ac726b53778bfde1327456fa71207a29f260a7bbb2d8a30a8533c94173607e1d62940f00c3b
+EBUILD sxiv-9999.ebuild 1246 BLAKE2B e373fa15d8406c1322909cce4e283d16ca518b44b9891b262be92ff91f07cea6f14fb74e2d4981c6ba4d447890a8fd5f44fbff6fb1927eca92b97419849cd49d SHA512 1302dde4adaa04764b067c9003c3bb5fafeee1d85e28f4508d8f22c393343b788410f0ad23dc6570dca2f11d32ec7ae5b4187384a39be82c7d2f172df1bebbb5
+MISC metadata.xml 329 BLAKE2B 56d76981812833d6dbdb0624928ad01d11cd9ab2c29b5214be020babd7cf0a75b80b0c8a7ef3c68a71ea9b387214b07254519e19717a0eb4e5b4f06f1116ebaf SHA512 b575d697e5a580b68cd5780f68dd2024357fd89510eba100faf5e63f4aa904488a4c9317369e4909eaebd41ab67af8bcaeddc2fae04f2239abc6ddfe4d8473fd
diff --git a/media-gfx/sxiv/metadata.xml b/media-gfx/sxiv/metadata.xml
index c8196c0a0547..98e54fd27945 100644
--- a/media-gfx/sxiv/metadata.xml
+++ b/media-gfx/sxiv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>graphics@gentoo.org</email>
-    <name>Gentoo Graphics Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">muennich/sxiv</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">muennich/sxiv</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
deleted file mode 100644
index 2c633fa3bd9c..000000000000
--- a/media-gfx/sxiv/sxiv-25.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="exif gif +jpeg +png"
-
-RDEPEND="
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?,jpeg?,png?]
-	x11-libs/libX11
-	x11-libs/libXft
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	restore_config config.h
-	default
-}
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX=/usr install
-	emake -C icon DESTDIR="${ED}" PREFIX=/usr install
-	dodoc README.md
-	domenu sxiv.desktop
-
-	save_config config.h
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
index 890ffab338b5..9899cc4c2634 100644
--- a/media-gfx/sxiv/sxiv-26.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ppc64 x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 890ffab338b5..aec37a2bfba8 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"