gentoo auto-resync : 31:07:2022 - 15:12:39

4 files changed, 110 insertions, 24 deletions

diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 36c9e8a75fe9..cb868a934553 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,4 +1,6 @@
 DIST sord-0.16.10.tar.bz2 524630 BLAKE2B 6737d3495846529e6e4d14cbb2ac47ce4e67d04298381a119ba0107144deb56a53de9aa363397c2e302535f998c7c3ad44d340f52f70ac341ad6b635db608cb6 SHA512 715201eaf4a13a3635337cf8fa7c1a1f229f1d589f70cdf8f67183d90df29cd8b4af180650ce9cd0c651c712d11901bfdc6b51f9b8d7c6e70d8d8f30b1861281
+DIST sord-0.16.12.tar.xz 111328 BLAKE2B 9b89848440a994145a934e66e6fe7b844e82e926cb48d05223faef9357d315db981cd68b1174d7c47e5d63b97f8e15d8cc6b2b992a6bd790b8b117ebbb6c059a SHA512 d63cc1473d12676dac3724a096c85fd47745e456cf4b191fd9f8aaf8bb9399510c6878948fd045cc1942356e61dbefd8d88374c1ef6b327057e0bb8bfa03f926
 EBUILD sord-0.16.10.ebuild 1182 BLAKE2B d10ca88ecd72284b9f7ed35ab5cda8f7ddfef5a8d3532ceefa5f9672963a972b7897cb26360c0abb9422697bdbfefabc0ee8726979f4e357b3a22b3035d8a1ba SHA512 45e758a075e9c7c3ea59079653a9447fd4bcf6b3deacd67ed71c6cb7d637f204889a310a5bfb3428d5e6e0bb5740cb8bc395f05631d3368b52f123502963cd07
-EBUILD sord-9999.ebuild 1128 BLAKE2B 9ba38e9717b8614797ac6920cdc5a5865f039fdcf78b0f0f5f2562b36615a984b17bcb41749c40580e591c592d3c6a7355eafdbff35f253102a48c987ff02d05 SHA512 143642a6558e8bb9cbf5b4c47908764567a27d7e413a413f4c16d5b459c1b3d76ab0b6369c7d6a939b09726fd2937c64f4eab050a100dc06c5d9833d297b17ca
-MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
+EBUILD sord-0.16.12.ebuild 1273 BLAKE2B f23f9fa2c4084f1bd5111fbfc188a6088aaee70b972b3d1b851d6217e0a3a7ebbe2af8e1876329f50fea797dfc63f30d07725db29450722347ff3342dc6bcd9b SHA512 725751fcf3c7ccbef42a5e619eca9a7553f757a43a52ee547cfd8955d6e1702338b506279dd29be45596228eafe542127837ae82defbfb47f5fdf4484231faba
+EBUILD sord-9999.ebuild 1273 BLAKE2B f23f9fa2c4084f1bd5111fbfc188a6088aaee70b972b3d1b851d6217e0a3a7ebbe2af8e1876329f50fea797dfc63f30d07725db29450722347ff3342dc6bcd9b SHA512 725751fcf3c7ccbef42a5e619eca9a7553f757a43a52ee547cfd8955d6e1702338b506279dd29be45596228eafe542127837ae82defbfb47f5fdf4484231faba
+MISC metadata.xml 332 BLAKE2B 8b6ced42cb1806732db75f2163ec786301af6fe535da27127ea4fff4cd08c354b5881551574952e3d192fe2191331765f7a3356c2e48f9ad93b6341d467fa9c3 SHA512 96f38c83f6692b5598c94ee3e72a0ecd26706b532ada45420e5517f39be2f608eb1de7090e4d7df025404f6474739913fbefda39f5be227ffefd02da61a288ae
diff --git a/dev-libs/sord/metadata.xml b/dev-libs/sord/metadata.xml
index 3fed8a8997c3..6edf5b9eef03 100644
--- a/dev-libs/sord/metadata.xml
+++ b/dev-libs/sord/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>proaudio@gentoo.org</email>
-	<name>Gentoo ProAudio Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build command line utilities</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/sord/sord-0.16.12.ebuild b/dev-libs/sord/sord-0.16.12.ebuild
new file mode 100644
index 000000000000..9d71ccd834fc
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit meson-multilib python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/drobilla/sord.git"
+else
+	SRC_URI="http://download.drobilla.net/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="doc test tools"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/serd
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+
+src_prepare() {
+	default
+
+	# fix doc installation path
+	sed -i "s/versioned_name/'${PF}'/g" doc/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_use_feature doc docs)
+		$(meson_feature test tests)
+		$(meson_feature tools)
+	)
+
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+mutlilib_src_install_all() {
+	local DOCS=( AUTHORS NEWS README.md )
+	einstalldocs
+}
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index fbe89d308563..9d71ccd834fc 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -1,20 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
-inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
+inherit meson-multilib python-any-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/drobilla/sord.git"
+else
+	SRC_URI="http://download.drobilla.net/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 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"
+IUSE="doc test tools"
 RESTRICT="!test? ( test )"
 
 BDEPEND="
@@ -28,32 +34,37 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 "
-DOCS=( "AUTHORS" "NEWS" "README.md" )
 
 src_prepare() {
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
 	default
-	multilib_copy_sources
+
+	# fix doc installation path
+	sed -i "s/versioned_name/'${PF}'/g" doc/meson.build || die
 }
 
 multilib_src_configure() {
-	waf-utils_src_configure \
-		--docdir=/usr/share/doc/${PF} \
-		$(multilib_native_usex doc --docs "") \
-		$(usex test --test "") \
-		$(usex static-libs --static "")
+	local emesonargs=(
+		$(meson_native_use_feature doc docs)
+		$(meson_feature test tests)
+		$(meson_feature tools)
+	)
+
+	meson_src_configure
 }
 
 multilib_src_test() {
-	./waf test || die
+	meson_src_test
 }
 
 multilib_src_compile() {
-	waf-utils_src_compile
-	default
+	meson_src_compile
 }
 
 multilib_src_install() {
-	waf-utils_src_install
-	default
+	meson_src_install
+}
+
+mutlilib_src_install_all() {
+	local DOCS=( AUTHORS NEWS README.md )
+	einstalldocs
 }