gentoo resync : 15.12.2019

4 files changed, 48 insertions, 30 deletions

diff --git a/media-gfx/aview/Manifest b/media-gfx/aview/Manifest
index 93f528a586f7..bc823931a852 100644
--- a/media-gfx/aview/Manifest
+++ b/media-gfx/aview/Manifest
@@ -1,5 +1,5 @@
-AUX aview-1.3.0_rc1-asciiview.patch 1936 BLAKE2B bdf5ba38805fb2f8920ca9c3b342a69b76b01d33df5667a57ba0cbdcde576f8847f7b0cac420f3744516f74725e72ef1170d44a21a53536046d33329d6a7a83e SHA512 3666e403e5ed8b4be557b8aea314e33e5ad7162c2d7c7291810b4bc6824161f53a5b5b5325c4a4667467f72582303693710750e1d30a3761304346bc335f6299
-AUX aview-1.3.0_rc1-includes.patch 281 BLAKE2B 768cd3d142a119910e88b0cd219ec1a431549df18427cb3ae22fd91ae99ec23fc223da8025fc9bff82fd8268dcb7dcd017d0c53ad6c323bd4e3735cd9f658b38 SHA512 c8a5303be05a9205baba541e286725413fd8e8b161cb7d0bb1a32a8809b4e977ca12b9bd0df2c793be0e72e2353fdf9b09f96d541d361c5df87af7885cc350c7
+AUX aview-1.3.0_rc1-asciiview.patch 1940 BLAKE2B 595c179934b0978246ed520434cc1454ff9aa36ced73c162080676114a0706c09acf3d05fab12bf5c57580cf1e96c7aea74b8bc65265276dc5e88fd359b9cddb SHA512 5b3afbba50a6338834798d9b380c2246011f3c465a2515ef0a5701c5eade5fdb0b09518e64906b10fb6b4a2bf8e9a419463c337a4672bcf79cae35cce2d0143a
+AUX aview-1.3.0_rc1-includes.patch 690 BLAKE2B 7d081353c4e245440820765710e25e769d8482fd7c8ad9160bf59776268240804f8e365a28c2a569324c8ca3bdb11f7cb7d0dce1225cc2779ff0c74122767ad0 SHA512 42104612c07740269f311bc264b20775035a1f11dabf1c662b3cf800f9a6e623081d7fba9731ee3d06b0f14030c848166409a6801fd035f03f8ba8479abb118a
 DIST aview-1.3.0rc1.tar.gz 54317 BLAKE2B 3a47dab51763f7c5cd9d4d5950437f3e0b86b46a9bf498c93e88258daefb511c82789b1d4bb1288844dbc70aae033fd0ffd9ffab4b28eb553effa7a2c777ef69 SHA512 941f2a92aaf3852b403daf688cda4ca2eb82ec32ee6566cd2aef3d121f259f1bb0214f872c4d5020c658bd81adba0577313acc5972d2f44b295f21905e107144
-EBUILD aview-1.3.0_rc1-r3.ebuild 795 BLAKE2B c5555997150e6ced634ebf32f6b98614edbefad00a26154c5331ef4a7d3e160f88853930c58f77fb85fda25b27c65aff00a9d882d4e832abfe9774522d50203b SHA512 8d627352973103e17ccf063302ce96bb772b1c0453326a3783281757222cb9eb2956b4b07da23964d6fad06ac9961f590be021e9910cc0fbcfe61932c7071796
+EBUILD aview-1.3.0_rc1-r3.ebuild 622 BLAKE2B 3356e52232cd0b5820ae25c07abcb2c227edeb205833e55fac8413ad71f0d1e5e6ab0b1669761ac7ab901af171a0b6c0d3a8f9f4cb6abd2cd8e07ef6d7cdb9ab SHA512 22a4c563a5f4be3b6687e739b0067e60ade9822fe51f81dca6cd9019395f1a29924f6b7c115e0d009996bd3c106b982c821e0bad4172b6b6d60a16417fc20ce5
 MISC metadata.xml 252 BLAKE2B e7a66be557802d7ca467631d022e882e2985f5d724603ca154106cc8ac13a6c13bb9d2c9d69cfc68871ec9473dc93e883e62d6463496d5ce8987546dfe2afeb3 SHA512 bd3eef9d63a167ed485cb156ca81b53649a9ed2bd4fbaf3f58328cadb09f5b4b65b2343a6f032b7540c445a98bb6c3abb3084f91dc1cf78ecfe9a067732e4385
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"