gentoo resync : 28.04.2021

4 files changed, 30 insertions, 13 deletions

diff --git a/app-misc/gnuit/Manifest b/app-misc/gnuit/Manifest
index 50245a0b535f..e75b08ee4c02 100644
--- a/app-misc/gnuit/Manifest
+++ b/app-misc/gnuit/Manifest
@@ -1,4 +1,5 @@
-AUX gnuit-4.9.5-format-security.patch 427 BLAKE2B 29d289419aafdcbbeec4d530f202036f0715fef4686df1564aa34302858e26856b678133ed618ae52fcb7f39bafa759173bcdae530c8c1e0a7b78614924fcbad SHA512 de604126f686af2eec160d4bd735f3888ee87a0b7bab38bb3d00d4dd26694c66810641687bb413933acb7991893a8772490fdc36fd001325d2a2b5f82bb3afc2
+AUX gnuit-4.9.5-format-security.patch 296 BLAKE2B b9e315a48ee9049c6eddd93bea1b934e917c35f32f993f30dc7f69dfb4f7203d56bccf6e292ca67e71ae1372296a2dac34d7e05bdc665e5d03d67f4e9ef104e6 SHA512 01b2bcd93d78db06eefb1e3c40350c4c2d47b1f5130574675baccaf49f2a4908f9f631b9563de36dac6ac2dbe78ae8bddfdec4af804dc68898b8ff91317aba98
+AUX gnuit-4.9.5-respect-AR.patch 170 BLAKE2B 3a3fea147bf671d745f6ed59609cb946a1e630a80000ebf28d8df79c65ad26751a0fd075e8407a8e4177de6ef446ecbac00d05fecb870ec2ae69c049d10d4c99 SHA512 0f7e1cb33e2d0025664f3975a5ca9e216114e9ac4f6b4bbbab7a22a96351609e1eb4490a04929e843ae4a37ac22c8b55e4fc716c9483089de4b5f0f3bbaaf471
 DIST gnuit-4.9.5.tar.gz 894362 BLAKE2B c609ac823dc93ab4092638dbfb19e85a9d7629f41be43ac1670341151daec49486c220b96b97492b9a51e4400e8581c2d7dc58c9092cf2c09e600d852993ab75 SHA512 91f1a86f45d5a2fab91941587aed3c1e57ae68271584bef38560c9a31fabbdfeba801d87cdf5640ba9f2041e43305e49c64953b8d5370f3f6a463b2fa2a7c5da
-EBUILD gnuit-4.9.5-r2.ebuild 1123 BLAKE2B 6af7d20778ed3600870fafd8bcaede31525e1abb41f5338689e4b542ce52b63813f85d81c246e723618dabc9bcaf7a4271996e4c96fb964f2ac2a6fa7b0c08e2 SHA512 412d4c1ac55b92223b7f78fa085d42355d21dca51006c2b5ac219f184a3f28443e467c184888dc433b44294711ba8d129051567d2f3664dc11fc1462c3456fd1
+EBUILD gnuit-4.9.5-r2.ebuild 1239 BLAKE2B a155fc898408bd506b16bfa22aa55181ede30fc64d546380a4601f5bf31e6e6287094218cb6e4e0edf364b428b79505d1b6d19e28aa9db21e1dd87f5d58096c2 SHA512 e9afac5875293c6442059955854ab494c7c3f0ba4c0f760f7dfb971ecc05f55912a597d107bc82f642bdd3a75292b8fd50fc7d05a13acbe17ce5003135b1b849
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
index ec2a1c51fdb8..6ae1d9a3ebf3 100644
--- a/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
+++ b/app-misc/gnuit/files/gnuit-4.9.5-format-security.patch
@@ -1,8 +1,3 @@
- src/git.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/git.c b/src/git.c
-index c6040b2..595912d 100644
 --- a/src/git.c
 +++ b/src/git.c
 @@ -1917,7 +1917,7 @@ main(argc, argv)
diff --git a/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch b/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch
new file mode 100644
index 000000000000..ea18af55bd8f
--- /dev/null
+++ b/app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,7 @@ AC_PREREQ(2.59)
+ AC_CANONICAL_HOST
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AM_PROG_AR
+ gl_EARLY
+ AC_PROG_CPP
+ AC_PROG_RANLIB
diff --git a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
index 3f949e51f693..be1fe1604d60 100644
--- a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
+++ b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit autotools toolchain-funcs
 
 DESCRIPTION="GNU Interactive Tools - increase speed and efficiency of most daily tasks"
 HOMEPAGE="https://www.gnu.org/software/gnuit/"
@@ -12,13 +12,22 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${PN}-4.9.5-respect-AR.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-format-security.patch
+	default
+
+	# for AR patch
+	eautoreconf
 }
 
 src_configure() {
+	tc-export AR
+
 	# The transition option controls whether a "git" wrapper is installed, it is
 	# disabled explicitly so we don't need to block on dev-vcs/git.
 	econf --disable-transition
@@ -26,8 +35,10 @@ src_configure() {
 
 src_install() {
 	default
+
 	#emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}/html" install
-	mv "${D}/usr/bin/gitview" "${D}/usr/bin/gnuitview" || die
+
+	mv "${ED}/usr/bin/gitview" "${ED}/usr/bin/gnuitview" || die
 }
 
 pkg_postinst() {