gentoo auto-resync : 02:01:2024 - 20:57:46

3 files changed, 9 insertions, 66 deletions

diff --git a/net-dns/inadyn/Manifest b/net-dns/inadyn/Manifest
index 2a47b472fd65..05f6c747f2d1 100644
--- a/net-dns/inadyn/Manifest
+++ b/net-dns/inadyn/Manifest
@@ -1,8 +1,6 @@
 AUX inadyn.confd 158 BLAKE2B 246e1620c4e86ae2181cdee7ae4a14d9139a96476c159a2bd1b57bb3c10b8696f39e232da0efdef89a3473d138c72ba523ae866a248ba38213a1cab6127b5128 SHA512 0806329acf13e83f6806e1c36a0cf7bff4c4cfd480e10f602ff0e3dfddfcf99bb912460d1bb6c5ef84036d42fb3ccd5ff11e7ac99e1f8db2d82d84b5acf20d2f
 AUX inadyn.initd 618 BLAKE2B 14dbddb55e21194ddad9fbbd8470a84964f06a30a560375ee2b4916ca3522cf366a5e793eef7edbee272ab117e55ebf20a5ab574c24c8d8561937168cb70bdcb SHA512 fe5d77d54f4f56900e7e54d920530b2023401207ffc43955ebdbf8edf9d8b0a323ec10df7620bc3751c6ee7bf1c25047ef6d7226b3b29d276f70d511665ce45e
 AUX inadyn.tmpfilesd 75 BLAKE2B f09b58e347524f2bb42dbab273a6ca86e2a46bd15082fd54bbf2523a75e97f204a1539c6acde658e2fc4e377cf3801fd5c1a393e7f91ccca847f86aca139c1f1 SHA512 53f3a24f2bd3ed9a236294223199cb9717a009550222d32f704c0b98b6b91c94943440a47ed3dfcd528591cf7e00b29ded02b6245eeb5887282fbffe169e1414
-DIST inadyn-2.11.0.tar.gz 509655 BLAKE2B 7acb356f691717e282355ed9f0a152463f2364633b0e999838572b18b3330b4aa6cc1f02c58ed1f0fac4e6bac6220992f0c7b20449aea420eb28f55343caa954 SHA512 d0d73cbecbc4dca028dd39f4e125ed9f5e370cb8367086cc819eafbae825ce7bb6f2ad4a5134bfefefd7d6609352d6355b73b28149426a8f755b0e463aa8f008
 DIST inadyn-2.12.0.tar.gz 506723 BLAKE2B 35fc5f8f9298cfb5ff7bf4c569fbd0495c2591a1fd630919bae8dabff03a0e41c512d304d2519be688bff3c41427f13b0a66738b785e1d28e0ec4d3901f05488 SHA512 940e49cd2c434f57a56494e1946939f0d773deeb489939c957c0e1eac135177ab3c446e967daa01a56fde5490568761c1492646bae1bb2f63688e0e9121ef8fe
