From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D06D6158021 for ; Wed, 19 Oct 2022 04:48:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD294E088C; Wed, 19 Oct 2022 04:48:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62E5AE088C for ; Wed, 19 Oct 2022 04:48:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 44C46340ED2 for ; Wed, 19 Oct 2022 04:48:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 870A761F for ; Wed, 19 Oct 2022 04:48:25 +0000 (UTC) From: "Dennis Lamm" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Lamm" Message-ID: <1666154899.ea69c2b044d957d71f4676cbcda94dfee6533b8d.expeditioneer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/kea/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/kea/kea-9999.ebuild X-VCS-Directories: net-misc/kea/ X-VCS-Committer: expeditioneer X-VCS-Committer-Name: Dennis Lamm X-VCS-Revision: ea69c2b044d957d71f4676cbcda94dfee6533b8d X-VCS-Branch: master Date: Wed, 19 Oct 2022 04:48:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2e69525b-7427-40c9-ae61-a4635e351bb8 X-Archives-Hash: 55610a3194d415660d058043d20e5fef commit: ea69c2b044d957d71f4676cbcda94dfee6533b8d Author: Dennis Lamm gentoo org> AuthorDate: Fri Oct 14 21:30:29 2022 +0000 Commit: Dennis Lamm gentoo org> CommitDate: Wed Oct 19 04:48:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea69c2b0 net-misc/kea-9999: fix gtest patch rejection Closes: https://bugs.gentoo.org/846620 Signed-off-by: Dennis Lamm gentoo.org> net-misc/kea/kea-9999.ebuild | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index aca4fe99e606..c7127f76da89 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -10,31 +10,35 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="https://www.isc.org/kea/" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit autotools fcaps python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 - EGIT_REPO_URI="https://github.com/isc-projects/kea.git" + EGIT_REPO_URI="https://gitlab.isc.org/isc-projects/kea.git" else SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz" - # Odd minor version = development release + # odd minor version = development release if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~arm64 ~x86" + [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || KEYWORDS="~amd64 ~arm64 ~x86" fi fi LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -IUSE="mysql +openssl postgres +samples shell test" +IUSE="debug doc mysql +openssl postgres +samples shell test" RESTRICT="!test? ( test )" COMMON_DEPEND=" dev-libs/boost:= dev-libs/log4cplus + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]') + ) mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) @@ -54,8 +58,7 @@ REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}/${MY_P}" PATCHES=( - "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch - "${FILESDIR}"/${PN}-1.9.10-gtest.patch + "${FILESDIR}"/${PN}-2.2.0-openssl-version.patch ) pkg_setup() { @@ -64,7 +67,10 @@ pkg_setup() { src_prepare() { default - # Brand the version with Gentoo + + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 + + # brand the version with Gentoo sed -i \ -e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \ configure.ac || die @@ -79,12 +85,16 @@ src_prepare() { src_configure() { local myeconfargs=( --disable-install-configurations + --disable-rpath --disable-static --enable-generate-messages --enable-perfdhcp --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --without-werror + --with-log4cplus + $(use_enable debug) + $(use_enable doc generate-docs) $(use_enable test gtest) $(use_enable shell) $(use_with mysql)