From 0ad92ec69e2023421c13b74865e31f5aedc13c48 Mon Sep 17 00:00:00 2001
From: haarp <main.haarp@gmail.com>
Date: Mon, 26 Oct 2020 00:11:43 +0100
Subject: Fix img2xterm

Signed-off-by: haarp <main.haarp@gmail.com>
---
 media-gfx/img2xterm/Manifest                 |  2 +-
 media-gfx/img2xterm/img2xterm-9999-r1.ebuild | 32 ++++++++++++++++++++++++++++
 media-gfx/img2xterm/img2xterm-9999.ebuild    | 30 --------------------------
 3 files changed, 33 insertions(+), 31 deletions(-)
 create mode 100644 media-gfx/img2xterm/img2xterm-9999-r1.ebuild
 delete mode 100644 media-gfx/img2xterm/img2xterm-9999.ebuild

diff --git a/media-gfx/img2xterm/Manifest b/media-gfx/img2xterm/Manifest
index 3580119..78d019d 100644
--- a/media-gfx/img2xterm/Manifest
+++ b/media-gfx/img2xterm/Manifest
@@ -1 +1 @@
-EBUILD img2xterm-9999.ebuild 623 SHA256 e946eed00cb577a9f8ce0f86b2981b4125f7a887fb4b00fafa28f5121c970785 SHA512 b18ce5cdebfb1069ca9c14c02389950e3f6cacaca32327162225c636144870084ddf31af0f424fb617e0fbca55aa6fe1298446610c8d9c83ce110f7209420777 WHIRLPOOL fa34426c8702dd009027a144b1e209a9f84d4a95587f891ecabf9508187b533c722c121e8378ce8e5aedd577741a7973cfea9db8b1ff08bc2db26332a8873dd7
+EBUILD img2xterm-9999-r1.ebuild 754 BLAKE2B 4faa5cc09fa2c3b16bf1c0831392b91995393133a7791d377764f0adfbfcabbf80b8306c896eded321fab75c53979c5e1f226c5b53fdbb3d338affe4640b71ac SHA512 9d77df9f71b410f437b26edfb3ff16fe651a276d2dd89b7a9bc5f1dd9fe1c128b77770bdb862b7880a59897ba0b07e30c6f6ce021adf643f57ec2a29c527c1c5
diff --git a/media-gfx/img2xterm/img2xterm-9999-r1.ebuild b/media-gfx/img2xterm/img2xterm-9999-r1.ebuild
new file mode 100644
index 0000000..1c210a7
--- /dev/null
+++ b/media-gfx/img2xterm/img2xterm-9999-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3
+
+DESCRIPTION="Displays images on your 256-color terminal with Unicode block characters"
+HOMEPAGE="https://github.com/rossy/img2xterm"
+EGIT_REPO_URI="https://github.com/rossy/img2xterm.git"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5
+	media-gfx/imagemagick"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+	sed -i -e '/CC = gcc/d' -e '/CFLAGS = -O2 -Wall/d' -e '/LDFLAGS = -s/d' Makefile || die
+	sed -i -e 's@wand/MagickWand.h@MagickWand/MagickWand.h@' img2xterm.c || die
+
+	eapply_user
+}
+
+src_install() {
+	dobin img2xterm
+	gzip -dc man6/img2xterm.6.gz > img2xterm.6 || die
+	doman img2xterm.6
+}
diff --git a/media-gfx/img2xterm/img2xterm-9999.ebuild b/media-gfx/img2xterm/img2xterm-9999.ebuild
deleted file mode 100644
index e711029..0000000
--- a/media-gfx/img2xterm/img2xterm-9999.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3
-
-DESCRIPTION="Displays images on your 256-color terminal with Unicode block characters"
-HOMEPAGE="http://img2xterm.sooaweso.me/"
-EGIT_REPO_URI="https://github.com/rossy/img2xterm.git"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:5
-	media-gfx/imagemagick"
-DEPEND=${RDEPEND}
-
-src_prepare() {
-	sed -i -e '/CC = gcc/d' -e '/CFLAGS = -O2 -Wall/d' -e '/LDFLAGS = -s/d' Makefile
-
-	eapply_user
-}
-
-src_install() {
-	dobin img2xterm
-	doman man6/img2xterm.6.gz
-}
-- 
cgit v1.2.3-18-g5258