gentoo resync : 18.05.2019

3 files changed, 2 insertions, 73 deletions

diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index 3787ef82002b..7e126539cdeb 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,6 +1,5 @@
 AUX raptor-2.0.15-dont_use_curl-config.patch 1681 BLAKE2B 5c3b241836e04dabbcd6fd9db6e89225fcd8cf4c1eed24dff7bb5348d7a0985633a7f9173a5279b04ec277ad0f775a18c52ae33af86b6522a21a3e63123d162d SHA512 28e3137592c14dcf9fc1d8401e6bc58af7f1abcab4886acde42a03dd7b61aa9b176672300951f7b4fcdf5128ce445f12594f7a09444331d1d6c34aaa7a4b9cfc
 AUX raptor-2.0.15-heap-overflow.patch 1708 BLAKE2B cea8df63861760fe55f1320cbc0833d814c38148b3d5f2b7163348de48bd95a37ee3000d312ce76879c798182f74d60f49fcef89f5f051bd40febc0c1da68099 SHA512 f7df0ec3123ac8ec9f2852dfb54e380d210446a36ab2f74aa9d2dcb8346162046d239b4db9a0747b18e3d19f4dc1ce41d194557c5e53027a3618e81b7b251d3d
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r1.ebuild 1578 BLAKE2B cf5d475a87c1805262504fd1b4a954f87a2db961bd03d507908edfaf6b128e83dee0d4a4852d5d574c0a71601fe29b772181d1302c87f6cfcaef727aee113828 SHA512 64b803714dd662028a16e66b0c802cd919ede858473d5a0c8da8d68d4218b1c9608903d86587ca40e20a424f2c984c03dcd31ca9fe2b3fad6d9f365e753555ac
-EBUILD raptor-2.0.15-r2.ebuild 1667 BLAKE2B f8f4544525c5e80ebdb617bb7b0ede23761a0ba2429666314a3aa28190f6e1df7f31a2119854262301ee5702f8b5def014b1dd61f8a82c14d34ebf52e34cf304 SHA512 e6f0c918200cc3693053fac5de8ffd0cb04e222f747a7e11779f5da4bd11aaa8b2b7d590cedf40830d91d55a5636d08905c2ef4b062da8a96da492418586c098
+EBUILD raptor-2.0.15-r2.ebuild 1666 BLAKE2B 78585fc28baf38b7cb5e0dd8c1e68bec829b76ce162dde1eff8838199707cb7e04610c5558d4bca7f5db17f8c311e07a0cb2f500a71043df73bb95563e8cc0da SHA512 4d4dbffb61dbb1569fce9f899ded5d085a4b4fef2a581525cbcc4ebbceb2847b31ebf56393e6699a0a9cd4c076a09bf5dca7dc7991d5a49fd8b994ecc2c00769
 MISC metadata.xml 337 BLAKE2B 6244cd4ab5d8d13437590c4bbb672cb9b5ad47f7e70d30adda368737d745daf4df249eb2166d2ab8335fe0a0fec5b8d3afa9ec091cc6ddcaaf0f2d05f9425741 SHA512 3a2c420495274cfca80f0103066b282b9f1301786a8cbde76b894fac721030bee949fc468c92841698038b991b07fa66f15891392784041a87f655d1860fd11c
diff --git a/media-libs/raptor/raptor-2.0.15-r1.ebuild b/media-libs/raptor/raptor-2.0.15-r1.ebuild
deleted file mode 100644
index 2710505b2740..000000000000
--- a/media-libs/raptor/raptor-2.0.15-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-MY_PN=${PN}2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="The RDF Parser Toolkit"
-HOMEPAGE="http://librdf.org/raptor/"
-SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+curl debug json static-libs unicode"
-
-DEPEND="
-	dev-libs/libxml2
-	dev-libs/libxslt
-	curl? ( net-misc/curl )
-	json? ( dev-libs/yajl )
-	unicode? ( dev-libs/icu:= )
-"
-RDEPEND="${DEPEND}
-	!media-libs/raptor:0
-"
-BDEPEND="
-	>=sys-devel/bison-3
-	>=sys-devel/flex-2.5.36
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
-HTML_DOCS=( {NEWS,README,RELEASE,UPGRADING}.html )
-
-PATCHES=( "${FILESDIR}/${P}-heap-overflow.patch" )
-
-src_prepare() {
-	default
-	elibtoolize # Keep this for ~*-fbsd
-}
-
-src_configure() {
-	# FIXME: It should be possible to use net-nntp/inn for libinn.h and -linn!
-
-	local myeconfargs=(
-		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
-		$(usex curl --with-www=curl --with-www=xml)
-		$(use_enable debug)
-		$(use_with json yajl)
-		$(use_enable static-libs static)
-		$(usex unicode --with-icu-config="${EPREFIX}"/usr/bin/icu-config '')
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 test
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/raptor/raptor-2.0.15-r2.ebuild b/media-libs/raptor/raptor-2.0.15-r2.ebuild
index 79bbe0b0afa1..2f77ba341816 100644
--- a/media-libs/raptor/raptor-2.0.15-r2.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+curl debug json static-libs unicode"
 
 DEPEND="