gentoo resync : 03.11.2019

3 files changed, 2 insertions, 110 deletions

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 3cf503a91a16..0b06e348eee1 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,7 +1,5 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
-DIST mosquitto-1.5.6.tar.gz 439402 BLAKE2B 7d887d7d2e02d9891613d441c76705c40744cd8c7acae330648e5a00560b4ba1fbc28b92ac84bf85d423c84de875c5309f364d04fca72516ab2276fe42512b0c SHA512 99bd935f93ae25f0c7992870780cce4748b35ffd58fd0d39e20ee69f34c28d3eac289cf0c7dec078dbdced3bda12da4569d4b5e84ebdaa5514640f331ca3238b
 DIST mosquitto-1.6.7.tar.gz 591062 BLAKE2B a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170 SHA512 0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9
-EBUILD mosquitto-1.5.6.ebuild 2506 BLAKE2B ca60820682eb14f4bf9e70413748ca19c8da6d160bcd67641f52a2d39587275203d36d22e893267a10fa417b5ffb8a5a165e76432ecb1fe78c0bb85390d92fe3 SHA512 3200b2f1d264e1a1812f9ba3efb813aea95f4d70065abb178621c644bc44796538aac05f997822916458e6ad664a3dbbe68e8693b2e4856d6b5834139b870dff
-EBUILD mosquitto-1.6.7.ebuild 2746 BLAKE2B 40fe2db381ac94dfc4c329605b8ff5814280b7fd056ae8d1e067d57d5759658b53137d521877171ca14cfa103629b56b5504115e03790e058f4a94aea2e31a58 SHA512 17ca86ab1c65079ef5296561ab7911b8ac5243b09a3c0c1168c95145ced1afbc258cf8759a04e0a85e69068b278ac3306396118ecf1442115024e9492a8814b3
+EBUILD mosquitto-1.6.7.ebuild 2745 BLAKE2B b8ec626d8a25f7666c8f0645835d2eff888899f7446a90e2aae404d94693928f4ad191136360e014f67e5f4542ce847ff70ead4e0696a05109952add1e18337d SHA512 2908088635ea7966f7d02dfbacd77419c1ebca713876c3488766218897bb38f28e870b2cbdeb5ecf144f585b7a5679399f27cf5e3100e4d3a14cdf5dec0277eb
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.5.6.ebuild b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
deleted file mode 100644
index 6f319fe32b3b..000000000000
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit systemd user toolchain-funcs python-any-r1
-
-DESCRIPTION="An Open Source MQTT v3 Broker"
-HOMEPAGE="https://mosquitto.org/"
-SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
-
-REQUIRED_USE="
-	test? ( bridge )
-"
-
-RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
-	srv? ( net-dns/c-ares )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	websockets? ( net-libs/libwebsockets )"
-
-_emake() {
-	LIBDIR=$(get_libdir)
-	emake \
-		CC="$(tc-getCC)" \
-		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)" \
-		"$@"
-}
-
-pkg_setup() {
-	enewgroup mosquitto
-	enewuser mosquitto -1 -1 -1 mosquitto
-}
-
-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
-
-	python_setup
-	rm test/{broker,lib}/ptest.py || die
-	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
-	systemd_dounit "${FILESDIR}/mosquitto.service"
-
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto "/usr/share/doc/${PF}"
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The Python module has been moved out of mosquitto."
-		elog "See https://mosquitto.org/documentation/python/"
-	else
-		elog "To start the mosquitto daemon at boot, add it to the default runlevel with:"
-		elog ""
-		elog "    rc-update add mosquitto default"
-		elog "    or"
-		elog "    systemctl enable mosquitto"
-	fi
-}
diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
index 7a43de2971cf..374107d9db97 100644
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="test? ( bridge )"