From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E5A113835A for ; Mon, 28 Dec 2020 14:16:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50C1BE0C11; Mon, 28 Dec 2020 14:16:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D8C7E0BED for ; Mon, 28 Dec 2020 14:16:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0F0D3412BF for ; Mon, 28 Dec 2020 14:16:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73232483 for ; Mon, 28 Dec 2020 14:16:03 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1609164936.f1084565b1548a1cc7d9980c14a9fad582cba90a.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/dwdiff/, dev-util/dwdiff/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/dwdiff/dwdiff-2.1.3.ebuild dev-util/dwdiff/files/C99-fix.patch dev-util/dwdiff/files/dwdiff-2.1.3-C99-fix.patch X-VCS-Directories: dev-util/dwdiff/ dev-util/dwdiff/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: f1084565b1548a1cc7d9980c14a9fad582cba90a X-VCS-Branch: master Date: Mon, 28 Dec 2020 14:16:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dcdd436f-2bde-4923-9608-8079310397a0 X-Archives-Hash: 5b7d0455ecbe6638ae439d32ac644ba8 commit: f1084565b1548a1cc7d9980c14a9fad582cba90a Author: Jakov Smolic sartura hr> AuthorDate: Mon Dec 28 14:15:36 2020 +0000 Commit: David Seifert gentoo 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 sartura.hr> Signed-off-by: David Seifert 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