gentoo resync : 29.10.2017

3 files changed, 66 insertions, 6 deletions

diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index ae2918d75a83..286703f5b9b1 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,6 +1,8 @@
 DIST sxiv-1.3.2.tar.gz 46560 SHA256 9f5368de8f0f57e78ebe02cb531a31107a993f2769cec51bcc8d70f5c668b653 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5 WHIRLPOOL 8b02d693cbe8be31f81de8a0d69f218fbf2919f937fadc93657db4837bcb41e05c7b41ecbb24bfc559a1edda2d8b9f0ad14cb2118264ae52d14ac883e82dc56a
+DIST sxiv-24.tar.gz 47148 SHA256 511dc45d12962af9c31c3068ce6bca4b832a6263946b27befea49a48cf019110 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b WHIRLPOOL c953f72732ec98a3cb140925f9974163682632787674c5145e400fc831fe558747a3ebc3a4dee3d199b5f0130620b93f7154dad9ed7d12b410b41562174fff88
 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
+EBUILD sxiv-24.ebuild 1221 SHA256 7b361fa43e84ddb7c23fe4242eadd54924819c69347fad9130a35198208c2480 SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20 WHIRLPOOL cba17d81f8acb26a6e06b6288c05bdeda6687b73a603b3e0bf38b2df442941e8f3bda2646f57230e39214970aceda86efa76d1efbd2edf76d1501cd0499db7a6
+EBUILD sxiv-9999.ebuild 1221 SHA256 7b361fa43e84ddb7c23fe4242eadd54924819c69347fad9130a35198208c2480 SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20 WHIRLPOOL cba17d81f8acb26a6e06b6288c05bdeda6687b73a603b3e0bf38b2df442941e8f3bda2646f57230e39214970aceda86efa76d1efbd2edf76d1501cd0499db7a6
 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-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
new file mode 100644
index 000000000000..778e21dde204
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-24.ebuild
@@ -0,0 +1,62 @@
+# 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
+	x11-libs/libXft
+"
+DEPEND="${RDEPEND}"
+
+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-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 97e80c6e0ef6..778e21dde204 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -30,16 +30,12 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	sed -i '/^LDFLAGS/d' Makefile || die
-
-	tc-export CC
-
 	restore_config config.h
 	default
 }
 
 src_compile() {
-	emake V=1 HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+	emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
 }
 
 src_install() {