gentoo resync : 22.01.2021

3 files changed, 70 insertions, 11 deletions

diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 7d472228c8bf..7edeee3f8769 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,7 @@
 AUX sord-0.16.6-x86_32.patch 1292 BLAKE2B 0177c404d77cbc27a79a31b21c6c7e51015aba6c912bc2e3ed660f1d9516cf6afe8f52fd2f2bcf4028addc340f441cf9c1a61d412b10bd5e696ccb10902db33f SHA512 c851bd761eb1c77177c5333208f74b577a36a8e5b0ea0b2dc704c30d1e984c28df7003208ba629981a395b5e893b94289210f6c6273f51551d595276353cc1bf
 DIST sord-0.16.6.tar.bz2 520690 BLAKE2B 7ec248a78e0d9e525d640363414ddd32acc3e32817e2ab86e791fd9232a46658538c9a4db936a5daa7eeb5ef9f7bf13e1aa1429ab6d9fc769e1391a014da919f SHA512 1d3c2bf47ff7e4b533e4e737e2ece8e29bace78bb00c41a252ad5c583abdcba3baa05b189cb8651c212861a2eea3c690354c99d684fd0f343b40e74c94572f98
+DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
 EBUILD sord-0.16.6.ebuild 1209 BLAKE2B 50705d86ad1249edb4b50e98de14f3e688c695857a0dbd5164640e9faead3d4aca78ede2e5815eefe0d9d6e892a8be034a14d9de600041ffeebe9ca56774652c SHA512 776681996a5455ec35bdb2119c463072b70dc17b2357f90e8feac33dbe206ea8ceff92277559c7ea9a466b995a3b88d551f7c6ad2c1ac3c3678907768c01c1f2
-EBUILD sord-9999.ebuild 1169 BLAKE2B e814b98d57f0c12b816134b113417f4fb09923c56a275cd54086f54529242335cd3df8a8d7bb8ecb458f530c83ec2dd55bb10fd38483baa91773e6bb16d498d2 SHA512 4a88c8475943eb0bf4a487124c1cac7c891c3ffa53bf460656e170db13e9b55ab87a672a62d16833eb89c957718ca739ea6c12f1dc5c6e07315ee7231342d02b
+EBUILD sord-0.16.8.ebuild 1183 BLAKE2B 58f9bfc2a14dde0724a95b75a6713d5afdbecb970ec86d1a07bc2c065925502e6a423beac21e9a38d224e4dbc14ad0bca1f78df2a4397384219280e2cfbe2c02 SHA512 b502494aeb269a6b93e9b905a8d75a77dfafa1be21369b4e4ec50d13184881a2feae57cd40946d444c5a72ae668c5efa0145d9f6032aeaaa617d17cece8d4710
+EBUILD sord-9999.ebuild 1130 BLAKE2B b1ebded59cf6e0242410f78acd7c47198d1ebaef9580065da61b0a4966f1056cd72707f213abbcf9aa394d90ff5092e860837ef4e7ef5332da31841cbd3b16a1 SHA512 e4800837ec5768eb69dffeab625f41fc0de550ce3d4b9e5019c28afc454d8d29419dfce4863c4aba20b7781ed0c4500b4762f0fe77047bd855246fdb8f7d23c4
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/sord-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild
new file mode 100644
index 000000000000..f9551082fe8a
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/serd
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index acfd96a2744a..1b9cee461c13 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
 
@@ -17,21 +17,19 @@ KEYWORDS=""
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"
 
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
 RDEPEND="
 	dev-libs/libpcre
 	dev-libs/serd
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
+"
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
-PATCHES=(
-	"${FILESDIR}/${P}-0.16.6-x86_32.patch"
-)
-
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default