gentoo auto-resync : 10:09:2022 - 04:41:30

7 files changed, 147 insertions, 15 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 96008084b113..fdbd1d4b8dce 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index a3e125d9e5a4..f55c860cf746 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -1,10 +1,12 @@
 AUX 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch 1197 BLAKE2B f570a9a479e9d73f506c16dc7c3a75badf5da2e2407173b1ddd6ed8374f269ca628ea1b84adf94ac3b055db9a1d74f812db9557b96c92300f53c60a5048728a6 SHA512 1d392b6fc41d59349b75e9ab5adcf95a545c02709ec2a71b1855f98a444c9e753ca44464264c624fcaf6e49404f8f92d7aa7b85dfacecb1c7c28f3960e9c4fb9
+AUX raptor-2.0.15-clang-pointer-integer-warning.patch 1389 BLAKE2B 2673d64c4aa1ab6802a77c8f0196d17ac0b948aaa1fd18d120c566a0f453eb28e2478df5bdd3766daeebc079c61dbd1fc0eb13dcf0a89021cf2a9922151885be SHA512 774c4aa61d0184a76e8d23935c20e99e5b7be90dd3945ce071f89bbb8cc623b40037e2efcaeaa8019a2e8068e2e9b2bb0e74174a5c8e37c8603937c47c0301ab
 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
 AUX raptor-2.0.15-use-pkg-config-icu.patch 1575 BLAKE2B 7dfc19ecd246a049663c7e1ad6853fc9b8540a5a26ae24e3479c8fc7da4e519fd3ab4d5c8003962aed1b744701d8294cf0f08a298f854c0e58ecef6e1b42b7e9 SHA512 5848ca19d016aa46991c54de4f3d2f80cbc17c922f75fac49b5d7a9e33be07f6102f9c929107a2ed193d95a1333c64b436fa25639cf1803d0d60c40185d617f3
 AUX raptor-2.0.15-use-pkg-config-libxml2.patch 1479 BLAKE2B 8b2f1d1a10b04d6c67b807af14c2e78444234c0202414fa172a34436e3c39399a02a7ebd7439f985dfc564b5899d2ffbf2c9a55b399b2db6cdc5b76118276055 SHA512 6d146068f386346af6e745791fb6adedb98fa7f9fe54838578c0a2261f9efadfca72e36eb5a9fd2e24a36264c780a7869482c16667a7bd067604b5cb62959c05
 AUX raptor-2.0.15-use-pkg-config-libxslt.patch 3514 BLAKE2B 5bcdb3fecf1149ad60387bc4c485d42fd9f764556ebf383201baa3d18426a85ca76a3f29723a8f74be71a58fcfba9f5263a1b1681d012ea4cc0167260702d111 SHA512 0eef2e55e8f77ceb8ac1dc639eea7cb7ee53e53d0ad8058af8b52d44d9f5a5a4e027c7c90360b950469f0c632721c8be068fde7f7fdb8e93aab06b56d3845150
 DIST raptor2-2.0.15.tar.gz 1886657 BLAKE2B 0a39c7b5705bfbf2daa0ca633f79693953b4dfe24c144008d1646a9840a36d4d7ce153b527450647127ec2522047dbd0a6e71f307ee5656951f7e4b610adfd22 SHA512 563dd01869eb4df8524ec12e2c0a541653874dcd834bd1eb265bc2943bb616968f624121d4688579cdce11b4f00a8ab53b7099f1a0850e256bb0a2c16ba048ee
