commit: 654bd88912eecc78138bf8ea855f615e701020da
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 07:42:24 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 08:02:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654bd889
net-misc/ntpsec: add missing dies, inherit for multiprocessing
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild | 16 ++++++++--------
net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild | 12 ++++++------
net-misc/ntpsec/ntpsec-9999.ebuild | 12 ++++++------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
index a90b1716e8c6..aae9eef1da0d 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517="flit"
PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 flag-o-matic waf-utils systemd
+inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -78,8 +78,8 @@ PATCHES=(
WAF_BINARY="${S}/waf"
src_prepare() {
- cp -v "${DISTDIR}/waf-2.0.27" "${WAF_BINARY}"
- chmod -v ugo+x "${WAF_BINARY}"
+ cp -v "${DISTDIR}/waf-2.0.27" "${WAF_BINARY}" || die
+ chmod -v ugo+x "${WAF_BINARY}" || die
default
# Remove autostripping of binaries
@@ -120,7 +120,7 @@ src_configure() {
$(use debug && echo "--enable-debug")
)
python_setup
- cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
+ cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml" || die
waf-utils_src_configure "${myconf[@]}"
}
@@ -133,7 +133,7 @@ src_test() {
}
python_test() {
- "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs)
+ "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs) || die
}
src_install() {
@@ -164,10 +164,10 @@ src_install() {
# move doc files to /usr/share/doc/"${P}"
use doc && mv -v "${ED}"/usr/share/doc/"${PN}"
"${ED}"/usr/share/doc/"${P}"/html
- ln -svf pylib build/main/ntp
+ ln -svf pylib build/main/ntp || die
wheel_name=$(
cd build/main && \
- gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2
+ gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2 ||
die
)
python_foreach_impl python_install
waf-utils_src_install --notests
@@ -178,7 +178,7 @@ src_install() {
python_install() {
${PYTHON} -m gpep517 \
install-wheel "${wheel_name}" \
- --optimize all --destdir "${D}"
+ --optimize all --destdir "${D}" || die
}
pkg_postinst() {
diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
index 683fced0c1d1..ae86968c45db 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517="flit"
PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 flag-o-matic waf-utils systemd
+inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -116,7 +116,7 @@ src_configure() {
$(use debug && echo "--enable-debug")
)
python_setup
- cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
+ cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml" || die
waf-utils_src_configure "${myconf[@]}"
}
@@ -129,7 +129,7 @@ src_test() {
}
python_test() {
- "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs)
+ "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs) || die
}
src_install() {
@@ -160,10 +160,10 @@ src_install() {
# move doc files to /usr/share/doc/"${P}"
use doc && mv -v "${ED}"/usr/share/doc/"${PN}"
"${ED}"/usr/share/doc/"${P}"/html
- ln -svf pylib build/main/ntp
+ ln -svf pylib build/main/ntp || die
wheel_name=$(
cd build/main && \
- gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2
+ gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2 ||
die
)
python_foreach_impl python_install
waf-utils_src_install --notests
@@ -174,7 +174,7 @@ src_install() {
python_install() {
${PYTHON} -m gpep517 \
install-wheel "${wheel_name}" \
- --optimize all --destdir "${D}"
+ --optimize all --destdir "${D}" || die
}
pkg_postinst() {
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild
b/net-misc/ntpsec/ntpsec-9999.ebuild
index 683fced0c1d1..ae86968c45db 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517="flit"
PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE='threads(+)'
-inherit distutils-r1 flag-o-matic waf-utils systemd
+inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -116,7 +116,7 @@ src_configure() {
$(use debug && echo "--enable-debug")
)
python_setup
- cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml"
+ cp -v "${FILESDIR}/flit.toml" "pylib/pyproject.toml" || die
waf-utils_src_configure "${myconf[@]}"
}
@@ -129,7 +129,7 @@ src_test() {
}
python_test() {
- "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs)
+ "${EPYTHON}" "${WAF_BINARY}" check -v -j $(makeopts_jobs) || die
}
src_install() {
@@ -160,10 +160,10 @@ src_install() {
# move doc files to /usr/share/doc/"${P}"
use doc && mv -v "${ED}"/usr/share/doc/"${PN}"
"${ED}"/usr/share/doc/"${P}"/html
- ln -svf pylib build/main/ntp
+ ln -svf pylib build/main/ntp || die
wheel_name=$(
cd build/main && \
- gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2
+ gpep517 build-wheel --output-fd 3 --wheel-dir ../.. 3>&1 >&2 ||
die
)
python_foreach_impl python_install
waf-utils_src_install --notests
@@ -174,7 +174,7 @@ src_install() {
python_install() {
${PYTHON} -m gpep517 \
install-wheel "${wheel_name}" \
- --optimize all --destdir "${D}"
+ --optimize all --destdir "${D}" || die
}
pkg_postinst() {
