5 files changed, 69 insertions, 76 deletions
diff --git a/media-libs/raul/Manifest b/media-libs/raul/Manifest
index c36a2514c7b2..54bb008fd4e7 100644
--- a/media-libs/raul/Manifest
+++ b/media-libs/raul/Manifest
@@ -1,5 +1,5 @@
-AUX ldconfig2.patch 366 BLAKE2B 03262a8edcbc1a597fa2472c8b140755c80d00abd9418e55ff844b569d61efd101b3a0ec2118a9383b383a44081eca9e51ef2685a9adef341d3350eb6022fb14 SHA512 008c6699afadc123139e66736588f83612a9d301870726178782a58807951f2231891e4968ce83d6eb72f38388e2e8df78deec25a352d754a801b63b2541775e
-AUX raul-0.8.0-gcc47.patch 1466 BLAKE2B b0952da4adaac185e4517944d51861040dd957263f9a0c69d5a3920d82bd4df7075baad920e62e011f586cae3289452bd079b4ef5ca419d66881534bcff321b9 SHA512 6056c680136bade273cf5b061591556b6f1e6d0045b6afc6b3f950e9a37def4a22356d45dccea52a29bd6b9c455744ac60ba51cccabb5965fdc31c67452344b7
-DIST raul-0.8.0.tar.bz2 155450 BLAKE2B 9347e0b3505452ebdcfef89a25ab2b134f9c65d0c3ed0d1c456c309fa073cf81f1f1f901d7e2728f08d481fdefec26e57227923a75946e7b35d4c902c2fe8832 SHA512 7ad48c551945aad104309448bcdb86a4a2ca07c44af53b37492e7cddce6a093529f1e1e75c4b27cb8e292ec46424969cdea270883d44b2f1badc48df8943a0a1
-EBUILD raul-0.8.0-r1.ebuild 1229 BLAKE2B 0ff9c3829663d8380d7988a5339bd0e49e6be80aaa2eea8d6f368aeac833f98b911f1ad3b13975f287903b2594a4d871673efb084b1c00056b7a06ed1d8886ea SHA512 a3270389b41eaf2b514bf945b324f43586d5548bab6728b780c55bfcdd8efa5fac758a63de1ad705a279d2261c7ca8bce4a6e2385ff8091f2bb2b1454f499176
+DIST drobilla-autowaf.tar.bz2 305372 BLAKE2B 1457ceed5e80c5077ddacbfe14ef565865997440795800e1fe2dc9af0be9aee89f3a452de1af8c46d8b0e87475592417bf94b1ce1e1004dab7ee4b3b88ba36aa SHA512 324b0e431ee905619ff85d4f3b3c3ba644bb7c10abf89cc2b27af2f871f454c8010326d0c6cd9e7d72538d32a608f10dea5951ff29a8dde2aa9ba5c2e0567d87
+DIST raul-1.0.0_pre20200718.tar.bz2 58775 BLAKE2B 3383c5c2a1c4f1156137c90807bc70d0fb05d5d271855ea1490bc216df8f2036049aee0fc49309b22db9a82f19670eb2ec29900bb9766d0270f5ba0db60324d8 SHA512 33de61b47bb0bf9cd8ccc15ad3249ec76f3fe3ae9e0cb9af6a45ef6385b2b777af6f775abc00a1f7f7ad930291529a48cebddd455e54b8fe5887749dfb0b47a4
+EBUILD raul-1.0.0_pre20200718.ebuild 1473 BLAKE2B 39f25140f9bebfa6e2051f219ea0c0f1ea657e40b36fc3b415f88f4d926dc2c5e18f446cf120d72ed59973f67b4a2359d2e315b19cef808dc7b97fd88cfb9e6f SHA512 db6eff9ff1c635d0a2eeeca26fdc1114e88a562806eb5d4820724c4cfe945178af1ec2acc15d21310ed1f400b4bc7c11ca590726f641a07616ae396372c094f1
+EBUILD raul-9999.ebuild 1070 BLAKE2B 1622b081c0615bc512cc7c77feb0105af0f4672eeb8b6f9b085325a96f5e59e48af2ec40319da20fd75a8b71e1f476f09f1b6ace512f3d89f4c383ecb916e06c SHA512 207525f55ca8ba5b59aaade29fa2924b275f7616b7d4979f9dc5c21516d8ba5744a6e54bcd0e0e1c5b94ed6de26d581f63c9633ae1da283f29540f3da0ac3cde
 MISC metadata.xml 415 BLAKE2B 602cc66e3d57378c7e2b62d3104dfc85e1d058832f93008d2f1e93a43421f1598a93cd82b5a636f143e0c3ef9e555c2340abc9d43e8a04e8242a6e77f506555d SHA512 88de311ef1dc5590377c173508b1ad36346f9c69d518e8705c89af8cb3642fd9f838038489fe6f0a429370417db013b3df5f89e97ba9a67ff1f34df0ac4b359d
