gentoo Easter resync : 12.04.2020

5 files changed, 4 insertions, 73 deletions

diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index c98f60ad9387..e68eb60ae373 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,7 +1,5 @@
-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
 DIST source-highlight-3.1.9.tar.gz 1717234 BLAKE2B 6eb40b2274df0772c4a241504e5db5dfdaac600549e0b11aba726f7b4d5ab600c3849a8815bc782ad1bb1f99b69766527645dd202731bde4b2466c663842c47c SHA512 d8e154e9a5d62c77807e4e5d36c0faed5ce2964291be5f8b83e2968a6de52229503689a4ca2109a717ae2632a14b63ec937ca0430c91684c72063f6bc0294195
-EBUILD source-highlight-3.1.8-r1.ebuild 1459 BLAKE2B 1a8f1eacb92863f5d25667d96e803217c63a82e69bab13641efbc7568be810ba65a39cd7f3fee9864704e4f91aa9fd0eda376e0715e9963ea527d317297aad25 SHA512 c886f2e4534bd2919a1035c9730fcbbbab9a7e89653e8fc4c0c0169730679c4772c1c7eda4e01fac023b96a4219dba2a954b7d4075008cafeb025d6fb2772acb
-EBUILD source-highlight-3.1.8.ebuild 1392 BLAKE2B caf1b8fffe4c3ce40210b0fa67285d6e186418aed1f67c240b01285aaf7e5ff9232b350d09cf6cfc133d4a1cb96d2490b9112495dec3a40293d7d9e31b6c7a87 SHA512 88e722718d401fcbd8ac95803e456a07c4dac43b3d93391f71737bb27d3c756112f4d29e2465a7aa5331253a48ca169efbe45492dc1a62e755a442405335008b
-EBUILD source-highlight-3.1.9.ebuild 1410 BLAKE2B c2fc8630b265d5dfe6915aa8dfc5f150e842d4dd2f463dd1665117e64b8104f8a92cd6d049571031c4e84c0c26fefe37362bd3fd1df613336d20078c42863b85 SHA512 d2c3d7fd62de05477bb34b25738ab633dfd04c993fe3e4f2b4c8f8d62c4c134c23fae30e4b8e2571eaf0bebbe8064850e58472ed37dc6f683d9903ff8ce7b996
+EBUILD source-highlight-3.1.8.ebuild 1389 BLAKE2B 57af29c1e8206f9851eeb8c9c3bc4a38bde9e8d7584afac23de65e757c3d5f02b5e37b58488cddb9082e0c2ffdb7c074b510ace4ab1104557852a05b1d9950dd SHA512 f01ae5c89cec2611909a5fd60c0a63520d840b3c6d48ad6a358e45e96cb93528392e0ce496e70d6e13e8da1c56adca0d35053e4d9d8f241a62a19e2472ddffc2
+EBUILD source-highlight-3.1.9.ebuild 1406 BLAKE2B 11d538bd779af48b3ee317b266f5dc88a99adaa3d956a5360388d897427e0ed46e377152b63a17345c00ad09148b3bbd79adb31b8d8fee775aa8f6417fd8c5fd SHA512 0f15dece013549a5a1d179465e237de7d85e1af516fdd4d2833e2a21d1131cb7346b3f069df2edaf035640590a2529342f5f57455e773e6108b7c331a5a4943d
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
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
deleted file mode 100644
index b673c2f79221..000000000000
--- a/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 07810a270d15..000000000000
--- a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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=""
-
-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 e5797d752689..9d9fa220ae3e 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 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
index 516b2b2f1103..79dc0516a190 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"