commit: fa1a79145e195de8929d5442971facf7ba378b6a Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sun Jul 31 07:15:02 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Jul 31 07:15:11 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1a7914
dev-libs/sord: bump to 0.16.22 + updated live Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-libs/sord/Manifest | 1 + dev-libs/sord/metadata.xml | 11 +++--- dev-libs/sord/sord-0.16.12.ebuild | 70 +++++++++++++++++++++++++++++++++++++++ dev-libs/sord/sord-9999.ebuild | 47 ++++++++++++++++---------- 4 files changed, 107 insertions(+), 22 deletions(-) diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest index 2cda57b7b30c..9a9d1561b400 100644 --- a/dev-libs/sord/Manifest +++ b/dev-libs/sord/Manifest @@ -1 +1,2 @@ DIST sord-0.16.10.tar.bz2 524630 BLAKE2B 6737d3495846529e6e4d14cbb2ac47ce4e67d04298381a119ba0107144deb56a53de9aa363397c2e302535f998c7c3ad44d340f52f70ac341ad6b635db608cb6 SHA512 715201eaf4a13a3635337cf8fa7c1a1f229f1d589f70cdf8f67183d90df29cd8b4af180650ce9cd0c651c712d11901bfdc6b51f9b8d7c6e70d8d8f30b1861281 +DIST sord-0.16.12.tar.xz 111328 BLAKE2B 9b89848440a994145a934e66e6fe7b844e82e926cb48d05223faef9357d315db981cd68b1174d7c47e5d63b97f8e15d8cc6b2b992a6bd790b8b117ebbb6c059a SHA512 d63cc1473d12676dac3724a096c85fd47745e456cf4b191fd9f8aaf8bb9399510c6878948fd045cc1942356e61dbefd8d88374c1ef6b327057e0bb8bfa03f926 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>[email protected]</email> - <name>Gentoo ProAudio Project</name> -</maintainer> + <maintainer type="project"> + <email>[email protected]</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 }
