diff options
author | David Seifert <soap@gentoo.org> | 2019-12-13 16:07:03 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2019-12-13 16:07:03 +0100 |
commit | 3c0f9aaeb80e3846c609e9e13647bf85885de795 (patch) | |
tree | 7424dc637666647245ab62d881541a85900fcabf /media-gfx | |
parent | net-misc/unison: Assign RESTRICT only once. (diff) | |
download | gentoo-3c0f9aaeb80e3846c609e9e13647bf85885de795.tar.gz gentoo-3c0f9aaeb80e3846c609e9e13647bf85885de795.tar.bz2 gentoo-3c0f9aaeb80e3846c609e9e13647bf85885de795.zip |
media-gfx/aview: Port to EAPI 7
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/aview/aview-1.3.0_rc1-r3.ebuild | 32 | ||||
-rw-r--r-- | media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch | 4 | ||||
-rw-r--r-- | media-gfx/aview/files/aview-1.3.0_rc1-includes.patch | 36 |
3 files changed, 45 insertions, 27 deletions
diff --git a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild index 4487794334ea..728a22350066 100644 --- a/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild +++ b/media-gfx/aview/aview-1.3.0_rc1-r3.ebuild @@ -1,42 +1,32 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit base +inherit autotools MY_P=${P/_/} -S=${WORKDIR}/${MY_P/rc*/} + DESCRIPTION="An ASCII Image Viewer" -SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" HOMEPAGE="http://aa-project.sourceforge.net/aview/" +SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" -IUSE="" -DEPEND=">=media-libs/aalib-1.4_rc4" +DEPEND="media-libs/aalib:=" RDEPEND="${DEPEND}" +S="${WORKDIR}/${MY_P/rc*/}" + PATCHES=( "${FILESDIR}"/${P}-asciiview.patch "${FILESDIR}"/${P}-includes.patch ) src_prepare() { - base_src_prepare - - sed -i -e 's:#include <malloc.h>:#include <stdlib.h>:g' "${S}"/*.c || die -} - -src_compile() { - make aview -} - -src_install() { - dobin aview asciiview - - doman *.1 - dodoc ANNOUNCE ChangeLog README TODO + default + mv configure.{in,ac} || die + eautoreconf } diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch index 6d71bbb967b1..6d547ea0f13a 100644 --- a/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch +++ b/media-gfx/aview/files/aview-1.3.0_rc1-asciiview.patch @@ -10,8 +10,8 @@ asciiview script (bug #293654) by Kevin McCarthy <signals@gentoo.org> Rollup patch created by Kevin McCarthy <signals@gentoo.org> ---- asciiview -+++ asciiview +--- a/asciiview ++++ b/asciiview @@ -3,13 +3,13 @@ clear() { diff --git a/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch index 3e5006b4c549..79b819e95882 100644 --- a/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch +++ b/media-gfx/aview/files/aview-1.3.0_rc1-includes.patch @@ -1,7 +1,25 @@ -Index: aview-1.3.0/main.c -=================================================================== ---- aview-1.3.0.orig/main.c -+++ aview-1.3.0/main.c +--- a/flip.c ++++ b/flip.c +@@ -7,6 +7,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <string.h> + #include <sys/time.h> + #include <unistd.h> + #include <aalib.h> +--- a/image.c ++++ b/image.c +@@ -1,6 +1,6 @@ + #include <stdio.h> + #include <unistd.h> +-#include <malloc.h> ++#include <stdlib.h> + #include "config.h" + + int imgwidth, imgheight; +--- a/main.c ++++ b/main.c @@ -1,4 +1,6 @@ #include <aalib.h> +#include <string.h> @@ -9,3 +27,13 @@ Index: aview-1.3.0/main.c #include "image.h" #include "ui.h" #include "config.h" +--- a/ui.c ++++ b/ui.c +@@ -1,6 +1,6 @@ + #include <stdio.h> + #include <ctype.h> +-#include <malloc.h> ++#include <stdlib.h> + #include <string.h> + #include <aalib.h> + #include "shrink.h" |