media-gfx/sxiv: version bump to 24

diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 184b561ff2f4e5476d19082a7c6bb4e0d5cefd1c..19e9ea7a82d8a1abccab85a1d1b3ba6db2e74f6f 100644 (file)
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1 +1,2 @@
 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

diff --git a/media-gfx/sxiv/sxiv-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
new file mode 100644 (file)
index 0000000..778e21d
--- /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 97e80c6e0ef635b4dca5f84e3b98f0513a9b92e2..778e21dde2047414566855f9df8b67c8e4df58a8 100644 (file)
--- 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() {