gentoo resync : 13.10.2017

4 files changed, 4 insertions, 58 deletions

diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 6475c6fb3ace..ae2918d75a83 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,7 +1,6 @@
 DIST sxiv-1.3.2.tar.gz 46560 SHA256 9f5368de8f0f57e78ebe02cb531a31107a993f2769cec51bcc8d70f5c668b653 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5 WHIRLPOOL 8b02d693cbe8be31f81de8a0d69f218fbf2919f937fadc93657db4837bcb41e05c7b41ecbb24bfc559a1edda2d8b9f0ad14cb2118264ae52d14ac883e82dc56a
-EBUILD sxiv-1.3.2-r2.ebuild 1461 SHA256 cec4db2abb95f58d3d97eb9cd6df5342fa9326b6756fb022b3054bcc48844057 SHA512 8428c83942cd9d4b96df43d7672ebcced049688d2e728d215846cb9b0469a9d3771211dce9b5acfa4dccee19a74c54b6a3455252f3be9afa8b470b8a76ee4d9f WHIRLPOOL 8515c544d1a11d95b50b6ad5dc8a460c6eaa2fc632bf53f64c61fc050e0ec73507b8a95372f4ea3972f2a600d7ff9944c8a071c788537dd220997d1693153dae
-EBUILD sxiv-1.3.2.ebuild 1003 SHA256 4dc95fa3eb80227156148861940d07ecb95992e4b5af1dcb2bb7f889cf32666d SHA512 bab18754311fdd0f2ac95ec354c2d180e1761510fe72269ecfe05d48b5cdd64bf991d5f0df6d301c4c4d0e63a6777b56b1b6679ccc866834f826747a3e2cb7a6 WHIRLPOOL 8ccd310b1049dda9eb3a474fc6be73ee0a51e64b7eb69bc6fca68565fc4f522b44c572e224d5cfd502ecd49f75c6d64b37b54bfe046910c6c2adfda85141de32
-EBUILD sxiv-9999.ebuild 1252 SHA256 06d6871fccb2f775bad1a092d76a37f32cc3036a0ad153494f89089eaf7aebad SHA512 5609688ab5b916bbd97236d673f36f2a6e62ec3bf54bb8c7f6057bea999710937e7fc390d3756f8c27087dec0ecb88d010cf849dc37a819717ed282d2f478ad9 WHIRLPOOL 04e69727ced9ee3c0007a1802e6fe1005a054d1522a5ab8b4f61bc1fb648ce7953a14ec67715962c8ddbbe13037eed2284146a90db6964ac2c1f058060f41f58
+EBUILD sxiv-1.3.2-r2.ebuild 1459 SHA256 83330a2ca3fcaa9414af8ca1891275fdb1502b74de7cccb9fc69d2084cb02163 SHA512 51a5493a1e8c5d31b31348f4c7ee30490f4b518e31713c48cae031cd3ecf4f280381ffd548c753450a6f27b092e87314ecf41c5f5f5998a032fdf1a7bcf8f612 WHIRLPOOL 36e55570496ac62bc79c10c45046aef535d1527ada69294084452949883f198e49b4a94314678b2fa9212b05f14e4f7653572cae5793074985ad89c57f94aa2e
+EBUILD sxiv-9999.ebuild 1258 SHA256 d6734ae3b51148e01829cf6fdc7898900c95ac220f1e144620216153ec860d2c SHA512 b7cbf84906936199ffbef5b4c8521422eeba10e56184628292139c9a7e52a068eb7b6e662bf768dd657931f4b853c76a33b1ef0f0a88f81aacbb2bd6db7db641 WHIRLPOOL 4320b4b89406a4b2d26a66392e3dc153077a73a800016d3995c018a477681458b12f9d4a625a9a66fe45ce5d17abaf46b839ec7969438bd22fef44459e4fd837
 MISC ChangeLog 3248 SHA256 2474ca34b0819b4dcc9643ccccf9779c1bba67a7045c1d572802aa36c31c2ec2 SHA512 7b8ee0459d914f72fad32b836d7c1ab751c1724c6badce5a5a5beb1bc2eaafa175c99aded8d1d6afea55c0dbbdee799f09e5e784397405f6452642eb5fbf82d8 WHIRLPOOL eaad3123a61ec6f3bf02665e0da71e3a5bac1b739dcd9230e842e90942a783996f455b79b0eb3c84308f2115a451bdb3403045d8a60052253414ed0a981ddff6
 MISC ChangeLog-2015 3032 SHA256 d32d7e3e8804e3161fc06781661b9ce6e1e76db7b3c3e7e266b0bb8bf57c659e SHA512 c2afbb46e5598e39a5d143552fc5179722f356fcac5971f08ac3a10c731c0ea0d1529db9d870427ad167a86f425f26edb59630ef76e20ed48c2586e4fca8e72c WHIRLPOOL ab4f842af814b346d47054277e58411b954a470c31919a19a84983b0cd6e651b350cdf09046cd4cccb5defa3478d519c209a9e664bb07b6e574c3e71e0067221
 MISC metadata.xml 347 SHA256 0e9bedb2007085ad5f1280eae4c796d35b76d5e36ef8bdbd1a7021924d6d439c SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515 WHIRLPOOL f78ac0c0a3e24f0fc15d5f5ecf18c0a3012bc50265584f519c125ed2a0f9bbd07248766a30485f6cf42fc9030c8ff88e6aa670e29b435980df38bf03fff34473
diff --git a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild b/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
index 937dac0c4cf7..cbff57e39928 100644
--- a/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
+++ b/media-gfx/sxiv/sxiv-1.3.2-r2.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"
diff --git a/media-gfx/sxiv/sxiv-1.3.2.ebuild b/media-gfx/sxiv/sxiv-1.3.2.ebuild
deleted file mode 100644
index a5ce018584de..000000000000
--- a/media-gfx/sxiv/sxiv-1.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fdo-mime gnome2-utils savedconfig toolchain-funcs
-
-DESCRIPTION="Simple (or small or suckless) X Image Viewer"
-HOMEPAGE="https://github.com/muennich/sxiv/"
-SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	media-libs/libexif
-	media-libs/giflib
-	media-libs/imlib2[X]
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i '/^LDFLAGS/d' Makefile || die
-	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() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 3e670c67d76c..97e80c6e0ef6 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake $(usex exif "" NO_LIBEXIF=1) $(usex gif "" NO_GIFLIB=1)
+	emake V=1 HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
 }
 
 src_install() {