gentoo resync : 25.08.2020

3 files changed, 2 insertions, 54 deletions

diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 5e8a1b7d055f..9fec10d7dedf 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,3 @@
-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.ebuild 1389 BLAKE2B 57af29c1e8206f9851eeb8c9c3bc4a38bde9e8d7584afac23de65e757c3d5f02b5e37b58488cddb9082e0c2ffdb7c074b510ace4ab1104557852a05b1d9950dd SHA512 f01ae5c89cec2611909a5fd60c0a63520d840b3c6d48ad6a358e45e96cb93528392e0ce496e70d6e13e8da1c56adca0d35053e4d9d8f241a62a19e2472ddffc2
-EBUILD source-highlight-3.1.9.ebuild 1399 BLAKE2B b6713101735506d5f085067fcf6af4fadfc70afa515e03b24e65bc3a0c4302b9cd95bde25d4407dbcfd6b49dcefae24b44e7da18f31abf74dece4ecfa2c9a195 SHA512 ddc297ad181adea42bb8a11f8512a5c83e8329fe26e24d9a277f057334e720fd5904b2c427b12103b502e7c028639ac04dd2659aa239997aa02bb5ae222e6c6f
+EBUILD source-highlight-3.1.9.ebuild 1398 BLAKE2B 829ccc78484078881ecdb1d2f321d625996cc88a97b8f5cb4e96587a15db0b58893a0c16d4de26ac4e404b378e1468ea4ff345d582b871a674ee1cc4b2b7776b SHA512 8a2263143b563610076489b199795aa4b0de29ebe3caf1724bf37adac3e0d3ac15330d4f915ccbe7dab5786d172d2188407eedfbee4fb73f035eb6e1da0dbbac
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
deleted file mode 100644
index 9d9fa220ae3e..000000000000
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 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}"
-
-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.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index 205374a14a52..cbf7b16e377f 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 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"