gentoo resync : 24.09.2020

4 files changed, 2 insertions, 91 deletions

diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 05ecb1b2f819..039718164af4 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,8 +1,5 @@
-AUX sord-0.16.4-gcc10.patch 673 BLAKE2B 533d63588474664a07eadeb252db0381c6001ccd73fb47aeb02928512b680e2f63b48ebe0c74f44b01343e555fbced59f935ea27352cffc16561dffd2c51adc7 SHA512 8011d15764488781d89b3ca6d34769791316cee1047f09a5f6239ad22b96d35682568cb98e94ee9143d0d4011e6b9748b1561518696dd1cedde682ea1441dbf3
 DIST drobilla-autowaf-6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d.tar.gz 384589 BLAKE2B d643df2e133c2b70e00d85562d1c30f8a01190b4c1e1a512b732d016db3ae77ff543d4acafc00309edb173e7bbaaf17b0c2844bef2ffe786c02a51930f03f29a SHA512 50b2d063866630c7c566af9da07c9ac0da2cf86e70f76ad6af57973ae0b346d4687c0b4263cefa90f0c0ba9e853a60583457c9f8b1313db3f4298ca2f0cfc4d3
-DIST sord-0.16.4.tar.bz2 510920 BLAKE2B e52b659e8070dc63188225741d1bfa31480214e47b53b4834dd0bccc5dcd688b93fc65c894b25540d89dbb20b04d8fd1952dcc65999c2ae7b650065c80b387dc SHA512 98bb102cff5ab38d999c2f966597508076ccce54583a739810b0c28b4f3d570b2ef414605fc08361ecb11ac3184d3176f2f50c7c59c06cc50c3d522e26ed5576
 DIST sord-81e138633076c2d7ef7e1691845757208d02f478.tar.gz 293332 BLAKE2B 794aed020b14f0cd4bae851de12f24fe54c87202b69c3f21cc26a86f0da092b05ea2244279be16ab3231431a8a5fb0cbab7236c2e761715e9a1759bb5b3ab54b SHA512 ba0dd8a8434a04be3548b959789b5b81491cd2f91f6125d3620fa17d4d38ae18015db7cd72af71900a0a17331c6b5400756719a25e09e596590ff943798a5991
-EBUILD sord-0.16.4-r1.ebuild 1217 BLAKE2B 9fa9b0ee91d3065538178fcea4bbe730e457b551dccf5e219a0c46b5501bad601a0e5ae8e751025dfa0f9a85e8451ad1fead5658fbdba251a9f341321c326fe4 SHA512 26017a039ce937cd03778db4e141012d3dc4e3239229afb593ae171e0c1bd4b3620e996a66c19302db39422f7a6a97d78c3ba6d06e50de9321b6e1680e12ed21
-EBUILD sord-0.16.4_p20200803.ebuild 1586 BLAKE2B bec8eb4de57d9457c3292ec8bf05337d1ae36b3681091ea44b3ed67e0319d60dedadcf47d5ee16411b991d639dc7d4e6ca8f2c916879ca180f4a56d0b01c656a SHA512 7a03623a3ccf67848790d90d1f74e79dc5f3b7995be7bb4f1ab412d23d3c6974a6d6d28a16af9e9a63f9eb7f1c88e5c1d1c532bf40697ea997d5d5c9766a6056
+EBUILD sord-0.16.4_p20200803.ebuild 1584 BLAKE2B 4c4c075c41f094bbc70054c63d423d9d0574c5fb103f1a45f3e5180e4ac1ab4cb67cbb801524dc10022ab58616c636d519c9035b4a62091769aae23b1ca00939 SHA512 1a28340237a91a4ed316b216b925459005eaccda7863e132682740d32916f5e4e2c0b77caa5f6fe3ac94d827a22fdf8ff9e2db5483b08f9ffa933d447ce9ae6e
 EBUILD sord-9999.ebuild 1125 BLAKE2B 39b455cafddea954aefad917eb782504eaa38f5cf5a07abdd56d5b0dc06227464c0d3dd3c2e64519cad415d6278ac4f0cf16b48ba7023b5df759dc3d39522952 SHA512 11739648e64dbdb746d2774a2632a9fd54b36af4ec147b71166ad006ef438b62618a588b9a69ac5e08b152d2644783f49773ec314da2fd4664d508e9489e2cc0
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/dev-libs/sord/files/sord-0.16.4-gcc10.patch b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
deleted file mode 100644
index a793b335a0a6..000000000000
--- a/dev-libs/sord/files/sord-0.16.4-gcc10.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 616517f44ceeacb26592e50e2bf914aad2d93b90 Mon Sep 17 00:00:00 2001
-From: David Robillard <d@drobilla.net>
-Date: Fri, 17 Jul 2020 15:38:38 +0200
-Subject: [PATCH] Fix crash with optimized builds with GCC 10.1.0
-
----
- src/zix/btree.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/zix/btree.c b/src/zix/btree.c
-index 78a5a0d..d830008 100644
---- a/src/zix/btree.c
-+++ b/src/zix/btree.c
-@@ -689,7 +689,7 @@ zix_btree_begin(const ZixBTree* const t)
- ZIX_API bool
- zix_btree_iter_is_end(const ZixBTreeIter* const i)
- {
--	return !i || i->stack[0].node == NULL;
-+	return !i || (i->level == 0 && i->stack[0].node == NULL);
- }
- 
- ZIX_API void
--- 
-2.28.0
-
diff --git a/dev-libs/sord/sord-0.16.4-r1.ebuild b/dev-libs/sord/sord-0.16.4-r1.ebuild
deleted file mode 100644
index 2c0d0b7cfc2e..000000000000
--- a/dev-libs/sord/sord-0.16.4-r1.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_{6,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-0.30.0
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "NEWS" "README.md" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.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.4_p20200803.ebuild b/dev-libs/sord/sord-0.16.4_p20200803.ebuild
index b415f7c9ee59..281dbee03007 100644
--- a/dev-libs/sord/sord-0.16.4_p20200803.ebuild
+++ b/dev-libs/sord/sord-0.16.4_p20200803.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://gitlab.com/drobilla/${PN}/-/archive/${COMMIT}/${PN}-${COMMIT}.t
 
 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 )"