commit: f1084565b1548a1cc7d9980c14a9fad582cba90a Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Mon Dec 28 14:15:36 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Mon Dec 28 14:15:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1084565
dev-util/dwdiff: Port to EAPI 7 Closes: https://bugs.gentoo.org/707140 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> dev-util/dwdiff/dwdiff-2.1.3.ebuild | 31 +++++++--------------- .../{C99-fix.patch => dwdiff-2.1.3-C99-fix.patch} | 0 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dev-util/dwdiff/dwdiff-2.1.3.ebuild b/dev-util/dwdiff/dwdiff-2.1.3.ebuild index 2c5dc4d45e8..973e44885e7 100644 --- a/dev-util/dwdiff/dwdiff-2.1.3.ebuild +++ b/dev-util/dwdiff/dwdiff-2.1.3.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="diff-like program operating at word level instead of line level" HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"; @@ -14,38 +14,25 @@ SLOT="0" KEYWORDS="amd64 ppc ~ppc64 x86" IUSE="nls" -CDEPEND="dev-libs/icu:=" - RDEPEND=" - ${CDEPEND} + dev-libs/icu:= sys-apps/diffutils" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" -DEPEND=" - ${CDEPEND} - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}/C99-fix.patch" -) +PATCHES=( "${FILESDIR}"/${P}-C99-fix.patch ) src_prepare() { default - - sed -i \ - -e '/INSTALL/s:COPYING::' \ - Makefile.in || die + sed -i -e '/INSTALL/s:COPYING::' Makefile.in || die } src_configure() { ./configure \ - --prefix=/usr \ - $(use_with nls gettext) || die "./configure error" + --prefix="${EPREFIX}"/usr \ + $(use_with nls gettext) || die } src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } - -src_install() { - emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install -} diff --git a/dev-util/dwdiff/files/C99-fix.patch b/dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch similarity index 100% rename from dev-util/dwdiff/files/C99-fix.patch rename to dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch
