commit: 689d277d2f090e9e49e611cb13290404dd265b28 Author: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> AuthorDate: Sat Oct 15 14:40:40 2022 +0000 Commit: Dennis Lamm <expeditioneer <AT> gentoo <DOT> org> CommitDate: Wed Oct 19 04:48:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689d277d
net-misc/kea: ebuild improvements Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/27783 Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org> net-misc/kea/kea-2.2.0.ebuild | 11 +++++++---- net-misc/kea/kea-9999.ebuild | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/net-misc/kea/kea-2.2.0.ebuild b/net-misc/kea/kea-2.2.0.ebuild index c7127f76da89..56fe907cd840 100644 --- a/net-misc/kea/kea-2.2.0.ebuild +++ b/net-misc/kea/kea-2.2.0.ebuild @@ -22,7 +22,9 @@ else ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"; # odd minor version = development release if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || KEYWORDS="~amd64 ~arm64 ~x86" + if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" + fi fi fi @@ -36,8 +38,9 @@ COMMON_DEPEND=" dev-libs/log4cplus doc? ( $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]') + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ') ) mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) @@ -68,7 +71,7 @@ pkg_setup() { src_prepare() { default - cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' # brand the version with Gentoo sed -i \ diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index c7127f76da89..56fe907cd840 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -22,7 +22,9 @@ else ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"; # odd minor version = development release if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || KEYWORDS="~amd64 ~arm64 ~x86" + if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~x86" + fi fi fi @@ -36,8 +38,9 @@ COMMON_DEPEND=" dev-libs/log4cplus doc? ( $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]') + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ') ) mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) @@ -68,7 +71,7 @@ pkg_setup() { src_prepare() { default - cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' # brand the version with Gentoo sed -i \
