gentoo resync : 28.04.2019

3 files changed, 104 insertions, 2 deletions

diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index e296d3d0d232..eae9987ac8b4 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,5 +1,7 @@
 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
-EBUILD mosquitto-1.5.6.ebuild 2525 BLAKE2B 5e25347f3f4b94b8406e0cb12209636d2868e64214fc1997785e02ace2e3236b85455440b668828370eb39c5d61f960679e1b3c7b6307fe526cddf28b6f1f59d SHA512 9272501a9c9be27d12d531804fea7ef889c04a7407f8611137b01ff38874e9794278aa5f18e9d8ed7dc3585dcf7244f9f3c4c5929c19c853b07d2be09022534c
+DIST mosquitto-1.5.8.tar.gz 442834 BLAKE2B be5a7c2e7d28da0101fdfac9e5b0d7499abb71b464df3da11637c141947c75631e9c8952b219d20d598a156d0f8d5e86151c65ee4b55443dcef9c30eff49e3b3 SHA512 5cf2ae59077878be2784cc83fefe00fa3ff904646711545be519fc48557319c56dc7c15682fffc0dc42c530cdf59f550f25da9eec50a1a7deb222aa11bb669d3
+EBUILD mosquitto-1.5.6.ebuild 2506 BLAKE2B ca60820682eb14f4bf9e70413748ca19c8da6d160bcd67641f52a2d39587275203d36d22e893267a10fa417b5ffb8a5a165e76432ecb1fe78c0bb85390d92fe3 SHA512 3200b2f1d264e1a1812f9ba3efb813aea95f4d70065abb178621c644bc44796538aac05f997822916458e6ad664a3dbbe68e8693b2e4856d6b5834139b870dff
+EBUILD mosquitto-1.5.8.ebuild 2406 BLAKE2B 318c6b1ad9a6f51fa4a40f0900bb699ab9312f43e6e5a8021ae9fcff1e8cc3fc7f5c52713f3959677824b4f0baaff02e7974c4922f0e1ab51e4eb21729a8f899 SHA512 6186bec3ccc77e6da1e9072df735f8824c3756799274277980343cc624bd8a84f8c8cff23aa9f9a2fc98282ad56a7d3c7d8b1747cab60fce2e6522989ccc7a3a
 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
index 7b6a16c2daf8..6f319fe32b3b 100644
--- a/app-misc/mosquitto/mosquitto-1.5.6.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.5.6.ebuild
@@ -16,7 +16,6 @@ KEYWORDS="amd64 arm x86"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 
 REQUIRED_USE="
-	libressl? ( ssl )
 	test? ( bridge )
 "
 
diff --git a/app-misc/mosquitto/mosquitto-1.5.8.ebuild b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
new file mode 100644
index 000000000000..739d887f2e64
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.8.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 systemd toolchain-funcs user
+
+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 +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="srv? ( net-dns/c-ares )
+	ssl? ( dev-libs/openssl:0= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+
+DEPEND="${PYTHON_DEPS}
+	${RDEPEND}
+	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"
+		dodoc -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
+}