commit:     83a20c0c85c9dabcfd3254b8605a63de8cebd262
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 17:32:02 2024 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 20:31:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a20c0c

net-misc/kea: drop 2.0.2, 2.2.0

Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 net-misc/kea/Manifest                           |   2 -
 net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch |  10 --
 net-misc/kea/files/kea-1.9.10-gtest.patch       | 143 ------------------------
 net-misc/kea/kea-2.0.2.ebuild                   | 127 ---------------------
 net-misc/kea/kea-2.2.0.ebuild                   | 140 -----------------------
 5 files changed, 422 deletions(-)

diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index a29210d24713..5e36ccebaed2 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,3 +1 @@
-DIST kea-2.0.2.tar.gz 9796557 BLAKE2B 
a859c4cc3f6686db2dcf640738b421499a816700d134ee9322290051c3a192bab482be4a4bdb2630113594a3af1cafe2b95abce4a463815a6404fe87fac227ad
 SHA512 
edb7de227898fb7bd76dd8b503d02e07b4ba512b907b53399a5c45bd216820b342f00c1834858848ce8ff94aa3c228ceead0e2946cbcb1f75a03ca579630be83
-DIST kea-2.2.0.tar.gz 9999074 BLAKE2B 
10b4bca1a135c6d146490f8c4c7bd4d56c1c03e2b4cc88a6888fcad5d1a5c2ee2d2c0215cb345b53a2a4262dbd02516d75d5778835d45384a7d69a062b8696b9
 SHA512 
82cd44efea8c968ef097de242e1ca59e0183c80df25050017fd45538d35da64a9a0d2f4a5249ad3bd3d30b1f8895c360d301518bc22e60dfddd966fe020dc773
 DIST kea-2.4.0.tar.gz 10462721 BLAKE2B 
07a4424c01872142b85446ee881afbdc9d8b3a0bc7879226463dd0ba20eba6d3d6db3dfd5fff88cd54af05c4f58183032c7df90d24a969a7ae63200822b6f35f
 SHA512 
b0bdb6b6af88e322145ffeb742a818d6e225846ff981ecc4925d311870db94e0c5a4eb0e1140f146624f64b636c9b24148b5efbc32e62a19b99bba0810b54654

diff --git a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch 
b/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch
deleted file mode 100644
index fec0fcc30f4b..000000000000
--- a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc
-+++ kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc
-@@ -9,6 +9,7 @@
- #include <asiolink/io_service.h>
- #include <dhcpsrv/dhcpsrv_log.h>
- #include <dhcpsrv/timer_mgr.h>
-+#include <map>
- #include <exceptions/exceptions.h>
- 
- #include <functional>

