gentoo resync : 23.09.2020

5 files changed, 65 insertions, 32 deletions

diff --git a/net-dns/mdns-repeater/Manifest b/net-dns/mdns-repeater/Manifest
index 96e664e9bb91..37a32840596d 100644
--- a/net-dns/mdns-repeater/Manifest
+++ b/net-dns/mdns-repeater/Manifest
@@ -1,3 +1,4 @@
-DIST mdns-repeater-28ecc2ab9a0e.tar.gz 10697 BLAKE2B 4272f20d08db060c27a0f1e6cd9cea6896b8f119e8b751cc25f64ecb4a542adaf55b31d8a380058371bcf7e26c4e13fd34dec8a11a58f37e270af9be6b04fc3b SHA512 06b8365a389ccc77bc31ebcbf7089e59bd2e03e4996e719f369e7c54dbc96b1ea57c9e0b82d4376fcb165160e04a48a3a679f9ab431344f46d74a3602e58a0d8
-EBUILD mdns-repeater-20110921.ebuild 556 BLAKE2B acdbf33470f73559b315da56d6cbcae75e81d1be94334d27adc1b2d82fae6efdc1902eff9e7767b2766d33d783844116a98621619fa7fec17a5f4cd6150943b8 SHA512 7036958a0de08911d7696367f79fd5d8c770b3909ca5d600c4323caf6d29663e214f6bc6b4136769f0067d69d55a2e8bbbebc3b39dafd12a9b4d60e3c4b0331c
-MISC metadata.xml 472 BLAKE2B 82d6d18d384de972128c0d31714691eaf78df68e0168692e1594bd49a90b605029b93ebc2437d476379a04b1a41cd2591a7aebe3f1bb08997e31eea6a51fff89 SHA512 b26c5d02e9325075a58b99844baa558b5822ca39d9e35965aed9ad4480a702bd079236ad73a815a1977f2cbdf2f57fab6570b71536b64cb9221d2efb87bd9219
+AUX mdns-repeater-1.11-system-compiler-options.patch 687 BLAKE2B e806dcb148b5db8c4559fbbb51843efaac5e73565551ffb98d008e380a3192533851bf20da2cc92bf9945238d87939b6af511a3ebcc39aa64f90529207e2a3e7 SHA512 fc78f8c2b40846811d04e731404d7ed3ebdc3863870c5ddb457b4f2443d2c31c2b3a580e7dc0dae5b6f11f765fd09d33b0d471bc4d486fe64ddbae0e0cf669ca
+DIST mdns-repeater-1.11.tar.gz 11220 BLAKE2B 88e6b68635be152c2fcd7eb0e5be038d694bae590edde283dec83b896c2380d83cc84d5e4cfb02b6ae957d75dd7525975e31c418d05f5732b5f41382fb130c31 SHA512 3f2fc83448db7ed84512ddc42d1769d1d7fa52aa92a4205d9956685fd5fd8b5c050b8a2c44d4b834e242568671fa278ac912f0b35f3c7cf41aa0ae8f1cf2a310
+EBUILD mdns-repeater-1.11.ebuild 550 BLAKE2B ff3bf7c106d4b143f3fd700e00213a3135dc50db2d75f8c4627a4e3b3101eeaebb097280188f71ff5afe4a3649f2e6228b501d6e0caee187044656cf09adaa2e SHA512 c43c1fc07d980881b27f46e6f63143b40a429ddf33ef569cfcf1d4d9a2d6bdd9b50b850c3a273c362ac59e99fe8906bbd5d0357da8f5ae0c2acfe7de8ae78c29
+MISC metadata.xml 475 BLAKE2B aaa3ba749586ffab285b5b3bea63d8b2d0433399a2a95080e1b1387ca48830d458156bb0f89a4c955202ddd651d548441db0adad2630b27f6877093f838139b1 SHA512 c2e5468b6a3606eafaa2caee43921a914e4758d6b66e417791247eaa97c688967e7e3617af1d0dceffc3924f9a87423a66652499880564e5ff7a7b2661177958
diff --git a/net-dns/mdns-repeater/files/mdns-repeater-1.11-system-compiler-options.patch b/net-dns/mdns-repeater/files/mdns-repeater-1.11-system-compiler-options.patch
new file mode 100644
index 000000000000..35eaa3675283
--- /dev/null
+++ b/net-dns/mdns-repeater/files/mdns-repeater-1.11-system-compiler-options.patch
@@ -0,0 +1,33 @@
+From 4d4f022eef0d0d14936288a5f6374c7a4b85c77c Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 23 Aug 2020 04:06:15 +0300
+Subject: [PATCH] Respect system CFLAGS and LDFLAGS
+
+---
+ Makefile | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a04f707..ae4fe32 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,15 +9,7 @@ ZIP_FILES = mdns-repeater	\
+ 
+ HGVERSION=$(shell hg parents --template "{latesttag}.{latesttagdistance}")
+ 
+-CFLAGS=-Wall
+-
+-ifdef DEBUG
+-CFLAGS+= -g
+-else
+-CFLAGS+= -Os
+-LDFLAGS+= -s
+-endif
+-
++CFLAGS+=-Wall
+ CFLAGS+= -DHGVERSION="\"${HGVERSION}\""
+ 
+ .PHONY: all clean
+-- 
+2.26.2
+
diff --git a/net-dns/mdns-repeater/mdns-repeater-1.11.ebuild b/net-dns/mdns-repeater/mdns-repeater-1.11.ebuild
new file mode 100644
index 000000000000..70e66393f0c6
--- /dev/null
+++ b/net-dns/mdns-repeater/mdns-repeater-1.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Multicast DNS repeater"
+HOMEPAGE="https://github.com/kennylevinsen/mdns-repeater"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+SRC_URI="https://github.com/kennylevinsen/mdns-repeater/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+PATCHES=(
+	"${FILESDIR}/${P}-system-compiler-options.patch"
+)
+
+src_compile() {
+	emake HGVERSION="${PV}" CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin "${PN}"
+	dodoc README.txt
+}
diff --git a/net-dns/mdns-repeater/mdns-repeater-20110921.ebuild b/net-dns/mdns-repeater/mdns-repeater-20110921.ebuild
deleted file mode 100644
index 262d90f35c60..000000000000
--- a/net-dns/mdns-repeater/mdns-repeater-20110921.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Multicast DNS repeater"
-HOMEPAGE="https://bitbucket.org/geekman/mdns-repeater/"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm"
-
-REV="28ecc2ab9a0e"
-SRC_URI="https://bitbucket.org/geekman/mdns-repeater/get/${REV}.tar.gz -> ${PN}-${REV}.tar.gz"
-S="${WORKDIR}/geekman-mdns-repeater-${REV}"
-
-src_configure() {
-	tc-export CC
-}
-
-src_compile() {
-	emake HGVERSION="${REV}"
-}
-
-src_install() {
-	dobin "${PN}"
-}
diff --git a/net-dns/mdns-repeater/metadata.xml b/net-dns/mdns-repeater/metadata.xml
index 1306680b2568..4a16a9ff3c07 100644
--- a/net-dns/mdns-repeater/metadata.xml
+++ b/net-dns/mdns-repeater/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">geekman/mdns-repeater</remote-id>
+		<remote-id type="github">kennylevinsen/mdns-repeater</remote-id>
 	</upstream>
 </pkgmetadata>