gentoo resync : 15.12.2019

3 files changed, 18 insertions, 70 deletions

diff --git a/dev-tex/chktex/Manifest b/dev-tex/chktex/Manifest
index c43f15ab85f9..0e0aabb1b96f 100644
--- a/dev-tex/chktex/Manifest
+++ b/dev-tex/chktex/Manifest
@@ -1,7 +1,5 @@
 AUX chktex-1.7.1-asneeded.patch 619 BLAKE2B 04bbcd5b101759902577ef0e92514e58572996ca681c135c8f6a519ad406fcd82d13a6a6335fdeaf4e1bf533874bf16500d99b1124a5988bd0fe04458ab17ff0 SHA512 6fd935703799316518476ccdf90e263e8a773c37a1a8ed97c6544792bf7716ab20aca0601d6598c12a4306a96e1566e1cd655bf6761d66c557f12401b3008b99
 AUX tex-inputenc.patch 410 BLAKE2B 5c97b926d43e62287cbcf06207aeafd945d4d5c3ea5efe8cded42fcb3e69f1a4e702cf79d382426561864322fe4e854b27d6dfc638573eeb35b4f5d20090a7fb SHA512 5910761c0c1b9fbb30fb986dbbdc5094659c5906e80a04373947159bceb3eccf5a5bbb6e6befe893ee8c3ebcb7c43591527986350225b81b294c140a65750caf
-DIST chktex-1.7.1.tar.gz 349551 BLAKE2B 00a1aed460fc6b0daae065ee39671104b1c5290df7097cbd75fb8c8406e309c5b950ddb3834325ba579f5870bbcf8a5890bb410c7e7633ae575944b704f738a6 SHA512 88b8b6b20a2242557d253e690ad7a7b5a41497e3c96ee44798997b83ccbfd4e37203aea9c557c7b25fc0b6223bd08a590b464af674f7558547393c2af0a86926
 DIST chktex-1.7.6.tar.gz 153071 BLAKE2B 7419b35eb045509ab39983f16d9cc72d1501f3b6781c304ddf8cc91ae1123b132e17e2919f5d2f6c5b6584e91c63651dc819497c2a5945b9debe329c03704256 SHA512 dd5ad2d7fce66eeb8d890bd79d00bdb28d9807539988232a917d6478c204e9a0ab287f2b8baf7977dba374b551609d8951cbf67ad15a793d35cdfe3411e4fe0b
-EBUILD chktex-1.7.1.ebuild 1258 BLAKE2B 87bd92212d547bf8b3d75291267e50bb2eeaf7e57d073f7a92fb1faf99ccf8e464d309c5ea7f6b13770f2120a49e2438321907a2c2c41e5f99d8acebc1e07a63 SHA512 8b57a94a7704f7b127a7f76e7d05ca56e230e152840877254bd27b079784a368bf1850384768f518ba80fa6dcfae116add4357d3d591792a63190d380de7e241
-EBUILD chktex-1.7.6.ebuild 1467 BLAKE2B 2d6d2a54d06d9776888a4760cbc14bb1e94474fc51b7a4d450570997aa5c28c7e172c1e524eeb2fb953c0002dec38243e1f608531bc35ad358954179a9735028 SHA512 55202e12c6f615c2d016ffcc84a09a56800374cd0e4d4d323ee0715eb11e3389a8ae9c606c80d0542994c9ff726a80ee208155028c78ba44f8c8b5c4eb08e22a
+EBUILD chktex-1.7.6.ebuild 1264 BLAKE2B 2742e50613ecbf5773213d244395cd4c5ab435fb7f1e1b34c16dd030bed4c3ad69de70af195c12196e5ad22f30449e71d0fa54f062ceb10d1cec019a5f8f4f79 SHA512 ffdaa36994367c146372a1c438afaa991f40f35e5a3593449cab75139921ccbcdefcdc1436c44a279e50f9a81d63133fe171ccb330479ef7f7e3699cc266f552
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/chktex/chktex-1.7.1.ebuild b/dev-tex/chktex/chktex-1.7.1.ebuild
deleted file mode 100644
index 66f74777005a..000000000000
--- a/dev-tex/chktex/chktex-1.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Checks latex source for common mistakes"
-HOMEPAGE="http://www.nongnu.org/chktex/"
-SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc +pcre test"
-# Tests fail without pcre. Enable pcre by default and make tests depend on it.
-REQUIRED_USE="test? ( pcre )"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	sys-apps/groff
-	doc? ( dev-tex/latex2html )"
-
-PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
-	  "${FILESDIR}/tex-inputenc.patch" )
-DOCS=( NEWS )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-info)
-		$(use_enable pcre)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile html
-}
-
-src_install() {
-	if use doc ; then
-		HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
-		DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
-	fi
-	autotools-utils_src_install
-	doman *.1
-}
diff --git a/dev-tex/chktex/chktex-1.7.6.ebuild b/dev-tex/chktex/chktex-1.7.6.ebuild
index e6f58879d684..9edd1bcc2f1d 100644
--- a/dev-tex/chktex/chktex-1.7.6.ebuild
+++ b/dev-tex/chktex/chktex-1.7.6.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-AUTOTOOLS_AUTORECONF=true
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Checks latex source for common mistakes"
 HOMEPAGE="http://www.nongnu.org/chktex/"
@@ -12,22 +11,25 @@ SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc +pcre test"
+RESTRICT="!test? ( test )"
 # Tests fail without pcre. Enable pcre by default and make tests depend on it.
 REQUIRED_USE="test? ( pcre )"
 
-RDEPEND="virtual/latex-base
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre )"
+RDEPEND="pcre? ( dev-libs/libpcre )"
+
 DEPEND="${RDEPEND}
 	sys-apps/groff
 	dev-texlive/texlive-fontsrecommended
 	doc? ( dev-tex/latex2html )"
 
+BDEPEND="virtual/latex-base
+	dev-lang/perl:="
+
 PATCHES=( "${FILESDIR}/${PN}-1.7.1-asneeded.patch"
 	  "${FILESDIR}/tex-inputenc.patch" )
-DOCS=( NEWS )
+
 AT_M4DIR="${S}/m4"
 
 src_configure() {
@@ -37,21 +39,20 @@ src_configure() {
 		$(use_enable debug debug-info)
 		$(use_enable pcre)
 	)
-	autotools-utils_src_configure
+	econf ${myconfargs[@]}
 }
 
 src_compile() {
-	autotools-utils_src_compile
-	autotools-utils_src_compile ChkTeX.dvi
-	use doc && autotools-utils_src_compile html
+	default
+	emake ChkTeX.dvi
+	use doc && emake html
 }
 
 src_install() {
+	default
 	if use doc ; then
-		HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
-		DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
+	      dodoc HTML/ChkTeX.tex
 	fi
-	DOCS+=("${AUTOTOOLS_BUILD_DIR}/ChkTeX.dvi")
-	autotools-utils_src_install
+	dodoc ChkTeX.dvi NEWS
 	doman *.1
 }