-EBUILD raptor-2.0.15-r4.ebuild 1887 BLAKE2B a5e4ddbcae09d6f0905947a1130e5cbea034afd30e7e5fa0be6e81b687407405db476ae561c1ff4a6ccaf7c0eb146b7d15401c4481f3e0bebe44c7f3a53c7abb SHA512 5ac95f22cb51e930f601c277fca45df222fe50468ee19848e78764a429d7ce0d53c49917aa83fc814642ebf230b15b8ba60b5ba7e97540d4891c69c899a943a5
-EBUILD raptor-2.0.15-r5.ebuild 1952 BLAKE2B 39dbbe7c3d4b7f46ea1a1dfb1ea7d4ce5ffc0ecc3bfc956305d804e36ca3c353c1dab23c3e52a00e250cb4b70629baf16221669e3bb10442a9a2931796971d9b SHA512 5daebfe0396f929bb8e30d17a5cae34549ce64275c2155a4c81392cd64fe5bd9b22dbfd322310d52437ba4fe43ecb7d668b26b8e50c902fd146bba0aebe3c6cb
-MISC metadata.xml 338 BLAKE2B 3dae058894d1b97d950b3be750e4e2bb48c839fc271d881895690c342ccde726a4e6a385816a00a0b49827559adf05443bb432212b5743c0598a1e48a199b257 SHA512 3fd8af45abe4a8970eca3ad5057f80f72afaef324018d7e2be674337653b6b2eb5fb8a5e8661aafd00b76f79b3d6f00893c2a425b4424b35b4a8e5db5c115d7e
+EBUILD raptor-2.0.15-r4.ebuild 1889 BLAKE2B a8dc0c30e446f6831ee8a913ea47a2d96e677aa951a690a1c7ac06fbf04e07e7fa0a8f09cb102bd8e09c4eb0e06638741328bddc8b80da68e0b591deb16b49d7 SHA512 ff38ff843d268fc14fdba779c0d2b32bb4882c85c09048b3e632c303c7770722a6d1384fb003f8cb1dfe53410dd7dbbf9435a0c9dcd0c193671d2b29aac89d48
+EBUILD raptor-2.0.15-r5.ebuild 1954 BLAKE2B 9a0e881c02f72d50b3584acb5eba0f7447bdfb626c2b23c2fbcaeab43ac8a8dd33b61ac00c7e948f41fd7e49eeeba3799317fff81ccd732611c8e666df151b63 SHA512 d4eb4b1a8710556d22af3456b17f5b0c7a6b385ccb106a413810e58d3bb9b42f2b8d5ca4a0dec2b98fb40c4d699cbd3965b6cefdc38cfd688d6ec164576f8a38
+EBUILD raptor-2.0.15-r6.ebuild 2010 BLAKE2B 47979c08e6a884ac26795d1ed9020686a271d9d464f21b378390e9cf9537d84f99bae4943494c14d1eb8e4fb0233f506bf328e9f62a6ab503ed3529247253dc2 SHA512 0a87e6304aee78589ec11d23654f16544313f4a7e6772c46d5b9b898ce578dba2b20d442763f5ac65179860fcaddbe71798b425c821a9037f3387b4ee4fa63f6
+MISC metadata.xml 406 BLAKE2B 00da42e759d35fc777ebbce9df89b600758104eb240cbecff33df51779ac9f565a3f7ee35a89a7fb91fd234c1a19b89ff96416189a5015e5563cbd4f420f616a SHA512 1855a61f21b684e5abbf35c3276dc8185eb805574c65e84593eed08d1598d213ca99c17bfe86be3db3172dc103b1dd2b8524e22aeeaf912afa097d022ad0c5d2
diff --git a/media-libs/raptor/files/raptor-2.0.15-clang-pointer-integer-warning.patch b/media-libs/raptor/files/raptor-2.0.15-clang-pointer-integer-warning.patch
new file mode 100644
index 000000000000..badb450456e4
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.15-clang-pointer-integer-warning.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/869380
+https://github.com/dajobe/raptor/commit/567d4d1ab639d924e8d5af459476f331b9af0ce5
+
+From: Dave Beckett <dave@dajobe.org>
+Date: Tue, 4 Nov 2014 15:25:20 -0800
+Subject: [PATCH] Fix error returns in new world methods
+
+(raptor_world_get_parser_factory,
+raptor_world_get_serializers_count): Fix return value in assertions
+--- a/src/raptor_parse.c
++++ b/src/raptor_parse.c
+@@ -252,12 +252,12 @@ raptor_world_get_parser_factory(raptor_world *world, const char *name)
+  *
+  * Get number of parsers
+  *
+- * Return value: number of parsers
++ * Return value: number of parsers or <0 on failure
+  **/
+ int
+ raptor_world_get_parsers_count(raptor_world* world)
+ {
+-  RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
++  RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, -1);
+ 
+   raptor_world_open(world);
+ 
+--- a/src/raptor_serialize.c
++++ b/src/raptor_serialize.c
+@@ -235,12 +235,12 @@ raptor_get_serializer_factory(raptor_world* world, const char *name)
+  *
+  * Get number of serializers
+  *
+- * Return value: number of serializers
++ * Return value: number of serializers or <0 on failure
+  **/
+ int
+ raptor_world_get_serializers_count(raptor_world* world)
+ {
+-  RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL);
++  RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, -1);
+ 
+   raptor_world_open(world);
+ 
+
diff --git a/media-libs/raptor/metadata.xml b/media-libs/raptor/metadata.xml
index df62a91eb339..6c2ca5f5133d 100644
--- a/media-libs/raptor/metadata.xml
+++ b/media-libs/raptor/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="json">Enable support for JSON parsing</flag>
-  </use>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="json">Enable support for JSON parsing</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">dajobe/raptor</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/raptor/raptor-2.0.15-r4.ebuild b/media-libs/raptor/raptor-2.0.15-r4.ebuild
index d10d97ad0af0..2dfa758d4345 100644
--- a/media-libs/raptor/raptor-2.0.15-r4.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,8 +9,8 @@ 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"
+HOMEPAGE="https://librdf.org/raptor/"
+SRC_URI="https://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
diff --git a/media-libs/raptor/raptor-2.0.15-r5.ebuild b/media-libs/raptor/raptor-2.0.15-r5.ebuild
index 673288e93cbe..3699299b34cc 100644
--- a/media-libs/raptor/raptor-2.0.15-r5.ebuild
+++ b/media-libs/raptor/raptor-2.0.15-r5.ebuild
@@ -9,8 +9,8 @@ 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"
+HOMEPAGE="https://librdf.org/raptor/"
+SRC_URI="https://download.librdf.org/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
 SLOT="2"
diff --git a/media-libs/raptor/raptor-2.0.15-r6.ebuild b/media-libs/raptor/raptor-2.0.15-r6.ebuild
new file mode 100644
index 000000000000..61763d7ebb69
--- /dev/null
+++ b/media-libs/raptor/raptor-2.0.15-r6.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+MY_PN=${PN}2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="The RDF Parser Toolkit"
+HOMEPAGE="https://librdf.org/raptor/"
+SRC_URI="https://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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+curl debug json static-libs"
+
+DEPEND="
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+	dev-libs/libxslt[${MULTILIB_USEDEP}]
+	dev-libs/icu:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	json? ( dev-libs/yajl[${MULTILIB_USEDEP}] )
+"
+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"
+	"${FILESDIR}/${P}-dont_use_curl-config.patch" #552474
+	"${FILESDIR}/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch"
+	"${FILESDIR}/${P}-use-pkg-config-libxml2.patch"
+	"${FILESDIR}/${P}-use-pkg-config-icu.patch"
+	"${FILESDIR}/${P}-use-pkg-config-libxslt.patch"
+	"${FILESDIR}/${P}-clang-pointer-integer-warning.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #552474
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_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)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	emake -j1 test
+}
+
+multilib_src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}