gentoo resync : 03.03.2021

4 files changed, 2 insertions, 110 deletions

diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 68beadc50a9a..62850e74a3ef 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,7 +1,4 @@
-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 1207 BLAKE2B 5dd477d558144bba5f42212393bdd61c4484f9b860404970dfa89d04570055a23059e96896e11295111a9a6ec4cea05f001f28b2361d466fecfb73e00695fd88 SHA512 7618731c519bcef759234e6c545320d120860b73aca0be480fe4b975667d437c4ee4f92f3cc8597049ec8121ae3657c2c3b486fab8ff09ea4e421bc06e3354bf
-EBUILD sord-0.16.8.ebuild 1176 BLAKE2B 7d836ced3ff39d09a0caab144cdd30700af279d482b085ecc900a7882f6bfa92dee2cae8b576002489167ea60b4f6c45521096ccea3cc6da5465bbbfcaf0c8bd SHA512 74bd66a198b62aa81cf463ec27c43116dcc78ff8272ce78a75ca1e433e32c9bff3dac961190e8b8dd2e8b1fa912ba2c6a1bb0a9274c6b36a620461cf5dbacf4a
+EBUILD sord-0.16.8.ebuild 1175 BLAKE2B 4e2cb2c54f6b80c968b090d384ebb154d23d8c531cc395644a5933f99a896feab71195b06d67a2946efe4e3b5cc60d4a01a73c3cbc2d9aafd2fb49c73a0791fa SHA512 951e2799df07c7946207332eb18a7c8bc9ebc3418aa9b1c1b2af9ccb79cf853be8f86f1a11b04d05642453a0d31d3e9a813cfc53c8951949a4d525b19806b915
 EBUILD sord-9999.ebuild 1128 BLAKE2B 77268a5bc22cb33548eb443e14cea7adbf3a1789e05c9b8070e0c59c91d7c315a64aa3ba924d3d21f8bd1c32a6408c3cf66435f38f88df77fd3559c02bdf0a9d SHA512 926eb592bdf596e9d1b64410e391b74a4a39ce97695aeb337bf7adfb6bf457a596a5999753bdce53f1c797dcf6ddd7d4ab919693d9f3ecbceb58abed139c3e65
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/files/sord-0.16.6-x86_32.patch b/dev-libs/sord/files/sord-0.16.6-x86_32.patch
deleted file mode 100644
index 3effc4d44dc3..000000000000
--- a/dev-libs/sord/files/sord-0.16.6-x86_32.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/zix/digest.c b/src/zix/digest.c
-index 889cfde..00b9fcf 100644
---- a/src/zix/digest.c
-+++ b/src/zix/digest.c
-@@ -38,10 +38,12 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
- {
- 	const uint8_t* str = (const uint8_t*)buf;
- 
-+#ifdef __x86_64__
- 	for (size_t i = 0; i < (len / sizeof(uint64_t)); ++i) {
- 		hash = (uint32_t)_mm_crc32_u64(hash, *(const uint64_t*)str);
- 		str += sizeof(uint64_t);
- 	}
-+#endif
- 	if (len & sizeof(uint32_t)) {
- 		hash = _mm_crc32_u32(hash, *(const uint32_t*)str);
- 		str += sizeof(uint32_t);
-@@ -57,6 +59,7 @@ zix_digest_add(uint32_t hash, const void* const buf, const size_t len)
- 	return hash;
- }
- 
-+#ifdef __x86_64__
- ZIX_API uint32_t
- zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
- {
-@@ -72,12 +75,17 @@ zix_digest_add_64(uint32_t hash, const void* const buf, const size_t len)
- 
- 	return hash;
- }
-+#endif
- 
- ZIX_API uint32_t
- zix_digest_add_ptr(const uint32_t hash, const void* const ptr)
- {
- #if UINTPTR_MAX == UINT64_MAX
--	return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
-+	#ifdef __x86_64__
-+		return (uint32_t)_mm_crc32_u64(hash, (uintptr_t)ptr);
-+	#else
-+		return (uint32_t)_mm_crc32_u32(hash, (uintptr_t)ptr);
-+	#endif
- #else
- 	return _mm_crc32_u32(hash, (uintptr_t)ptr);
- #endif
diff --git a/dev-libs/sord/sord-0.16.6.ebuild b/dev-libs/sord/sord-0.16.6.ebuild
deleted file mode 100644
index f15be86b7b66..000000000000
--- a/dev-libs/sord/sord-0.16.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8} )
-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 )"
-
-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}-x86_32.patch"
-)
-
-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-0.16.8.ebuild b/dev-libs/sord/sord-0.16.8.ebuild
index f01afc0ba67b..26bfc0bacf6b 100644
--- a/dev-libs/sord/sord-0.16.8.ebuild
+++ b/dev-libs/sord/sord-0.16.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc static-libs test"
 RESTRICT="!test? ( test )"