commit: 3b2219d8b9c002c43248f691f5456e88bf93b4d1
Author: Julien Roy <julien <AT> jroy <DOT> ca>
AuthorDate: Sat Jan 13 16:18:13 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sat Jan 13 16:20:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3b2219d8
*/*: move {dev-util => app-alternatives}/ninja
Signed-off-by: Julien Roy <julien <AT> jroy.ca>
app-office/khronos/khronos-4.0.0.ebuild | 4 ++--
app-office/khronos/khronos-4.0.1.ebuild | 4 ++--
dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild | 10 ++++++----
dev-python/skia-pathops/skia-pathops-0.7.4.ebuild | 4 ++--
dev-python/skia-pathops/skia-pathops-0.8.0.ebuild | 4 ++--
.../glsl-language-server/glsl-language-server-0.3.7.ebuild | 2 +-
.../lua-language-server/lua-language-server-3.7.3.ebuild | 4 ++--
media-sound/spot/spot-0.4.0.ebuild | 12 ++++++------
media-video/kooha/kooha-2.2.3.ebuild | 4 ++--
sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild | 2 +-
sys-libs/nss-tls/nss-tls-1.0.ebuild | 8 +++++---
sys-libs/nss-tls/nss-tls-1.1.ebuild | 8 +++++---
sys-libs/nss-tls/nss-tls-9999.ebuild | 8 +++++---
13 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/app-office/khronos/khronos-4.0.0.ebuild
b/app-office/khronos/khronos-4.0.0.ebuild
index 65513c3046..2c20ea24ff 100644
--- a/app-office/khronos/khronos-4.0.0.ebuild
+++ b/app-office/khronos/khronos-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,9 +22,9 @@ IDEPEND="
DEPEND=""
RDEPEND="${DEPEND}"
BDEPEND="
+ app-alternatives/ninja
>=dev-lang/vala-0.56.8
>=dev-util/meson-1.1.1
- >=dev-util/ninja-1.11.1-r2
$(vala_depend)
"
diff --git a/app-office/khronos/khronos-4.0.1.ebuild
b/app-office/khronos/khronos-4.0.1.ebuild
index 65513c3046..2c20ea24ff 100644
--- a/app-office/khronos/khronos-4.0.1.ebuild
+++ b/app-office/khronos/khronos-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -22,9 +22,9 @@ IDEPEND="
DEPEND=""
RDEPEND="${DEPEND}"
BDEPEND="
+ app-alternatives/ninja
>=dev-lang/vala-0.56.8
>=dev-util/meson-1.1.1
- >=dev-util/ninja-1.11.1-r2
$(vala_depend)
"
diff --git a/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild
b/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild
index 1e99a9fa6d..2cd6daaf92 100644
--- a/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild
+++ b/dev-cpp/cpprestsdk/cpprestsdk-2.10.19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,11 +18,13 @@ RDEPEND=">=dev-libs/openssl-1.1.1q
DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/cmake-3.23
- >=dev-util/ninja-1.11.1-r2
+BDEPEND="
+ app-alternatives/ninja
+ >=dev-util/cmake-3.23
>=sys-devel/gcc-11.3.0
>=virtual/pkgconfig-2-r1
- >=dev-cpp/websocketpp-0.8.2"
+ >=dev-cpp/websocketpp-0.8.2
+"
PATCHES=(
"${FILESDIR}"/cpprestsdk-${PV}-warnings.patch
diff --git a/dev-python/skia-pathops/skia-pathops-0.7.4.ebuild
b/dev-python/skia-pathops/skia-pathops-0.7.4.ebuild
index a8320364e7..c0b411c4cb 100644
--- a/dev-python/skia-pathops/skia-pathops-0.7.4.ebuild
+++ b/dev-python/skia-pathops/skia-pathops-0.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,10 +23,10 @@ KEYWORDS="~amd64"
# Until cpdef is removed from skia-pathops, we need cython < 3.0.0
BDEPEND="
+ app-alternatives/ninja
app-arch/unzip
<dev-python/cython-3[${PYTHON_USEDEP}]
dev-util/gn
- dev-util/ninja
"
PATCHES=( "${FILESDIR}"/${PN}-0.7.4-no-net.patch )
diff --git a/dev-python/skia-pathops/skia-pathops-0.8.0.ebuild
b/dev-python/skia-pathops/skia-pathops-0.8.0.ebuild
index 238ec3e7bf..6bda3b83da 100644
--- a/dev-python/skia-pathops/skia-pathops-0.8.0.ebuild
+++ b/dev-python/skia-pathops/skia-pathops-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,10 +24,10 @@ SLOT="0"
KEYWORDS="~amd64"
BDEPEND="
+ app-alternatives/ninja
app-arch/unzip
dev-python/cython[${PYTHON_USEDEP}]
dev-util/gn
- dev-util/ninja
"
PATCHES=( "${FILESDIR}"/${PN}-0.7.4-no-net.patch )
diff --git a/dev-util/glsl-language-server/glsl-language-server-0.3.7.ebuild
b/dev-util/glsl-language-server/glsl-language-server-0.3.7.ebuild
index 1da97ddec1..a218e10a2c 100644
--- a/dev-util/glsl-language-server/glsl-language-server-0.3.7.ebuild
+++ b/dev-util/glsl-language-server/glsl-language-server-0.3.7.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
DEPEND="dev-util/glslang dev-cpp/cli11 dev-cpp/nlohmann_json dev-libs/libfmt"
RDEPEND="${DEPEND}"
-BDEPEND="dev-util/ninja"
+BDEPEND="app-alternatives/ninja"
src_install() {
DESTDIR="${D}" ninja -C"${S}/build" install
diff --git a/dev-util/lua-language-server/lua-language-server-3.7.3.ebuild
b/dev-util/lua-language-server/lua-language-server-3.7.3.ebuild
index e8b41e8390..f7a6bd85c7 100644
--- a/dev-util/lua-language-server/lua-language-server-3.7.3.ebuild
+++ b/dev-util/lua-language-server/lua-language-server-3.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -21,8 +21,8 @@ REQUIRE_USE="${LUA_REQUIRED_USE}"
DEPEND="${LUA_DEPS}"
RDEPEND="${DEPEND}"
BDEPEND="
+ app-alternatives/ninja
app-arch/unzip
- dev-util/ninja
"
RESTRICT="!test? ( test )"
PATCHES=( "${FILESDIR}/linux.ninja.patch" "${FILESDIR}/build.ninja.patch" )
diff --git a/media-sound/spot/spot-0.4.0.ebuild
b/media-sound/spot/spot-0.4.0.ebuild
index b61f0e8d6f..a9c6e34645 100644
--- a/media-sound/spot/spot-0.4.0.ebuild
+++ b/media-sound/spot/spot-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -399,8 +399,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
BDEPEND="
+ app-alternatives/ninja
>=dev-util/meson-1.1.1
- >=dev-util/ninja-1.11.1-r2
>=dev-libs/appstream-glib-0.8.2
>=virtual/rust-1.69.0
test? ( || ( dev-lang/rust[clippy]
@@ -444,12 +444,12 @@ src_compile() {
# meson_src_install won't find spot binary otherwise because cargo.sh
isn't used for compiling
if use debug; then
mv "${WORKDIR}/${P}/target/debug/spot" \
- "${WORKDIR}/${P}-build/src/spot" \
- || die
+ "${WORKDIR}/${P}-build/src/spot" \
+ || die
else
mv "${WORKDIR}/${P}/target/release/spot" \
- "${WORKDIR}/${P}-build/src/spot" \
- || die
+ "${WORKDIR}/${P}-build/src/spot" \
+ || die
fi
}
diff --git a/media-video/kooha/kooha-2.2.3.ebuild
b/media-video/kooha/kooha-2.2.3.ebuild
index 712b882e16..d317eb1fc5 100644
--- a/media-video/kooha/kooha-2.2.3.ebuild
+++ b/media-video/kooha/kooha-2.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -179,8 +179,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
BDEPEND="
+ app-alternatives/ninja
>=dev-util/meson-1.1.1
- >=dev-util/ninja-1.11.1-r2
>=dev-libs/appstream-glib-0.8.2
>=virtual/rust-1.69.0
test? ( || ( dev-lang/rust[clippy]
diff --git a/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
b/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
index d683a7ec23..8771105d35 100644
--- a/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
+++ b/sci-libs/Mutationpp/Mutationpp-1.0.5-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="
)
"
BDEPEND="
- dev-util/ninja
+ app-alternatives/ninja
dev-util/cmake
doc? ( app-text/doxygen )
python? ( ${DISTUTILS_DEPS} )
diff --git a/sys-libs/nss-tls/nss-tls-1.0.ebuild
b/sys-libs/nss-tls/nss-tls-1.0.ebuild
index a7522faaf1..8dfc591fdc 100644
--- a/sys-libs/nss-tls/nss-tls-1.0.ebuild
+++ b/sys-libs/nss-tls/nss-tls-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,9 +18,11 @@ RDEPEND="dev-libs/glib
net-libs/libsoup"
DEPEND="${RDEPEND}
sys-libs/glibc[nscd(+)]"
-BDEPEND="${DEPEND}
+BDEPEND="
+ ${DEPEND}
+ app-alternatives/ninja
dev-util/meson
- dev-util/ninja"
+"
src_prepare() {
default
diff --git a/sys-libs/nss-tls/nss-tls-1.1.ebuild
b/sys-libs/nss-tls/nss-tls-1.1.ebuild
index 3ea2542991..57c2c70722 100644
--- a/sys-libs/nss-tls/nss-tls-1.1.ebuild
+++ b/sys-libs/nss-tls/nss-tls-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,9 +18,11 @@ RDEPEND="dev-libs/glib
net-libs/libsoup"
DEPEND="${RDEPEND}
sys-libs/glibc[nscd(+)]"
-BDEPEND="${DEPEND}
+BDEPEND="
+ ${DEPEND}
+ app-alternatives/ninja
dev-util/meson
- dev-util/ninja"
+"
src_prepare() {
default
diff --git a/sys-libs/nss-tls/nss-tls-9999.ebuild
b/sys-libs/nss-tls/nss-tls-9999.ebuild
index c1b7c4467c..3737871d8f 100644
--- a/sys-libs/nss-tls/nss-tls-9999.ebuild
+++ b/sys-libs/nss-tls/nss-tls-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,9 +18,11 @@ RDEPEND="dev-libs/glib
net-libs/libsoup"
DEPEND="${RDEPEND}
sys-libs/glibc[nscd(+)]"
-BDEPEND="${DEPEND}
+BDEPEND="
+ ${DEPEND}
+ app-alternatives/ninja
dev-util/meson
- dev-util/ninja"
+"
EGIT_REPO_URI="https://github.com/dimkr/nss-tls.git";
EGIT_BRANCH="master"
