gentoo resync : 21.08.2021

4 files changed, 36 insertions, 127 deletions

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 2ce0da6a04d4..92a3c05cc035 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,9 +1,8 @@
+AUX 2.0.11-Fix-installation-using-WITH_TLS-no.patch 949 BLAKE2B c85a92329e737d5322e4c888c0f89ccfe1a7a244f543422e441843f0dced56b9f6470484734471ea7e8d8092508e7e542bb26c1f50c632dd63789d8ed46b1c55 SHA512 08abbf563f920cd2c0dee2e340d45bfb5c2874e197a01faac6af68668f0302ef209e534dd946f01012e57a70ed22cf53b1902cf02b9ce1d2c61890da79ec0ac4
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.6.15.tar.gz 620117 BLAKE2B 0107ed0af902b84c73b857ccd97dfe96b1c7ed8604b843ad40f62d3f1246ded4ef1691158311ac9a672ca331f569d13547165f3a0386c77e94ddc13c8a9e3e00 SHA512 30fa2e8a15b87a33d6c8fc3a1f5d45d8e15d284fade116ac5b7bc8722609d565bed22ac592c303fc74352e3272067b2b0c8da463abffc6490cf959ce177329f3
-DIST mosquitto-2.0.10.tar.gz 759106 BLAKE2B 9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c SHA512 c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
 DIST mosquitto-2.0.11.tar.gz 760325 BLAKE2B adde701bb87ec8071eaaf74fca37f81c4eae97bf98de0fe471f1dfbfb64ccda15b34611b0ffc3d2099a37994151363ad5c717bfa7695fabc1a4927ebd14ae66e SHA512 d0c7c52cb76c4711e54f841217529326d682c4decfc7a1bc96d872904e68df444ca3918fab7ba041b62f7b5420c89c631227b69a8eec51fd2e2dd480d8244710
 EBUILD mosquitto-1.6.15.ebuild 2828 BLAKE2B 6f7ebe1099d6a6a606bfebf85afec716951aaaff24a3a2e01d7edcdb2f7a4da15496f47aee5282aab37d6b6a663c980217f79aecffd056d4131a1878911c2f3e SHA512 d4bf9db26020f8bd1eb10c8be04fc7201a8afdbfb9e4c52c40d532aaae8e6b3fa3c3636e67631942d9aa02d75adb82314955aa544b5d33fb92b40d4646a87877
-EBUILD mosquitto-2.0.10.ebuild 3169 BLAKE2B af88ca3d4c0292367c5c1ee53789b879875bf1652328affba734cadfe0891531281afb55e82a83d107bf5ad3eff1a39338d0f67f010574b3980348265dcb74c3 SHA512 e36f9dcb75f7d7bfc83adb0f1b8da82419e3f4e2184ef894adb155f4e965c5b470b0e2269aad4f1ece829ca27f4d8579ad96647946d1c865aae4e8f7abd5cc70
-EBUILD mosquitto-2.0.11.ebuild 3173 BLAKE2B d0cd87200760b8c529cfa6b38bb171a60dc688cb51d9722f891b9cd116c4fa7ddd662770eb7ece4fa462a3ab3447571d95204aedef539ec7370bca93a9183134 SHA512 d089782cd6886edf8f7cf685adb755b62156f92fdc877c83e66607c2ed98ddfda8b2955c3ee88ba91e8f28d187fefb8a67b7567890186dfda7e9043273a0cce8
+EBUILD mosquitto-2.0.11.ebuild 3245 BLAKE2B 2115f6c8466c39726a0cd09dd7c30df93844dd8535952d41735a9161c45039fe464eb7aad021449e805f6b4457ae49f699a55de25dd213aaa68647caee66aab0 SHA512 fc302efff796ef209f81a859a829cd0ef884c805db1943836c04082a91a6c98813e49f64b2b5961560caac31af1ba88679f62d0e004dc2f37cea35bf082c9928
 MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb
