gentoo resync : 03.11.2019

3 files changed, 12 insertions, 52 deletions

diff --git a/dev-util/autoproject/Manifest b/dev-util/autoproject/Manifest
index 96f212858731..ab33c5ee552b 100644
--- a/dev-util/autoproject/Manifest
+++ b/dev-util/autoproject/Manifest
@@ -1,6 +1,4 @@
-DIST autoproject_0.20-3.diff.gz 4704 BLAKE2B f94227d5792477f7bab8d9535fcc4a927a8d779121974ca1ea0b342859ca9946693d107514c874e216bbb202c1e9c7a02ee3fedf7d0dc0508965cfe0471d4c3f SHA512 8058fb2430010ddc8613c9e310c262b28379eb3d38b7e9badca7e3adb3560e5965bbe6612a0211d38920094a4851502471f9e1670e694ea3ef7d29bbfde340e9
 DIST autoproject_0.20-5.diff.gz 5287 BLAKE2B 3bc26c42876606c8a8a879a888ec1c51fac8de2b380ef10c1c346a35dcd4747b21264cf4d2161e55ea31d49393569a897aa98ff1b0a8576465fd5e06b77fd27a SHA512 156f8feff53936c3113bda9d8a3f2e19679f249656ace69aacb1f0a13ae93066eef49de3e5a268c47ed3e440144de629f6b84a477ecfc6a3f793c41412cc9b5a
 DIST autoproject_0.20.orig.tar.gz 151101 BLAKE2B 657a4a4baae35b038392c2cc78a1ab0e657229587e64105f0a6150ce83c29cd2305b716b12e706ea31fc31f091f21fc8b00f89dbcd753453944ee26f7fbc01f1 SHA512 eb6ba12af96e03f4da51b6b9fc0db618180d92b8a363f30182013a003bb13f5b66ee12b28531a234f6035b64bda29bb0f838466ccbeaddbce06a437a18c05288
-EBUILD autoproject-0.20.ebuild 774 BLAKE2B 5e7845e2f0fd3b0172e1c291e081d8ecd1e58c47658c3866bdbe54c86b69d11e1a0071d9f8ca703f98321452fafad513cf65b43bf37270a89cb64bcb65308ad4 SHA512 b6a2c8064d7774c09bded4ff170f557a273a5339ee21f34fc5a7104952ade04df5948f5f4c675e8c6e8e03a10866f175760058369581289394cce4db4c1f0fdb
-EBUILD autoproject-0.20_p5.ebuild 873 BLAKE2B b95bdb9de4bb8e0f4569c11d7cd888ebe088d7148000df140de2515124c70eeb811d14f08f625bd5f773217b92a7cb519dba05a8d95e38014e029ba4ca218641 SHA512 d248f8249106279717206a419cc50ee617b4bf92fde07a1808c6d5c9033b8666fcf881074ee6502f86938494320d8ccbb47c3eea4aaa9d46159a6e4ae051a487
+EBUILD autoproject-0.20_p5.ebuild 780 BLAKE2B e66ccd3049d18c020dd27a85c67475755d48280f7136b853dd62da3e41b655481c6e16f10be532b97e8121fb027bb4b9dbaa6e82d5bc2f2287f2eac304565ebd SHA512 6dd5cc4a451e832ceba81339d5e8768953e2c1bea096917208fb585ab78ca5841369d0303e95bb5f0fe16e88e2c0d90669f6910c0b45e7f81a492377aded7144
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/autoproject/autoproject-0.20.ebuild b/dev-util/autoproject/autoproject-0.20.ebuild
deleted file mode 100644
index cce818573a50..000000000000
--- a/dev-util/autoproject/autoproject-0.20.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DEB_VER=3
-DESCRIPTION="Start a programming project using autotools and a command line parser generator"
-HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
-SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/a/autoproject/${PN}_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="test"
-
-RDEPEND="sys-devel/automake
-	sys-devel/autoconf"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/texinfo )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${PN}_${PV}-${DEB_VER}.diff
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO ChangeLog
-}
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
index 239a51de78ec..9fd405115687 100644
--- a/dev-util/autoproject/autoproject-0.20_p5.ebuild
+++ b/dev-util/autoproject/autoproject-0.20_p5.ebuild
@@ -1,35 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 MY_PV=${PV%_p*}
 DEB_VER=${PV#*_p}
+
 DESCRIPTION="Start a programming project using autotools and a command line parser generator"
-HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
-SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
+HOMEPAGE="https://packages.debian.org/unstable/devel/autoproject"
+SRC_URI="
+	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}-${DEB_VER}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND="sys-devel/automake
-	sys-devel/autoconf"
+RDEPEND="
+	sys-devel/autoconf:*
+	sys-devel/automake:*"
 DEPEND="${RDEPEND}
 	test? ( sys-apps/texinfo )"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
-src_unpack() {
-	unpack ${A}
-	epatch ${PN}_${MY_PV}-${DEB_VER}.diff
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS NEWS README TODO ChangeLog
-}
+PATCHES=( "${WORKDIR}"/${PN}_${MY_PV}-${DEB_VER}.diff )