gentoo resync : 15.12.2019

5 files changed, 62 insertions, 9 deletions

diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 41d08e8d19d5..7ebb552d2187 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,7 @@
 AUX source-highlight-3.1.8-no-black.patch 416 BLAKE2B d53c85b52a04118b613f7683e0506a0f7440c7a0d98f8b8a632ae30da3e0a62e763d51c7341ff3f78a65a02a04b9c0d25909aed847cdd864f4da46876c36e3da SHA512 c65c7f20f5185635153ee111e0b2fd7762065dd00a1773f1a519a449de2355d7255bfb9fda805ec863331ed9df309694fb978a109a479e1c92c7c8dd612945eb
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
-EBUILD source-highlight-3.1.8-r1.ebuild 1462 BLAKE2B e7e2410a00722ebbf2fa6f96ce385fd3f4b6d27b359df80da51a5228d4698d96a10eecb805b4eb17498f686dd43fa06241c5310e80484278bdd04435bfc71e4e SHA512 c736e1271d58c696c3017c0e5f8f657d545a8105203dbffd1dfd4dc0d3832bd2415b7978d63b5ee03e72c23b6505cb89b745dc62481e4431f4341697411048ca
-EBUILD source-highlight-3.1.8.ebuild 1393 BLAKE2B 9a6772e90ea7bf4a286d3937c7114c7bd0db5610dd050ee02ccc3a5a8fd3c1cde1959c3d6d7ce0ae364a603144bf859d8be3ecda63dda5f254b93d64f91336c3 SHA512 a7b64423ee9ee9885bb096d0ab1cc1fb936423ee072316cbfa056c1f9f0a3691337201d3405fbf6315084fa0bda0cccebc24a39224d7b300ec3739820f1f8692
-MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
+DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
+EBUILD source-highlight-3.1.8-r1.ebuild 1460 BLAKE2B fbb8ed50f5a2bfd4017e9842fd06f634ffb8b8b17ff6c1366f7348bd1728a7df7210b4276f8d1bcb37346bee4c06a6f5b59983179e4a6dde0ffaa95103fad1cb SHA512 61cc96bfe1cac828529a70ecfd6443a844c3853814382a81ff859842a1091dc84ed6d17c547e1c427cca93d675065e45b4eb7299090672faff37bcb5e25bcd76
+EBUILD source-highlight-3.1.8.ebuild 1392 BLAKE2B 45db34bf15ead4b78e274bf596d92a24eff056a53c8673e6f6043ef4e06a26e1c6fa89f455444b28ba40d53adb22e75f439bcef82ce1f10d62bbab6cf8363110 SHA512 3532b6c13ba761cbe0c735724f5741fc9ab5269c6e5694a8219297c97c1e02a54e89812966be0b3397dcbea985d2e945e64d5662b34d59d09e57d97baddc7830
+EBUILD source-highlight-3.1.9.ebuild 1411 BLAKE2B 7f00a0f76e2efe69aabf5aa6d417a15a87bcc59a11e4f9dbba696af52946573c47779c1966bfb747a642c62ff9406c62838c4ca2651e6fe7cf77c134f0be08f6 SHA512 a32dbb62bdead42712707d40147a55a485335554a39b78161d0631554746610d764f4849fc5e6006bbae4f9d297c195bad46c4f3e72b11d49dcbd7ea96c76c8a
+MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/metadata.xml b/dev-util/source-highlight/metadata.xml
index 5c23291b5215..3a840c8dcd05 100644
--- a/dev-util/source-highlight/metadata.xml
+++ b/dev-util/source-highlight/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
+  <maintainer type="project">
+    <email>toolchain@gentoo.org</email>
+    <name>Gentoo Toolchain Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
index a617779a282e..6ffeb75981a7 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
@@ -39,7 +39,7 @@ src_install () {
 	default
 
 	# That's not how we want it
-	rm -rf "${ED%/}"/usr/share/{aclocal,doc} || die
+	rm -rf "${ED}"/usr/share/{aclocal,doc} || die
 
 	# package provides .pc file
 	find "${D}" -name '*.la' -delete || die
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index af831bec3109..73000e024a1b 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
new file mode 100644
index 000000000000..fdc35c641fab
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Generate highlighted source code as an (x)html document"
+HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
+SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/boost-1.62.0:=[threads]
+	dev-util/ctags"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+src_configure() {
+	# required as rev-dep of dev-libs/boost-1.62.0
+	# https://wiki.gentoo.org/wiki/Project:C%2B%2B/Maintaining_ABI
+	append-cxxflags -std=c++14
+
+	econf \
+		--with-boost="${EPREFIX}/usr" \
+		--with-boost-regex="boost_regex" \
+		--without-bash-completion \
+		$(use_enable static-libs static)
+}
+
+src_install () {
+	use doc && local HTML_DOCS=( doc/*.{html,css,java} )
+	default
+
+	# That's not how we want it
+	rm -rf "${ED}"/usr/share/{aclocal,doc} || die
+
+	# package provides .pc file
+	find "${D}" -name '*.la' -delete || die
+
+	dobashcomp completion/source-highlight
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
+	# upstream uses the same temporary filenames in numerous places
+	# see https://bugs.gentoo.org/635100
+	emake -j1 check
+}