gentoo resync : 28.04.2019

4 files changed, 76 insertions, 4 deletions

diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 73a9bd84a982..a67d530c72b1 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.7.tar.gz 1600692 BLAKE2B dbd740c79e4368bab6e7207a81e037f3fdf9f4ac5373113aac15acd7c18383cebcc8cadb91f59aa01b5bf30d3240b4510ae8d3af765b6ca579859367aa7e4ea4 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
 EBUILD source-highlight-3.1.7-r2.ebuild 1156 BLAKE2B 148dacff17f075819620fe984b8671e2ef11997e496fdc3337ca0a5cab19d248bcdcc8d754b4bc547dfabfe63edec885738ba76561318798330876d21de7f8a8 SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075
-EBUILD source-highlight-3.1.8.ebuild 1266 BLAKE2B d0dfde08f934d821f150d2c9a366b2e73974901ba3b2a944b58b99545b4085e88d2d1d209d4f34e21b61376e1150fa1f31696b7dd6facc5b25e6987598566244 SHA512 4ad82b888406c56e9ba7b882671785a7b9073d24dc21d4f299c83ee32c206b8ddab01ee0de5d4663829456560157c12e13b75564ad0782f9aa7a50b830198eb8
+EBUILD source-highlight-3.1.8-r1.ebuild 1484 BLAKE2B 0ee412783a7905c7fce6cc57da0469223e64fc4f74430edfbada7b940be29490cc07274eae2df6804fb80e0d8fb1e871a13484acc488c11c4887f2fe0080bcb2 SHA512 7c580789bb6732f1c92eb6ee43b89e2ce932391c955a04f4f72d51559cf4ed4dfeacf7066eb1438efd622074d72f3ab872c3ac64f79777b958bad6f3400691e8
+EBUILD source-highlight-3.1.8.ebuild 1415 BLAKE2B 8562a018c2aafa335f6391e510040a8e40e1e50e4884cbc9d933e7e47ba508de4478f721006b4d84e52213132af084623f930293b9e0a2c092331262e511537d SHA512 2d457f751bcaea8e8f5728971f31555524bfc7d9381acdb202a43f46cec852c23ebca1294df90dc71b457a2e39a9c7012d1e66766b2734df33780074609817ae
 MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
diff --git a/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch b/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch
new file mode 100644
index 000000000000..b673c2f79221
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch
@@ -0,0 +1,12 @@
+diff -up source-highlight-3.1.8/src/esc.style.no-black source-highlight-3.1.8/src/esc.style
+--- source-highlight-3.1.8/src/esc.style.no-black	2019-03-20 16:52:33.053965325 +0000
++++ source-highlight-3.1.8/src/esc.style	2019-03-20 16:52:42.502965289 +0000
+@@ -7,7 +7,7 @@ comment cyan i ;
+ number purple ;
+ preproc darkblue b ;
+ symbol darkred ;
+-function black b;
++function b;
+ cbracket red;
+ variable darkgreen ;
+ 
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
new file mode 100644
index 000000000000..435b03a9792d
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
@@ -0,0 +1,55 @@
+# 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-fbsd ~x86-fbsd ~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=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-black.patch"
+	)
+
+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
+}
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 7fc2f8c4df1a..6b4ae33d4bba 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 x86 ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
@@ -23,6 +23,7 @@ src_configure() {
 	append-cxxflags -std=c++14
 
 	econf \
+		--with-boost="${EPREFIX}/usr" \
 		--with-boost-regex="boost_regex" \
 		--without-bash-completion \
 		$(use_enable static-libs static)
@@ -43,5 +44,7 @@ src_install () {
 
 src_test() {
 	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
-	default
+	# upstream uses the same temporary filenames in numerous places
+	# see https://bugs.gentoo.org/635100
+	emake -j1 check
 }