From 8a38bcc9dbd5dc6d23764d77d073a25e8d824402 Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Tue, 16 Nov 2021 14:25:36 +0100
Subject: community/kea: fix circular dependency between kea-common and
 kea-http

https://gitlab.alpinelinux.org/alpine/aports/-/issues/13173#note_192459:
> kea is broken because kea-http needs kea-common but kea-common needs
> libkea-http.so.29 (provided by kea-http) for libkea-cfgclient.so.25.0.0
> thus creating a recursive dependency between kea-common and kea-http.
---
 community/kea/APKBUILD | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/community/kea/APKBUILD b/community/kea/APKBUILD
index aa356fcc0b..a807f11246 100644
--- a/community/kea/APKBUILD
+++ b/community/kea/APKBUILD
@@ -7,7 +7,7 @@ pkgname=kea
 #   Odd-numbered versions are development versions.
 # NOTE: When bumping, always rebuild all kea hooks (kea-* aports)!
 pkgver=2.0.0
-pkgrel=0
+pkgrel=1
 pkgdesc="DHCPv4 and DHCPv6 server from ISC"
 url="https://kea.isc.org/"
 arch="all"
@@ -40,7 +40,6 @@ subpackages="
 	$pkgname-dhcp-ddns:dhcpddns
 	$pkgname-dhcp4
 	$pkgname-dhcp6
-	$pkgname-http
 	$pkgname-shell::noarch
 	$pkgname-hook-mysql-cb:hook_mysql_cb
 	$pkgname-hook-ha:hook_ha
@@ -184,13 +183,6 @@ dhcp6() {
 	_install_initd kea-dhcp6
 }
 
-# Needed only by ctrl-agent and hooks.
-http() {
-	depends=""
-
-	amove ./usr/lib/libkea-http.so*
-}
-
 shell() {
 	pkgdesc="Text client for Kea DHCP Control Agent"
 	depends="python3"
@@ -251,7 +243,7 @@ hook_run_script() {
 common() {
 	pkgdesc="Common files and libraries for Kea DHCP Server"
 	replaces="kea-utils"  # for backward compatibility
-	provides="kea-utils=$pkgver-r$pkgrel"  # for backward compatibility
+	provides="kea-utils=$pkgver-r$pkgrel kea-http=$pkgver-r$pkgrel"  # for backward compatibility
 	depends=""
 
 	mkdir -p "$subpkgdir"
-- 
cgit v1.2.3