gentoo resync 04.02.2018

3 files changed, 2 insertions, 81 deletions

diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index db9619591c86..85105bdf6713 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,6 +1,4 @@
-DIST sxiv-1.3.2.tar.gz 46560 BLAKE2B bdbd8bfac7cf4575347923657f8637d2cefbb5c8345b65937e410301e9e37c70b99323734d3469959548d1d6fc74dea2aec4ec5e1de1612ec6b0ce462785f0b1 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5
 DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
-EBUILD sxiv-1.3.2-r2.ebuild 1459 BLAKE2B e9d28513bc507f3a617d436d1c6b78181f0ef56b35c99441a9d1003681dcb0431365b758b0d5c8eb4b34933afbd62ed79e50dc301e1a18304005f03a0bf3cb25 SHA512 51a5493a1e8c5d31b31348f4c7ee30490f4b518e31713c48cae031cd3ecf4f280381ffd548c753450a6f27b092e87314ecf41c5f5f5998a032fdf1a7bcf8f612
-EBUILD sxiv-24.ebuild 1221 BLAKE2B 6d8f507998cb308c26051e953e975380220aecca848a6bafa492a9853186986f8916ccfc43690085aec04904b3ab701b36cac6f1852f1d92186618f07339305a SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20
+EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370
 EBUILD sxiv-9999.ebuild 1221 BLAKE2B 6d8f507998cb308c26051e953e975380220aecca848a6bafa492a9853186986f8916ccfc43690085aec04904b3ab701b36cac6f1852f1d92186618f07339305a SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20
 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515
diff --git a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild b/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
deleted file mode 100644
index cbff57e39928..000000000000
--- a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils 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 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"
-
-RDEPEND="
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib:0= )
-	media-libs/imlib2[X,gif?]
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i '/^LDFLAGS/d' Makefile || die
-
-	# disable exif support as required
-	if ! use exif; then
-		sed \
-			-e 's/^.* -DHAVE_LIBEXIF/#\0/' \
-			-e 's/^.* -lexif/#\0/' \
-			-i Makefile || die
-	fi
-
-	# disable gif support as required
-	if ! use gif; then
-		sed \
-			-e 's/^.* -DHAVE_GIFLIB/#\0/' \
-			-e 's/^.* -lgif/#\0/' \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-
-	restore_config config.h
-	default
-}
-
-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-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
index 778e21dde204..67f72a7ea320 100644
--- a/media-gfx/sxiv/sxiv-24.ebuild
+++ b/media-gfx/sxiv/sxiv-24.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 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"