From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 18 Dec 2020 11:06:49 +0000
Subject: gentoo resync : 18.12.2020

---
 net-misc/kea/Manifest            |  4 +--
 net-misc/kea/files/kea-initd-r1  | 20 ++++++++---
 net-misc/kea/kea-1.8.1-r1.ebuild | 74 ++++++++++++++++++++++++++++++++++++++++
 net-misc/kea/kea-1.8.1.ebuild    | 74 ----------------------------------------
 4 files changed, 91 insertions(+), 81 deletions(-)
 create mode 100644 net-misc/kea/kea-1.8.1-r1.ebuild
 delete mode 100644 net-misc/kea/kea-1.8.1.ebuild

(limited to 'net-misc/kea')

diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 2a716bbc034e..a96913537661 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,6 +1,6 @@
 AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6
-AUX kea-initd-r1 1980 BLAKE2B 338cc159d54d62d3172fd8bba5213d82058bb90b90085be1d0e41a071966cdc76325ce881c075cfac04850c1adad8ea502c85873607fe7487168797a0658e184 SHA512 5685a83ac59f67f9832a270ab737672185200669b2b13f6c5df19a2285bd98ff89e44ac53097cd6f86858bd1f243f52ff3e2a4b334ab147d612cfa30d5ff34eb
+AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
 DIST kea-1.8.1.tar.gz 9001243 BLAKE2B f121c173b915b82055048fb05dcde622ef3f7ee1d113604d94c7df737f9de1b15e5cedbe414ea583f6a6c9e9ceca615eaad2778a2736addc21b27fe45521aa3e SHA512 0f0972d63a1e146623dd30b8acab9a72af2d10c25fbdf9cf31e66ed25dee14f6b7602226c475f574a723415ba5569b04e13a97711bd933448e1045636ca6b96f
-EBUILD kea-1.8.1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
+EBUILD kea-1.8.1-r1.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 EBUILD kea-9999.ebuild 1714 BLAKE2B b5281b40df619ae6c1276fbbbb17408742592e70f4e2283524560d38a39a18225022a0e388e192ad6e6760640ade4756a1f4b2677a947678b45459a482e2f9ed SHA512 9e05988bc7b12fab2170af763a580e599c50aa4f1913abda01b69103c04791067766d2db8d6468e4b53a231b0c2bf7e5d817f2f8e720de405ec77f7c17576ed3
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/files/kea-initd-r1 b/net-misc/kea/files/kea-initd-r1
index 57711b3c9d36..00c493f14be1 100644
--- a/net-misc/kea/files/kea-initd-r1
+++ b/net-misc/kea/files/kea-initd-r1
@@ -19,24 +19,34 @@ depend() {
 }
 
 start_pre() {
-	if [ ! -f "${config_file}" ] ; then
-		eerror "Please create a ${config_file} config file."
-		return 1
-	fi
-
 	if ${DHCP4:-false} ; then
+		if [ ! -f "${dhcp4_config}" ] ; then
+			eerror "Please create a ${dhcp4_config} config file."
+			return 1
+		fi
+
 		if ! ${dhcp4_command} -t ${dhcp4_config} 1>/dev/null 2>/dev/null ; then
 			eerror "Error in config file ${dhcp4_config}"
 			return 1
 		fi
 	fi
 	if ${DHCP6:-false} ; then
+		if [ ! -f "${dhcp6_config}" ] ; then
+			eerror "Please create a ${dhcp6_file} config file."
+			return 1
+		fi
+
 		if ! ${dhcp6_command} -t ${dhcp6_config} 1>/dev/null 2>/dev/null ; then
 			eerror "Error in config file ${dhcp6_config}"
 			return 1
 		fi
 	fi
 	if ${DDNS:-false} ; then
+		if [ ! -f "${ddns_config}" ] ; then
+			eerror "Please create a ${ddns_config} config file."
+			return 1
+		fi
+
 		if ! ${ddns_command} -t ${ddns_config} 1>/dev/null 2>/dev/null ; then
 			eerror "Error in config file ${ddns_config}"
 			return 1
diff --git a/net-misc/kea/kea-1.8.1-r1.ebuild b/net-misc/kea/kea-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..3e20776fe7e7
--- /dev/null
+++ b/net-misc/kea/kea-1.8.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools 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"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+IUSE="mysql +openssl postgres samples"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
+	!openssl? ( dev-libs/botan:2= )
+	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
+"
+RDEPEND="${DEPEND}
+	acct-group/dhcp
+	acct-user/dhcp"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	[[ ${PV} = *9999 ]] && eautoreconf
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
+		$(use_with mysql)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_enable samples install-configurations)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
+	keepdir /var/lib/${PN} /var/log
+	rm -rf "${ED}"/var/run || die
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/net-misc/kea/kea-1.8.1.ebuild b/net-misc/kea/kea-1.8.1.ebuild
deleted file mode 100644
index 3e20776fe7e7..000000000000
--- a/net-misc/kea/kea-1.8.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="http://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools 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"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="mysql +openssl postgres samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:2= )
-	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )
-"
-RDEPEND="${DEPEND}
-	acct-group/dhcp
-	acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	[[ ${PV} = *9999 ]] && eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-perfdhcp
-		--localstatedir="${EPREFIX}/var"
-		--without-werror
-		$(use_with mysql)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_enable samples install-configurations)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
-	keepdir /var/lib/${PN} /var/log
-	rm -rf "${ED}"/var/run || die
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-- 
cgit v1.2.3