-EBUILD inadyn-2.11.0.ebuild 1398 BLAKE2B a4c0b6663f0e1e5ac2de6f381b4942371f08afd6492a1c6b7e61eebddfb5a5bfe86125f43068541d4d5fd87f4a7a21104a7f881cd4f1a1853851f5852eb7f95a SHA512 2504cb84fffba2e3ebe13f86929a6b448ddd591281f2005173d250821332b02872c486fc9e4594c1c99eb33399cce2223cca6cf0705f1ad535ddd934fa944651
-EBUILD inadyn-2.12.0.ebuild 1424 BLAKE2B e42a013a21529466d00fffc66674bb314cd7d48f86c931f1270b6e08035a419a957d2caca6471377de91951d5d90384a9827bde3e90abad2a9999f922ba3f884 SHA512 45ba9963a0b642ff12d96772bc5b6df015655025612c37a036e88330f69d3ca75ccec71ac6deaacc90e1b1c91a11b159a2b42c0f5d59a89bf1e5d517532ddcd4
+EBUILD inadyn-2.12.0.ebuild 1582 BLAKE2B f4969dd9e191b0f026a5b1e90a01c84b7f52e5474a29acc4f8454a5d8fe9e25fe4bfe64fd5a9d7f779ece48ba8f64c08c21fc29783cb21b53e0ea2d8e430ebfe SHA512 a2b9a71e60bc58cfd94a1c4fa0c7be8933eebc5ea38e0a96cbf31b00d40f76a7c5924224ec0a9237f3328965b8e2f586c60207c5bb7c76bc6010e4c97543a07c
 MISC metadata.xml 993 BLAKE2B 362846a13e02a33b0219fa4c21f7e4d39886089b16a0eb2d5891abbf3f6c1945f42750126d54b8271caa381770dedf458f18117ece52f7058c494838d5625540 SHA512 7bb3ba6f732c1bde413bd52a50f22c93ca1e5f59cbdee12e106cc33b4175982c55cb587f48a691d603d46ae268ab9bf37fbb816cab514e895c7386c6d5cc4267
diff --git a/net-dns/inadyn/inadyn-2.11.0.ebuild b/net-dns/inadyn/inadyn-2.11.0.ebuild
deleted file mode 100644
index bef527dadd86..000000000000
--- a/net-dns/inadyn/inadyn-2.11.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Dynamic DNS client with multiple SSL/TLS library support"
-HOMEPAGE="https://github.com/troglobit/inadyn"
-SRC_URI="https://github.com/troglobit/inadyn/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="gnutls mbedtls openssl"
-REQUIRED_USE="?? ( gnutls mbedtls openssl )"
-
-DEPEND="
-	acct-group/inadyn
-	acct-user/inadyn
-	dev-libs/confuse:=
-	gnutls? (
-		dev-libs/nettle:=
-		net-libs/gnutls:0=
-	)
-	mbedtls? ( net-libs/mbedtls:0= )
-	openssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local myeconfargs=( "--disable-ssl" )
-	if use gnutls || use mbedtls || use openssl; then
-		local myeconfargs=( "--enable-ssl" )
-	fi
-
-	use mbedtls && myeconfargs+=( "--enable-mbedtls" )
-	use openssl && myeconfargs+=( "--enable-openssl" )
-
-	myeconfargs+=( --with-systemd="$(systemd_get_systemunitdir)" )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto	/etc
-	insopts -m 0600 -o inadyn -g inadyn
-	doins examples/inadyn.conf
-
-	newinitd "${FILESDIR}"/inadyn.initd inadyn
-	newconfd "${FILESDIR}"/inadyn.confd inadyn
-
-	newtmpfiles "${FILESDIR}"/inadyn.tmpfilesd inadyn.conf
-}
-
-pkg_postinst() {
-	tmpfiles_process inadyn.conf
-}
diff --git a/net-dns/inadyn/inadyn-2.12.0.ebuild b/net-dns/inadyn/inadyn-2.12.0.ebuild
index 87a2471dbf87..14ccc44e5337 100644
--- a/net-dns/inadyn/inadyn-2.12.0.ebuild
+++ b/net-dns/inadyn/inadyn-2.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,7 +35,13 @@ src_configure() {
 		local myeconfargs=( "--enable-ssl" )
 	fi
 
-	use mbedtls && myeconfargs+=( "--enable-mbedtls" )
+	if use mbedtls; then
+		myeconfargs+=( "--enable-mbedtls" )
+
+		# MbedTLS has no support for pkg-config
+		myeconfargs+=( MbedTLS_CFLAGS="-I/usr/include/mbedtls" )
+		myeconfargs+=( MbedTLS_LIBS="-lmbedtls" )
+	fi
 	use openssl && myeconfargs+=( "--enable-openssl" )
 
 	myeconfargs+=( --with-systemd="$(systemd_get_systemunitdir)" )