From fe1b7749e9c68227f68f29c0c7cd47ecf63bb85b Mon Sep 17 00:00:00 2001
From: Tim Harder <radhermit@gentoo.org>
Date: Mon, 21 Aug 2017 16:01:06 -0400
Subject: media-gfx/sxiv: fix exif/gif USE flag logic (bug #628442)

---
 media-gfx/sxiv/sxiv-1.3.2-r1.ebuild | 77 -------------------------------------
 media-gfx/sxiv/sxiv-1.3.2-r2.ebuild | 77 +++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+), 77 deletions(-)
 delete mode 100644 media-gfx/sxiv/sxiv-1.3.2-r1.ebuild
 create mode 100644 media-gfx/sxiv/sxiv-1.3.2-r2.ebuild

(limited to 'media-gfx')

diff --git a/media-gfx/sxiv/sxiv-1.3.2-r1.ebuild b/media-gfx/sxiv/sxiv-1.3.2-r1.ebuild
deleted file mode 100644
index 75f593a1b0f9..000000000000
--- a/media-gfx/sxiv/sxiv-1.3.2-r1.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_GIFLIB/#\0/' \
-			-e 's/^.* -lgif/#\0/' \
-			-i Makefile || die
-	fi
-
-	# disable gif support as required
-	if ! use gif; then
-		sed \
-			-e 's/^.* -DHAVE_LIBEXIF/#\0/' \
-			-e 's/^.* -lexif/#\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-1.3.2-r2.ebuild b/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..937dac0c4cf7
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-1.3.2-r2.ebuild
@@ -0,0 +1,77 @@
+# 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
+}
-- 
cgit v1.2.3-65-gdbad