diff --git a/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
new file mode 100644
index 000000000000..0a08e2997f0b
--- /dev/null
+++ b/app-misc/mosquitto/files/2.0.11-Fix-installation-using-WITH_TLS-no.patch
@@ -0,0 +1,29 @@
+From 342aa0ad1a645f468a24266f402d92541d4fd58a Mon Sep 17 00:00:00 2001
+From: Roger Light <roger@atchoo.org>
+Date: Fri, 20 Aug 2021 23:49:59 +0100
+Subject: [PATCH] Fix installation using WITH_TLS=no.
+
+Closes #2281. Thanks to Matt Turner.
+---
+ ChangeLog.txt                  | 3 +++
+ apps/mosquitto_passwd/Makefile | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/apps/mosquitto_passwd/Makefile b/apps/mosquitto_passwd/Makefile
+index 3238cf3e..1fbf5e12 100644
+--- a/apps/mosquitto_passwd/Makefile
++++ b/apps/mosquitto_passwd/Makefile
+@@ -37,8 +37,10 @@ password_mosq.o : ../../src/password_mosq.c ../../src/password_mosq.h
+ 	${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
+ 
+ install : all
++ifeq ($(WITH_TLS),yes)
+ 	$(INSTALL) -d "${DESTDIR}$(prefix)/bin"
+ 	$(INSTALL) ${STRIP_OPTS} mosquitto_passwd "${DESTDIR}${prefix}/bin/mosquitto_passwd"
++endif
+ 
+ uninstall :
+ 	-rm -f "${DESTDIR}${prefix}/bin/mosquitto_passwd"
+-- 
+2.31.1
+
diff --git a/app-misc/mosquitto/mosquitto-2.0.10.ebuild b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
deleted file mode 100644
index efe0bf464474..000000000000
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
-IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="test? ( bridge )"
-
-RDEPEND="
-	acct-user/mosquitto
-	acct-group/mosquitto
-	dev-libs/cJSON:=
-	srv? ( net-dns/c-ares:= )
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-DEPEND="${PYTHON_DEPS}
-	${RDEPEND}
-	test? ( dev-util/cunit )
-	websockets? ( net-libs/libwebsockets[lejp] )"
-
-_emake() {
-	local LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		CLIENT_LDFLAGS="${LDFLAGS}" \
-		LIB_SUFFIX="${LIBDIR:3}" \
-		WITH_BRIDGE="$(usex bridge)" \
-		WITH_PERSISTENCE="$(usex persistence)" \
-		WITH_SRV="$(usex srv)" \
-		WITH_TLS="$(usex ssl)" \
-		WITH_WEBSOCKETS="$(usex websockets)" \
-		WITH_WRAP="$(usex tcpd)" \
-		"$@"
-}
-
-src_prepare() {
-	default
-	if use persistence; then
-		sed -i -e "/^#autosave_interval/s|^#||" \
-			-e "s|^#persistence false$|persistence true|" \
-			-e "/^#persistence_file/s|^#||" \
-			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
-			mosquitto.conf || die
-	fi
-
-	# Remove prestripping
-	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
-		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
-
-	# Remove failing tests
-	sed -i -e '/02-subpub-qos1-bad-pubcomp.py/d' \
-		-e '/02-subpub-qos1-bad-pubrec.py/d' \
-		-e '/02-subpub-qos2-bad-puback-1.py/d' \
-		-e '/02-subpub-qos2-bad-puback-2.py/d' \
-		-e '/02-subpub-qos2-bad-pubcomp.py/d' \
-		test/broker/Makefile || die
-	sed -i -e '/02-subscribe-qos1-async2.test/d' \
-		test/lib/Makefile || die
-
-	# Extend test timeout to prevent spurious failures
-	sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
-		test/client/test.sh || die
-
-	python_setup
-	python_fix_shebang test
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake test
-}
-
-src_install() {
-	_emake DESTDIR="${D}" prefix=/usr install
-	keepdir /var/lib/mosquitto
-	fowners mosquitto:mosquitto /var/lib/mosquitto
-	dodoc README.md CONTRIBUTING.md ChangeLog.txt
-	doinitd "${FILESDIR}"/mosquitto
-	insinto /etc/mosquitto
-	doins mosquitto.conf
-	insinto /usr/share/mosquitto
-	doins misc/letsencrypt/mosquitto-copy.sh
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if [[ $(ver_cut 1 "$v") -lt 2 ]]; then
-			elog
-			elog "Please read the migration guide at:"
-			elog "https://mosquitto.org/documentation/migrating-to-2-0/"
-			elog
-			elog "If you use Lets Encrypt TLS certificates, take note of"
-			elog "the changes required to run the daemon as the unprivileged"
-			elog "mosquitto user. The mosquitto-copy.sh script has been"
-			elog "installed to /usr/share/mosquitto/ for your convenience."
-			elog
-		fi
-	done
-}
diff --git a/app-misc/mosquitto/mosquitto-2.0.11.ebuild b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
index 7e129f60e2c1..381c55f77b19 100644
--- a/app-misc/mosquitto/mosquitto-2.0.11.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 
@@ -33,6 +33,10 @@ DEPEND="${PYTHON_DEPS}
 	test? ( dev-util/cunit )
 	websockets? ( net-libs/libwebsockets[lejp] )"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-Fix-installation-using-WITH_TLS-no.patch
+)
+
 _emake() {
 	local LIBDIR=$(get_libdir)
 	emake \