[gentoo-commits] repo/gentoo:master commit in: dev-tex/catdvi/

[Ulrich Müller]

commit:     b1c458231162cb2abd0029a3d3da9f888550c09e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 17:10:06 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 17:31:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c45823

dev-tex/catdvi: Bump EAPI to 7.

Specify LICENSE more precisely.

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 .../{catdvi-0.14-r1.ebuild => catdvi-0.14-r2.ebuild}  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dev-tex/catdvi/catdvi-0.14-r1.ebuild b/dev-tex/catdvi/catdvi-0.14-r2.ebuild
similarity index 63%
rename from dev-tex/catdvi/catdvi-0.14-r1.ebuild
rename to dev-tex/catdvi/catdvi-0.14-r2.ebuild
index 7783adcdb42..1f4af1e9e18 100644
--- a/dev-tex/catdvi/catdvi-0.14-r1.ebuild
+++ b/dev-tex/catdvi/catdvi-0.14-r2.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils autotools toolchain-funcs flag-o-matic
+inherit autotools toolchain-funcs flag-o-matic
 
 DESCRIPTION="DVI to plain text translator"
 HOMEPAGE="http://catdvi.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="virtual/tex-base
 	dev-libs/kpathsea"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-kpathsea.patch"
+	eapply "${FILESDIR}"/${P}-kpathsea.patch
+	eapply_user
 	eautoconf
-	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	has_version '>=dev-libs/kpathsea-6.2.1' \
+		&& append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
 }
 
 src_compile() {