commit: 47a906a1763d185c40f5e12e351b6f553573817a Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Mon Dec 28 14:47:52 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 28 14:47:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a906a1
app-text/rman: Port to EAPI 7 Closes: https://bugs.gentoo.org/757570 Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: David Seifert <soap <AT> gentoo.org> app-text/rman/files/rman-3.2-format-security.patch | 5 ----- .../{rman-3.2-gentoo.diff => rman-3.2-gentoo.patch} | 5 ++--- app-text/rman/files/rman-3.2-ldflags.patch | 6 ++---- app-text/rman/rman-3.2-r1.ebuild | 16 +++++++--------- 4 files changed, 11 insertions(+), 21 deletions(-) diff --git a/app-text/rman/files/rman-3.2-format-security.patch b/app-text/rman/files/rman-3.2-format-security.patch index 77070026bdb..4ea7740a682 100644 --- a/app-text/rman/files/rman-3.2-format-security.patch +++ b/app-text/rman/files/rman-3.2-format-security.patch @@ -1,8 +1,3 @@ - rman.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rman.c b/rman.c -index d09e547..e5fc88d 100644 --- a/rman.c +++ b/rman.c @@ -1372,7 +1372,7 @@ HTML(enum command cmd) { diff --git a/app-text/rman/files/rman-3.2-gentoo.diff b/app-text/rman/files/rman-3.2-gentoo.patch similarity index 69% rename from app-text/rman/files/rman-3.2-gentoo.diff rename to app-text/rman/files/rman-3.2-gentoo.patch index ece1e3807e6..676d555ce37 100644 --- a/app-text/rman/files/rman-3.2-gentoo.diff +++ b/app-text/rman/files/rman-3.2-gentoo.patch @@ -1,6 +1,5 @@ -diff -urN rman-3.2.orig/Makefile rman-3.2/Makefile ---- rman-3.2.orig/Makefile 2003-07-26 12:15:00.000000000 -0700 -+++ rman-3.2/Makefile 2005-07-12 01:01:37.000000000 -0700 +--- a/Makefile ++++ b/Makefile @@ -15,13 +15,8 @@ # this must be a directory that's in your bin PATH. # MANDIR holds the man page. diff --git a/app-text/rman/files/rman-3.2-ldflags.patch b/app-text/rman/files/rman-3.2-ldflags.patch index 4a6f5f5d9ea..7f0745b2e0f 100644 --- a/app-text/rman/files/rman-3.2-ldflags.patch +++ b/app-text/rman/files/rman-3.2-ldflags.patch @@ -1,7 +1,5 @@ -Index: rman-3.2/Makefile -=================================================================== ---- rman-3.2.orig/Makefile -+++ rman-3.2/Makefile +--- a/Makefile ++++ b/Makefile @@ -102,7 +102,7 @@ all: rman # everyone but me zaps assertions with the -DNDEBUG flag diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild index d57e0cb0ab0..e27b09503ee 100644 --- a/app-text/rman/rman-3.2-r1.ebuild +++ b/app-text/rman/rman-3.2-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan" HOMEPAGE="https://sourceforge.net/projects/polyglotman/"; @@ -12,16 +12,14 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz" LICENSE="Artistic" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" RESTRICT="test" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gentoo.diff \ - "${FILESDIR}"/${P}-ldflags.patch \ - "${FILESDIR}"/${P}-format-security.patch -} +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-format-security.patch +) src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