diff --git a/media-libs/raul/files/ldconfig2.patch b/media-libs/raul/files/ldconfig2.patch
deleted file mode 100644
index 7676ae0781f9..000000000000
--- a/media-libs/raul/files/ldconfig2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: raul-0.8.0/wscript
-===================================================================
---- raul-0.8.0.orig/wscript
-+++ raul-0.8.0/wscript
-@@ -153,7 +153,5 @@ def build(bld):
- 	# Documentation
- 	autowaf.build_dox(bld, 'RAUL', RAUL_VERSION, top, out)
- 
--	bld.add_post_fun(autowaf.run_ldconfig)
--
- def test(ctx):
- 	autowaf.run_tests(ctx, APPNAME, tests.split())
diff --git a/media-libs/raul/files/raul-0.8.0-gcc47.patch b/media-libs/raul/files/raul-0.8.0-gcc47.patch
deleted file mode 100644
index c9cb2d080931..000000000000
--- a/media-libs/raul/files/raul-0.8.0-gcc47.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=425274
-Build with gcc 4.7
-
-Index: raul-0.8.0/raul/PathTable.hpp
-===================================================================
---- raul-0.8.0.orig/raul/PathTable.hpp
-+++ raul-0.8.0/raul/PathTable.hpp
-@@ -37,13 +37,13 @@ public:
- 	typename Table<Path, T>::iterator find_descendants_end(
- 			typename Table<Path, T>::iterator parent)
- 	{
--		return find_range_end(parent, &Path::descendant_comparator);
-+		return this->find_range_end(parent, &Path::descendant_comparator);
- 	}
- 
- 	typename Table<Path, T>::const_iterator find_descendants_end(
- 			typename Table<Path, T>::const_iterator parent) const
- 	{
--		return find_range_end(parent, &Path::descendant_comparator);
-+		return this->find_range_end(parent, &Path::descendant_comparator);
- 	}
- };
- 
-Index: raul-0.8.0/raul/TableImpl.hpp
-===================================================================
---- raul-0.8.0.orig/raul/TableImpl.hpp
-+++ raul-0.8.0/raul/TableImpl.hpp
-@@ -249,7 +249,7 @@ Table<K, T>::cram(const Table<K,T>& rang
- 	assert(is_sorted());
- #endif
- 
--	return make_pair(iterator(*this, insert_index), true);
-+	return std::make_pair(iterator(*this, insert_index), true);
- }
- 
- 
-@@ -339,7 +339,7 @@ Table<K, T>::operator[](const K& key)
- 	if (i != end()) {
- 		return i->second;
- 	} else {
--		std::pair<iterator,bool> ret = insert(make_pair(key, T()));
-+		std::pair<iterator,bool> ret = insert(std::make_pair(key, T()));
- 		return ret.first->second;
- 	}
- }
diff --git a/media-libs/raul/raul-1.0.0_pre20200718.ebuild b/media-libs/raul/raul-1.0.0_pre20200718.ebuild
new file mode 100644
index 000000000000..d95d82839705
--- /dev/null
+++ b/media-libs/raul/raul-1.0.0_pre20200718.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit waf-utils python-any-r1 eutils
+
+COMMIT="496e70e420811c7d744a8bcc44a2ac1b51b676b5"
+COMMIT_AUTOWAF="6c6c1d29bfe4c28dd26b5cde7ea4a1a148ee700d"
+
+DESCRIPTION="C++ utility library primarily aimed at audio/musical applications"
+HOMEPAGE="http://wiki.drobilla.net/Raul"
+SRC_URI="https://gitlab.com/drobilla/raul/-/archive/${COMMIT}.tar.bz2 -> ${P}.tar.bz2
+	https://gitlab.com/drobilla/autowaf/-/archive/${COMMIT_AUTOWAF}.tar.bz2 -> drobilla-autowaf.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/boost
+	dev-libs/glib"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+RAUL_TESTS="array_test build_test double_buffer_test maid_test path_test ringbuffer_test sem_test socket_test symbol_test thread_test time_test"
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	default
+	rm -r "${S}/waflib" || die
+	ln -s "${WORKDIR}/autowaf-${COMMIT_AUTOWAF}" "${S}/waflib" || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		$(use debug && echo "--debug") \
+		$(use doc && echo "--docs") \
+		$(use test && echo "--test")
+}
+
+src_test() {
+	cd "${S}/build/test" || die
+	for i in ${RAUL_TESTS} ; do
+		einfo "Running test ${i}"
+		LD_LIBRARY_PATH=.. ./${i} || die
+	done
+}
diff --git a/media-libs/raul/raul-0.8.0-r1.ebuild b/media-libs/raul/raul-9999.ebuild
index 9989f107c4ff..3c51df5ccbca 100644
--- a/media-libs/raul/raul-0.8.0-r1.ebuild
+++ b/media-libs/raul/raul-9999.ebuild
@@ -1,41 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit waf-utils python-any-r1 eutils
+inherit waf-utils python-any-r1 eutils git-r3
 
 DESCRIPTION="C++ utility library primarily aimed at audio/musical applications"
 HOMEPAGE="http://wiki.drobilla.net/Raul"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+EGIT_REPO_URI="https://gitlab.com/drobilla/raul.git"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS=""
 IUSE="debug doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost
-	>=dev-libs/glib-2.14.0"
+	dev-libs/glib"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-RAUL_TESTS="atomic_test atom_test list_test midi_ringbuffer_test path_test quantize_test queue_test ringbuffer_test smf_test table_test thread_test time_test"
-DOCS=( AUTHORS README ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}/ldconfig2.patch"
-	epatch "${FILESDIR}/${P}-gcc47.patch"
-}
+RAUL_TESTS="array_test build_test double_buffer_test maid_test path_test ringbuffer_test sem_test socket_test symbol_test thread_test time_test"
+DOCS=( AUTHORS NEWS README )
 
 src_configure() {
 	waf-utils_src_configure \
-		--htmldir=/usr/share/doc/${PF}/html \
 		$(use debug && echo "--debug") \
 		$(use doc && echo "--docs") \
 		$(use test && echo "--test")