diff --git a/net-misc/kea/files/kea-1.9.10-gtest.patch 
b/net-misc/kea/files/kea-1.9.10-gtest.patch
deleted file mode 100644
index f3e8cd7af4cc..000000000000
--- a/net-misc/kea/files/kea-1.9.10-gtest.patch
+++ /dev/null
@@ -1,143 +0,0 @@
---- a/m4macros/ax_gtest.m4
-+++ b/m4macros/ax_gtest.m4
-@@ -1,17 +1,8 @@
- AC_DEFUN([AX_ISC_GTEST], [
-
--enable_gtest="no"
--GTEST_INCLUDES=
--
--AC_ARG_WITH([gtest-source],
--            [AS_HELP_STRING([--with-gtest-source=PATH],
--                            [location of the Googletest source])],
--            [enable_gtest="yes" ; GTEST_SOURCE="$withval"])
--
--AC_ARG_WITH([gtest],
--            [AS_HELP_STRING([--with-gtest=PATH],
--                            [specify a path to gtest header files 
(PATH/include) and library (PATH/lib)])],
--        [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
-+AC_ARG_ENABLE([gtest],
-+              [AS_HELP_STRING([--enable-gtest],
-+                              [enable testing via Googletest [default=no]])])
-
- AC_ARG_WITH([lcov],
-             [AS_HELP_STRING([--with-lcov=PROGRAM],
-@@ -55,111 +46,22 @@
- #
- # Check availability of gtest, which will be used for unit tests.
- #
--GTEST_LDFLAGS=
--GTEST_LDADD=
- DISTCHECK_GTEST_CONFIGURE_FLAG=
--GTEST_VERSION="unknown"
--
--if test "x$enable_gtest" = "xyes" ; then
--
--    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path"
--
--    if test -n "$with_gtest_source" ; then
-
--        if test "x$GTEST_SOURCE" = "xyes" ; then
-+AS_IF([test "x$enable_gtest" = "xyes"], [
-+    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
-+    PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested 
but not found])])
-+    GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
-+    GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
-+    GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
-+])
-
--            AC_MSG_CHECKING([for gtest source])
--            # If not specified, try some common paths.
--            GTEST_SOURCE=
--            for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
--                if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then
--                    GTEST_SOURCE=$d
--                    AC_MSG_RESULT([$GTEST_SOURCE])
--                    break
--                fi
--            done
--            if test -z $GTEST_SOURCE ; then
--                AC_MSG_ERROR([no gtest source but it was selected])
--            fi
--        else
--            if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; 
then
--                GTEST_SOURCE=$GTEST_SOURCE/googletest
--            fi
--            if test -f $GTEST_SOURCE/src/gtest-all.cc -a 
$GTEST_SOURCE/src/gtest_main.cc; then
--                have_gtest_source=yes
--            else
--                AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])
--            fi
--        fi
--        have_gtest_source=yes
--
--        GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a"
--        DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
--        GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
--        GTEST_VERSION="`basename $GTEST_SOURCE`"
--
--# Versions starting from 1.8.0 are put in the googletest directory. If the 
basename
--# returns googletest string, we need to cut it off and try baseline again.
--        if test "$GTEST_VERSION" = "googletest"; then
--            GTEST_VERSION=${GTEST_SOURCE%"/googletest"}
--            GTEST_VERSION=`basename $GTEST_VERSION`
--        fi
--        GTEST_VERSION="${GTEST_VERSION#googletest-release-}"
--        GTEST_VERSION="${GTEST_VERSION#gtest-}"
--    fi
--
--    if test "$gtest_path" != "no" ; then
--        if test "$gtest_path" != "yes"; then
--            GTEST_PATHS=$gtest_path
--            if test -x "${gtest_path}/bin/gtest-config" ; then
--                GTEST_CONFIG="${gtest_path}/bin/gtest-config"
--            fi
--        else
--            AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
--        fi
--        if test -x "${GTEST_CONFIG}" ; then :
--            # using cppflags instead of cxxflags
--            GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags`
--            GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
--            GTEST_LDADD=`${GTEST_CONFIG} --libs`
--            GTEST_VERSION=`${GTEST_CONFIG} --version`
--            GTEST_FOUND="true"
--        else
--            AC_MSG_WARN([Unable to locate Google Test gtest-config.])
--            if test -z "${GTEST_PATHS}" ; then
--                GTEST_PATHS="/usr /usr/local"
--            fi
--            GTEST_FOUND="false"
--        fi
--        if test "${GTEST_FOUND}" != "true"; then
--            GTEST_FOUND="false"
--            for dir in $GTEST_PATHS; do
--                if test -f "$dir/include/gtest/gtest.h"; then
--                    if test -f "$dir/lib/libgtest.a" || \
--                       test -f "$dir/lib/libgtest.so"; then
--                        GTEST_INCLUDES="-I$dir/include"
--                        GTEST_LDFLAGS="-L$dir/lib"
--                        GTEST_LDADD="-lgtest"
--                        GTEST_FOUND="true"
--                        break
--                    else
--                        AC_MSG_WARN([Found Google Test include but not the 
library in $dir.])
--                    fi
--                fi
--            done
--        fi
--        if test "${GTEST_FOUND}" != "true"; then
--            AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS])
--        fi
--
--    fi
--fi
- AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
- AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
- AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
- AC_SUBST(GTEST_INCLUDES)
- AC_SUBST(GTEST_LDFLAGS)
--AC_SUBST(GTEST_LDADD)
-+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS])
- AC_SUBST(GTEST_SOURCE)
-
- ])dnl AX_ISC_GTEST

diff --git a/net-misc/kea/kea-2.0.2.ebuild b/net-misc/kea/kea-2.0.2.ebuild
deleted file mode 100644
index aca4fe99e606..000000000000
--- a/net-misc/kea/kea-2.0.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="https://www.isc.org/kea/";
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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";
-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
-       if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then
-               [[ "${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"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-       dev-libs/boost:=
-       dev-libs/log4cplus
-       mysql? ( dev-db/mysql-connector-c )
-       !openssl? ( dev-libs/botan:2= )
-       openssl? ( dev-libs/openssl:0= )
-       postgres? ( dev-db/postgresql:* )
-       shell? ( ${PYTHON_DEPS} )
-"
-DEPEND="${COMMON_DEPEND}
-       test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}
-       acct-group/dhcp
-       acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-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
-)
-
-pkg_setup() {
-       use shell && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       default
-       # Brand the version with Gentoo
-       sed -i \
-               -e "s/AC_INIT(kea,${PV}.*, 
kea-...@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], 
[kea-...@lists.isc.org])/g" \
-               configure.ac || die
-
-       sed -i \
-               -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \
-               Makefile.am || die "Fixing Makefile.am failed"
-
-       eautoreconf
-}
-
-src_configure() {
-       local myeconfargs=(
-               --disable-install-configurations
-               --disable-static
-               --enable-generate-messages
-               --enable-perfdhcp
-               --localstatedir="${EPREFIX}/var"
-               --runstatedir="${EPREFIX}/run"
-               --without-werror
-               $(use_enable test gtest)
-               $(use_enable shell)
-               $(use_with mysql)
-               $(use_with openssl)
-               $(use_with postgres pgsql)
-       )
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
-       newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
-
-       if use samples; then
-               diropts -m 0750 -o root -g dhcp
-               dodir /etc/kea
-               insopts -m 0640 -o root -g dhcp
-               insinto /etc/kea
-               doins "${FILESDIR}"/${PN}-ctrl-agent.conf
-               doins "${FILESDIR}"/${PN}-ddns-server.conf
-               doins "${FILESDIR}"/${PN}-dhcp4.conf
-               doins "${FILESDIR}"/${PN}-dhcp6.conf
-       fi
-
-       systemd_dounit "${FILESDIR}"/${PN}-ctrl-agent.service
-       systemd_dounit "${FILESDIR}"/${PN}-ddns-server.service
-       systemd_dounit "${FILESDIR}"/${PN}-dhcp4-server.service
-       systemd_dounit "${FILESDIR}"/${PN}-dhcp6-server.service
-
-       newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-
-       keepdir /var/lib/${PN} /var/log/${PN}
-       find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-       tmpfiles_process ${PN}.conf
-       fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6}
-}

diff --git a/net-misc/kea/kea-2.2.0.ebuild b/net-misc/kea/kea-2.2.0.ebuild
deleted file mode 100644
index 65ef75d7f344..000000000000
--- a/net-misc/kea/kea-2.2.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="https://www.isc.org/kea/";
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools fcaps python-single-r1 systemd tmpfiles
-
-if [[ ${PV} = 9999* ]] ; then
-       inherit git-r3
-       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
-       if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then
-               if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then
-                        KEYWORDS="~amd64 ~arm64 ~x86"
-               fi
-       fi
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-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= )
-       postgres? ( dev-db/postgresql:* )
-       shell? ( ${PYTHON_DEPS} )
-"
-DEPEND="${COMMON_DEPEND}
-       test? ( dev-cpp/gtest )
-"
-RDEPEND="${COMMON_DEPEND}
-       acct-group/dhcp
-       acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-2.2.0-openssl-version.patch
-)
-
-pkg_setup() {
-       use shell && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-       default
-
-       cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 
'Replace gtest m4 macro failed'
-
-       # brand the version with Gentoo
-       sed -i \
-               -e "s/AC_INIT(kea,${PV}.*, 
kea-...@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], 
[kea-...@lists.isc.org])/g" \
-               configure.ac || die
-
-       sed -i \
-               -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \
-               Makefile.am || die "Fixing Makefile.am failed"
-
-       eautoreconf
-}
-
-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)
-               $(use_with openssl)
-               $(use_with postgres pgsql)
-       )
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
-       newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
-
-       if use samples; then
-               diropts -m 0750 -o root -g dhcp
-               dodir /etc/kea
-               insopts -m 0640 -o root -g dhcp
-               insinto /etc/kea
-               doins "${FILESDIR}"/${PN}-ctrl-agent.conf
-               doins "${FILESDIR}"/${PN}-ddns-server.conf
-               doins "${FILESDIR}"/${PN}-dhcp4.conf
-               doins "${FILESDIR}"/${PN}-dhcp6.conf
-       fi
-
-       systemd_dounit "${FILESDIR}"/${PN}-ctrl-agent.service
-       systemd_dounit "${FILESDIR}"/${PN}-ddns-server.service
-       systemd_dounit "${FILESDIR}"/${PN}-dhcp4-server.service
-       systemd_dounit "${FILESDIR}"/${PN}-dhcp6-server.service
-
-       newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf
-
-       keepdir /var/lib/${PN} /var/log/${PN}
-       find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-       tmpfiles_process ${PN}.conf
-       fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6}
-}

Reply via email to