commit: 8c7e004765caf9ddac852e96bc3ba5d01e1a050a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 19 04:53:48 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 19 05:02:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7e0047
app-misc/gnuit: port to EAPI 7, respect AR Closes: https://bugs.gentoo.org/722314 Signed-off-by: Sam James <sam <AT> gentoo.org> .../gnuit/files/gnuit-4.9.5-format-security.patch | 5 ----- app-misc/gnuit/files/gnuit-4.9.5-respect-AR.patch | 10 ++++++++++ app-misc/gnuit/gnuit-4.9.5-r2.ebuild | 21 ++++++++++++++++----- 3 files changed, 26 insertions(+), 10 deletions(-) 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 ec2a1c51fdb..6ae1d9a3ebf 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 00000000000..ea18af55bd8 --- /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 904f321af2a..be1fe1604d6 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-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit epatch +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() {
