dev-libs/sord: fixed compilation with gcc10 + added live

Closes: https://bugs.gentoo.org/726312
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

3 files changed, 86 insertions, 0 deletions

diff --git a/dev-libs/sord/files/sord-0.16.4-gcc10.patch b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
new file mode 100644
index 000000000000..a793b335a0a6
--- /dev/null
+++ b/dev-libs/sord/files/sord-0.16.4-gcc10.patch
@@ -0,0 +1,25 @@
+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.ebuild b/dev-libs/sord/sord-0.16.4-r1.ebuild
index 39cd7d0b3fdb..2c0d0b7cfc2e 100644
--- a/dev-libs/sord/sord-0.16.4.ebuild
+++ b/dev-libs/sord/sord-0.16.4-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( "AUTHORS" "NEWS" "README.md" )
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_prepare() {
 	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
new file mode 100644
index 000000000000..e1388ab2877c
--- /dev/null
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -0,0 +1,57 @@
+# 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 git-r3
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+EGIT_REPO_URI="https://github.com/drobilla/sord.git"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS=""
+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" )
+
+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
+}