gentoo resync : 05.12.2021

4 files changed, 49 insertions, 9 deletions

diff --git a/www-apache/mod_dnssd/Manifest b/www-apache/mod_dnssd/Manifest
index d5df6a565d6a..a2e49368bf7c 100644
--- a/www-apache/mod_dnssd/Manifest
+++ b/www-apache/mod_dnssd/Manifest
@@ -1,6 +1,7 @@
 AUX 80_mod_dnssd.conf 118 BLAKE2B 821ab460bac4953375244a9da11674fb054f14611f73fbad3a5ee9441880a5842803ccbcd4077e97ac71c99646229ae254472fe25ccf701a80cf4a924549011d SHA512 ef13ddde307b6e4c8e48727d1d2145ca3ae99f8e105d4606628edd86576fde0ba4dd3cb6fb71a95d66a523e90cf30e5a3608d581760038f147f137fa5c6c4e28
-AUX mod_dnssd-0.6-httpd24.patch 603 BLAKE2B f18e9a6dbb133287d839bd88a94b131cd34d2789590ad3f2a8ee8d24d86206f5ed4dcd305c4c3b446be12297d6256ac10751b35508e902c486de5c7c0340c484 SHA512 c8e3428a1b4dfe0a24ed244ed30eb8b1181642a05d75de2b2b61ea48168f881b026d6c3fd0fbdfcc344736a1d93e4458853853e335076e498d6df091ccdde228
-AUX mod_dnssd-0.6-ldflags.patch 571 BLAKE2B be314c84a92262d3659a973ba1e2069389c16bde72674ab57465585179867cc8b3b851beca924f4596a8a237969e6defa162af6d222f84137a77d587463c596f SHA512 419c9565ac03a352568b3ab97e03e6878b5721a455fdd8f07f328d4a64ab401776f3a5ccd2a31e10b64fbbf334693c8f6e3636ed65f9f06f6f83d433f6366d6c
+AUX mod_dnssd-0.6-httpd24.patch 571 BLAKE2B e0a5d3610a7c26dcbad07bab08d38d872cea1070891e457788525d347408560bd30768c9b3886b5199b49f9b1a2c748824bb0a04a5c218604281c194cac09a99 SHA512 5af320fe038b9db4298874fa68c0de7381ff3f0471802d60972c9694c50616684a30e1986ff3beb95ed963060b792b1e5e3c88b31a199411c20ff15d3bb1fd0c
+AUX mod_dnssd-0.6-ldflags.patch 494 BLAKE2B ac0237603c2062a45ab5ef22a255ebedb8b1f75382dd64717398b1c4bac1289a086870363771f1abd1b8fadb1428a449d8c1c42f3f6ae520e2aa4979eedd8d66 SHA512 bbf43d11b6a52800277fcdf4407b6b46f49468337fa2188485d3a6af990b9fdcb5696b0fa2ec60453c3692e6f985659d73fe72053f5254d3f4c5c7907e851264
 DIST mod_dnssd-0.6.tar.gz 86417 BLAKE2B 01aee3624e413f5a00d6e63e5e74d9dc1667db9e9747b65a7fce9ab762cf0f9a5cd3ef4dcccf9532e9aa70435bd6afd846fdbaafff6667ba1fd9d413ea6fe0d9 SHA512 c3eacd2065f996ace76496b828a5be4b735225782c88ed0fba00c37ffed91af7c81cef755556968880e11e05fbaf65a4326728cb82abcad03ccaf925be1f29d3
 EBUILD mod_dnssd-0.6-r1.ebuild 876 BLAKE2B b27cf5b6b78e8d0bb5e0edc1b9823e769e83032618dae4d0b9748e371ed3c48a02e847367da17f4e44f03bd9c67262992db63cf94b2a85d9f2d6254c4ef20406 SHA512 9b7d00ee5dbd025fd8ac44a9596bdd3cf4577d15bdd19f236e369170cb066782f080d683218917f3b3db5a2dad3e1d47d97223b055e1b98a9749704b5b49485d
+EBUILD mod_dnssd-0.6-r2.ebuild 864 BLAKE2B ac86ebe1fa4ce2b238466dfceaa8f4e4e81dd923c1ae4ae9b185a9ce60b96fec4b135d793375cff0a141c6d36b07892c21e27772ac4e42c9e4c370847d87be32 SHA512 db4fad3e2d2b7111975892c884f54b929ba1e54c0dca8593e151e19c0abe6fc0059679d6692bd8095c92cbe2ea59f91edc2b64c0479f9437537aca96af4f8d29
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
index 6eb505810405..fcb0c50c15bd 100644
--- a/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
+++ b/www-apache/mod_dnssd/files/mod_dnssd-0.6-httpd24.patch
@@ -1,5 +1,5 @@
---- mod_dnssd-0.6/src/mod_dnssd.c.httpd24
-+++ mod_dnssd-0.6/src/mod_dnssd.c
+--- a/src/mod_dnssd.c
++++ b/src/mod_dnssd.c
 @@ -26,6 +26,9 @@
  #include <unixd.h>
  #include <apr_signal.h>
diff --git a/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch b/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
index 699f2301f442..a81a255997c4 100644
--- a/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
+++ b/www-apache/mod_dnssd/files/mod_dnssd-0.6-ldflags.patch
@@ -1,8 +1,5 @@
----
- Respect LDFLAGS and properly use LIBS to avoid missing symbols at runtime.
-
---- src/Makefile.in
-+++ src/Makefile.in
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -16,13 +16,14 @@
  
  APXS=@APXS@
diff --git a/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
new file mode 100644
index 000000000000..828e5f62075b
--- /dev/null
+++ b/www-apache/mod_dnssd/mod_dnssd-0.6-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit apache-module depend.apache
+
+DESCRIPTION="mod_dnssd is an Apache module which adds Zeroconf support via DNS-SD using Avahi"
+HOMEPAGE="https://0pointer.de/lennart/projects/mod_dnssd/"
+SRC_URI="https://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+DEPEND="net-dns/avahi[dbus]"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_CONF="80_${PN}"
+APACHE2_MOD_DEFINE="DNSSD"
+
+need_apache2
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-httpd24.patch"
+)
+
+# Work around Bug #616612
+pkg_setup() {
+	_init_apache2
+	_init_apache2_late
+}
+
+src_configure() {
+	econf --with-apxs=${APXS} --disable-lynx
+}
+
+# Do not use inherited src_compile since it doesn't do what we want
+src_compile() {
+	emake
+}