[gentoo-commits] repo/gentoo:master commit in: net-misc/dhcp/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     4a72293b35a464e9209ec9825b9c30a61d10e9d4
Author:     Raul E Rangel <rrangel <AT> chromium <DOT> org>
AuthorDate: Wed Nov 30 20:42:06 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 27 15:29:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a72293b

net-misc/dhcp: Add missing dep

    checking for zlib library... yes
    checking for library containing deflate... no
    configure: error: found zlib include but not library.
    /build/arm64-generic/tmp/portage/net-misc/dhcp-4.4.1-r1/work/dhcp-4.4.1/bind/bind-9.11.2-P1/config.log:

This shows up when cross compiling into a new sysroot when using the
ROOT= environment variable.

Signed-off-by: Raul E Rangel <rrangel <AT> chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/30467
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild                              | 4 ++--
 net-misc/dhcp/{dhcp-4.4.3_p1-r2.ebuild => dhcp-4.4.3_p1-r4.ebuild} | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
index aca3e20ed93e..48fb12a0f5d6 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
 BDEPEND="
@@ -26,6 +26,7 @@ BDEPEND="
 	acct-user/dhcp"
 
 DEPEND="
+	sys-libs/zlib:=
 	client? (
 		kernel_linux? (
 			ipv6? ( sys-apps/iproute2 )
@@ -76,7 +77,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
 
 	# Possible upstream candidates
-	"${FILESDIR}/${PN}-4.4.3-configure-clang16.patch"
 )
 
 src_prepare() {

diff --git a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
similarity index 97%
rename from net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
rename to net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
index 9fa84b982375..4140099005c0 100644
--- a/net-misc/dhcp/dhcp-4.4.3_p1-r2.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.3_p1-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+client ipv6 ldap selinux +server ssl vim-syntax"
 
 BDEPEND="
@@ -26,6 +26,7 @@ BDEPEND="
 	acct-user/dhcp"
 
 DEPEND="
+	sys-libs/zlib:=
 	client? (
 		kernel_linux? (
 			ipv6? ( sys-apps/iproute2 )
@@ -76,6 +77,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.3-ldap-ipv6-client-id.patch"
 
 	# Possible upstream candidates
+	"${FILESDIR}/${PN}-4.4.3-configure-clang16.patch"
 )
 
 src_prepare() {