*/*: move {dev-util => app-alternatives}/ninja

Signed-off-by: Julien Roy <julien@jroy.ca>
This commit is contained in:
Julien Roy
2024-01-13 11:18:13 -05:00
parent e19fc477b9
commit 3b2219d8b9
13 changed files with 41 additions and 33 deletions

View File

@@ -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)
"

View File

@@ -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)
"

View File

@@ -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

View File

@@ -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 )

View File

@@ -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 )

View File

@@ -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

View File

@@ -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" )

View File

@@ -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
}

View File

@@ -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]

View File

@@ -36,7 +36,7 @@ DEPEND="
)
"
BDEPEND="
dev-util/ninja
app-alternatives/ninja
dev-util/cmake
doc? ( app-text/doxygen )
python? ( ${DISTUTILS_DEPS} )

View File

@@ -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

View File

@@ -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

View File

@@ -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"