From 6affc71a3c6eede0e0a004f1dcf938fb34fe6c5e Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sun, 30 May 2021 17:04:37 +0200 Subject: [PATCH 1/9] dev-libs/cglm: use docs.eclass in most recent versions. Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth --- dev-libs/cglm/cglm-0.8.3.ebuild | 27 +++++++++------------------ dev-libs/cglm/cglm-9999.ebuild | 27 +++++++++------------------ 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/dev-libs/cglm/cglm-0.8.3.ebuild b/dev-libs/cglm/cglm-0.8.3.ebuild index 4009cf4499..6fbdc797cd 100644 --- a/dev-libs/cglm/cglm-0.8.3.ebuild +++ b/dev-libs/cglm/cglm-0.8.3.ebuild @@ -3,7 +3,14 @@ EAPI=7 -inherit meson +DOCS_BUILDER="sphinx" +DOCS_AUTODOC=0 +DOCS_DIR="${S}/docs/source" + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit python-any-r1 +inherit docs meson if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -18,11 +25,6 @@ HOMEPAGE="https://github.com/recp/cglm" LICENSE="MIT" SLOT="0" -IUSE="doc" - -BDEPEND="dev-util/meson - doc? ( dev-python/sphinx )" - src_configure() { local emesonargs=( "-Dwerror=false" @@ -33,16 +35,5 @@ src_configure() { src_compile() { default meson_src_compile - if use doc; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_install() { - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - default - meson_src_install + docs_compile } diff --git a/dev-libs/cglm/cglm-9999.ebuild b/dev-libs/cglm/cglm-9999.ebuild index 4009cf4499..6fbdc797cd 100644 --- a/dev-libs/cglm/cglm-9999.ebuild +++ b/dev-libs/cglm/cglm-9999.ebuild @@ -3,7 +3,14 @@ EAPI=7 -inherit meson +DOCS_BUILDER="sphinx" +DOCS_AUTODOC=0 +DOCS_DIR="${S}/docs/source" + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit python-any-r1 +inherit docs meson if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -18,11 +25,6 @@ HOMEPAGE="https://github.com/recp/cglm" LICENSE="MIT" SLOT="0" -IUSE="doc" - -BDEPEND="dev-util/meson - doc? ( dev-python/sphinx )" - src_configure() { local emesonargs=( "-Dwerror=false" @@ -33,16 +35,5 @@ src_configure() { src_compile() { default meson_src_compile - if use doc; then - einfo "Building documentation ..." - local doc_dir="${S}/docs" - cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!" - sphinx-build -b html source build || die "Building documentation failed!" - fi -} - -src_install() { - use doc && local HTML_DOCS=( "${S}/docs/build/." ) - default - meson_src_install + docs_compile } From 09a0823da05e832c53bac65aaf7f56c0d48ae39f Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 30 May 2021 17:50:19 +0200 Subject: [PATCH 2/9] dev-python/sanic: drop websockets restriction Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- dev-python/sanic/sanic-21.3.4.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-python/sanic/sanic-21.3.4.ebuild b/dev-python/sanic/sanic-21.3.4.ebuild index bc79bf25f0..fc0e5353b1 100644 --- a/dev-python/sanic/sanic-21.3.4.ebuild +++ b/dev-python/sanic/sanic-21.3.4.ebuild @@ -28,7 +28,6 @@ RDEPEND=" dev-python/ujson[${PYTHON_USEDEP}] dev-python/uvloop[${PYTHON_USEDEP}] >=dev-python/websockets-8.1[${PYTHON_USEDEP}] - Date: Sun, 30 May 2021 17:52:49 +0200 Subject: [PATCH 4/9] dev-python/pytest-sanic: drop websockets restriction Package-Manager: Portage-3.0.19, Repoman-3.0.3 RepoMan-Options: --force Signed-off-by: Andrew Ammerlaan --- dev-python/pytest-sanic/pytest-sanic-1.7.1.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-python/pytest-sanic/pytest-sanic-1.7.1.ebuild b/dev-python/pytest-sanic/pytest-sanic-1.7.1.ebuild index ae354f58f8..68fed1c3a6 100644 --- a/dev-python/pytest-sanic/pytest-sanic-1.7.1.ebuild +++ b/dev-python/pytest-sanic/pytest-sanic-1.7.1.ebuild @@ -24,7 +24,6 @@ RDEPEND=" >=dev-python/httpx-0.15.4[${PYTHON_USEDEP}] >=dev-python/pytest-5.2[${PYTHON_USEDEP}] >=dev-python/websockets-8.1[${PYTHON_USEDEP}] - Date: Sun, 30 May 2021 17:56:44 +0200 Subject: [PATCH 6/9] dev-java/openjdk-sts-bin: fix BadDefaultUseFlags Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild b/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild index 1b782a2ad8..27868c29f7 100644 --- a/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild +++ b/dev-java/openjdk-sts-bin/openjdk-sts-bin-15.0.2_p7.ebuild @@ -27,7 +27,7 @@ HOMEPAGE="https://adoptopenjdk.net" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" -IUSE="alsa cups -gentoo-vm headless-awt source" +IUSE="alsa cups gentoo-vm headless-awt source" RDEPEND=" media-libs/fontconfig:1.0 From 11119a2d8302bb17b1cb8216a7a02a843834811d Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 30 May 2021 17:57:31 +0200 Subject: [PATCH 7/9] gui-wm/cage: fix BadDefaultUseFlags Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- gui-wm/cage/cage-0.1.3.ebuild | 2 +- gui-wm/cage/cage-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui-wm/cage/cage-0.1.3.ebuild b/gui-wm/cage/cage-0.1.3.ebuild index 10649b784a..5502c20270 100644 --- a/gui-wm/cage/cage-0.1.3.ebuild +++ b/gui-wm/cage/cage-0.1.3.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage" LICENSE="MIT" SLOT="0" -IUSE="-X" +IUSE="X" RDEPEND=" >=gui-libs/wlroots-0.13 diff --git a/gui-wm/cage/cage-9999.ebuild b/gui-wm/cage/cage-9999.ebuild index 10649b784a..5502c20270 100644 --- a/gui-wm/cage/cage-9999.ebuild +++ b/gui-wm/cage/cage-9999.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="https://www.hjdskes.nl/projects/cage https://github.com/Hjdskes/cage" LICENSE="MIT" SLOT="0" -IUSE="-X" +IUSE="X" RDEPEND=" >=gui-libs/wlroots-0.13 From 191b8e50a82197ce23904c2cef882953271367b9 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 30 May 2021 17:58:05 +0200 Subject: [PATCH 8/9] sci-physics/SU2: fix BadDefaultUseFlags Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- sci-physics/SU2/SU2-7.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-physics/SU2/SU2-7.1.1.ebuild b/sci-physics/SU2/SU2-7.1.1.ebuild index 49799f4128..a10b2a489a 100644 --- a/sci-physics/SU2/SU2-7.1.1.ebuild +++ b/sci-physics/SU2/SU2-7.1.1.ebuild @@ -23,7 +23,7 @@ KEYWORDS="~amd64" # cgns, metis, parmetis are bundled; # omp is disable as it's experimental; # pastix is disabled as it's try to find bundled libs; -IUSE="cgns -mkl +mpi mpp openblas tecio test tutorials" +IUSE="cgns mkl +mpi mpp openblas tecio test tutorials" RESTRICT="!test? ( test )" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} From eeef5214522f2db3dba5148876a3f6129403db54 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 30 May 2021 17:58:40 +0200 Subject: [PATCH 9/9] sys-process/nq: fix BadDefaultUseFlags Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andrew Ammerlaan --- sys-process/nq/nq-0.4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-process/nq/nq-0.4.ebuild b/sys-process/nq/nq-0.4.ebuild index 96d514d563..e1be4ee886 100644 --- a/sys-process/nq/nq-0.4.ebuild +++ b/sys-process/nq/nq-0.4.ebuild @@ -13,7 +13,7 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="-shell +tq test" +IUSE="shell +tq test" RESTRICT="!test? ( test )" REQUIRED_USE="shell? ( !test )" # shell alternatives currently fail tests