gentoo resync : 30.04.2018

15 files changed, 116 insertions, 308 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 091098009ede..d427ce9d7064 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cwiid/Manifest b/app-misc/cwiid/Manifest
deleted file mode 100644
index 245f9ea5ef36..000000000000
--- a/app-misc/cwiid/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 60-cwiid.rules 91 BLAKE2B 7212a47c261faebfd593e84fa9fac9358426f8ac2c4e95f7a215f29fb2449e8b232c8b20f7d5b5a785b728ab84abfc956b9b3cc2657a5467bb961e00c98eb437 SHA512 c663b8912d0f1651c490f00ce725452f9fe1689b6bf97859b2d79206dedee8d77e4eb21e675b8db3c2e40108d6e41196eeaba145a80d4ffdacfa44809ef7d871
-AUX cwiid-20110107-underlinking.patch 733 BLAKE2B 39bbdbce890ff0afdbe97b132f9c1fc868261703e995a734d32dfe6b1d258e58223713d7b448fdc05e5c5f8dc01885639d47f9dcf1e04011d5956ecc65e29009 SHA512 c263474fb26126219163debf90a9a2a0990eae8cbd2942cf9301c9fba6cc50a849c002da7c004a0ccee9ac2f18b724d8d0da1c9402539388409fe3a59b27e996
-DIST cwiid-20110107.tar.bz2 81184 BLAKE2B 272ca126f82a25fa1b491fbc5abe11ba76e1f99b9390de2243ed49fbe4d70da6a424e9e34c9f35021d1ff9321b878e0360ec0503874923de605a8e8c99e6d1a2 SHA512 b9cde716f7bc67697cf6fafd62f324cf343afc734845d8c3f608e0ad9abe245570e59dbda10a0d3a50b0439a8cc8db0bcf71d592c6d4b733c3955426a97cb46f
-EBUILD cwiid-20110107-r2.ebuild 1712 BLAKE2B d02b0f1a6a2ea47449e5605d6a9ceea129df22e37209f8aac296fe75afb15a0619f824b45f6d4e392dbd344eeebd9e08fed0b282019c06d61e5e0f061d2fe8fd SHA512 0c221be5bbebb55ff08a3313749157abc0549331d72d8c3e0cb636f94bcc76b082c4f1be1ef6b19116deaa7962e8a65945de05f848917c9596e72d283195e011
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/cwiid/cwiid-20110107-r2.ebuild b/app-misc/cwiid/cwiid-20110107-r2.ebuild
deleted file mode 100644
index 453aeb73acbd..000000000000
--- a/app-misc/cwiid/cwiid-20110107-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/abstrakraft/cwiid.git"
-	SRC_URI=""
-	KEYWORDS=""
-	inherit git
-else
-	# git archive --prefix=cwiid-$(date +%Y%m%d)/ \
-	#	--format=tar HEAD | bzip2 > cwiid-$(date +%Y%m%d).tar.bz2
-	SRC_URI="https://dev.gentoo.org/~lxnay/cwiid/cwiid-${PV}.tar.bz2"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-mod autotools python-single-r1
-
-DESCRIPTION="Library, input driver, and utilities for the Nintendo Wiimote"
-HOMEPAGE="http://abstrakraft.org/cwiid"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-
-DEPEND="virtual/awk
-	sys-apps/sed
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} )"
-
-RDEPEND="net-wireless/bluez
-	x11-libs/gtk+:2
-	python? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	CONFIG_CHECK="~BT_L2CAP ~INPUT_UINPUT"
-	linux-mod_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Fix broken build system
-	sed -i "s:--disable-ldconfig:--without-ldconfig:g" "${S}"/configure.ac || die
-	sed -i "s:enable_ldconfig:with_ldconfig:g" "${S}"/configure.ac || die
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-}
-src_configure() {
-	econf $(use_with python) --without-ldconfig || die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}/60-${PN}.rules"
-}
diff --git a/app-misc/cwiid/files/60-cwiid.rules b/app-misc/cwiid/files/60-cwiid.rules
deleted file mode 100644
index 80689062a871..000000000000
--- a/app-misc/cwiid/files/60-cwiid.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# make possible to use cwiid device as user
-KERNEL=="uinput", MODE="0660", GROUP="plugdev"
diff --git a/app-misc/cwiid/files/cwiid-20110107-underlinking.patch b/app-misc/cwiid/files/cwiid-20110107-underlinking.patch
deleted file mode 100644
index b60f379fc9cc..000000000000
--- a/app-misc/cwiid/files/cwiid-20110107-underlinking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Aug 14 23:04:03 UTC 2012
-Subject: build system
-
-fix build for linkers that don't permit underlinking
-
---- configure.ac
-+++ configure.ac
-@@ -69,6 +69,8 @@
- 	AC_MSG_ERROR([linux/uinput.h]),
- 	[#include <linux/input.h>])
- 
-+PKG_CHECK_MODULES([BLUETOOTH], [bluez])
-+
- AC_ISC_POSIX
- 
- AC_ARG_WITH(cwiid-config-dir,AC_HELP_STRING([--with-cwiid-config-dir],
---- wmdemo/Makefile.in
-+++ wmdemo/Makefile.in
-@@ -6,9 +6,9 @@
- 
- SOURCES = wmdemo.c
- 
--CFLAGS += -I@top_builddir@/libcwiid
-+CFLAGS += -I@top_builddir@/libcwiid @BLUETOOTH_CFLAGS@
- LDFLAGS += -L@top_builddir@/libcwiid
--LDLIBS += -lcwiid
-+LDLIBS += -lcwiid @BLUETOOTH_LIBS@
- INST_DIR = @bindir@
- 
- include $(COMMON)/include/app.mak
diff --git a/app-misc/cwiid/metadata.xml b/app-misc/cwiid/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/app-misc/cwiid/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 105754094817..a44329b102e0 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -3,9 +3,7 @@ AUX geoclue-0.12.0_p20110307-use-flag.patch 2571 BLAKE2B 17c6d6009bc8bc089c2fa88
 AUX geoclue-0.12.99-gpsd.patch 2073 BLAKE2B 499774d91864ada9ef29a2154e17bed7e143f0e13fb30a6e9d8231f6f6e7fac9b35f99b042aa05aade1ad139dd9d393951b16dee10c3bb104aa325fa418cf24c SHA512 9a5280af319cea99567fbbaf8174f11de71f9dbbeb146c4ad42a19df1d84f7573c9cd72560b7185065e5b8507770f77fa3cc06b3e45e0a56fdf3d3e5b717f0bc
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
 DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2
-DIST geoclue-2.4.7.tar.xz 368472 BLAKE2B c083f0694a90292b7b0834075e4fe15d29f07cc04157ad339bb2c93e0ca17a04916713c9284bf35e9dccbd8b3d66de1d0d88fb378aa5f33dd59ab57bfc72f570 SHA512 472cf923abfd40dee296eee2e6888c47f273ad709e1bdcce534bd794cf9f7073ceabd6addf918277e10498e094af5a6e9539b5cf24171577e78bc3b0b2d17b72
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
-EBUILD geoclue-2.4.7.ebuild 1575 BLAKE2B c11bb62da829bff6334da9dee337b28aa6285268a17f7426ccc92c85cf5bb610140428d110257714ee1dca8c6026e863e626f677cdd8923c1e45aec091d84b05 SHA512 1f7a3dc12b1904cdcbe8dbdd01a4bd66d24e0ff0892351208aac3b6985225c4185a87aae5828a9fb69730add7b3efab7ab6545fa3020e72f383a01454257da38
 EBUILD geoclue-2.4.8.ebuild 1577 BLAKE2B 2a1c4e4dbc825798a172a90cc1ed1ecea0b92b130bf03587a3b24564cb514df2289516420d9924def46322041849ef7fc1e6a28f7df3813cf88d7550d9b5f873 SHA512 3ac7765ba17df00d3864eb0c8fab5d21c43a9974d85e238789c461a7f267a2e65757d5469c59cb3f593aaacc6ab4907c92e60d63765e4b73237832d09d990658
 MISC metadata.xml 1252 BLAKE2B 19af081815ecc62a145bd3839b4822498c5f689665adf6cc46b7ff7e1615d5d22ce54d2bc551a2f619f9d7ebc020400e795ec5962295a88288546a7ed24af492 SHA512 809d9b3afe58bf9e00bc826dbc7e2253461426084f8290d2b53ff0785666ec7b3626997b453a36a8eefcbae220f2f273008c3c51a7071a13da54e4e897d5c5ae
diff --git a/app-misc/geoclue/geoclue-2.4.7.ebuild b/app-misc/geoclue/geoclue-2.4.7.ebuild
deleted file mode 100644
index a14ed58d9f3b..000000000000
--- a/app-misc/geoclue/geoclue-2.4.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2 systemd user versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="+introspection +modemmanager zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.14
-	>=net-libs/libsoup-2.42:2.4
-	sys-apps/dbus
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	modemmanager? ( >=net-misc/modemmanager-1 )
-	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
-	!<sci-geosciences/geocode-glib-3.10.0
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug only affects CFLAGS
-	gnome2_src_configure \
-		--enable-backend \
-		--with-dbus-service-user=geoclue \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable introspection) \
-		$(use_enable modemmanager 3g-source) \
-		$(use_enable modemmanager cdma-source) \
-		$(use_enable modemmanager modem-gps-source) \
-		$(use_enable zeroconf nmea-source)
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-	gnome2_pkg_preinst
-}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index a2b57da8f043..b66100fde2a3 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,9 +1,11 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
+AUX mosquitto-1.4.15-conditional-tests.patch 371 BLAKE2B 4e96752a6ef489a6dec24cb02381f11ec38f3440c13f99ee2adee2aa7995b591c341ff050793960d81e73849147e809f9cd98a29c035038ed1f3b2047bd7431f SHA512 a970740b0cabd34f2532fbd27037546c125337943b848c4489ed44c3e3408e802d223b6f2c8a0144c43ccf5d7ae1270f0c4bb23833827492994d7bfe569639de
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 DIST mosquitto-1.4.15.tar.gz 368961 BLAKE2B 28bfab7d41d9e057ba8b52e0c428967ecc5d0c25a3d73dca420ae883c2b462ee02da1eeb9c22f4d392f0ccf62224acab6f24d4a0798a594f4b9f90c907fa1495 SHA512 36b06547553cf28af3ca9b728c42fc27e849c4ae84d7964572d430233ab26e2b59eee2a215ac23ddf2d0bef419e7c70e64e2a22c397fadb3e0677314d03f1100
 EBUILD mosquitto-1.4.14-r1.ebuild 2462 BLAKE2B e747f7751b56d1f93a460985e19555fd7fdb1bf08540eec7ab2107ad8165797de2363f0383eeaab4b2bc5011d830022f63ec5baf73804a1f0492c03a7632de3b SHA512 59f100a47c98636c82f4ca5b4d2edb0c1e6399ef25d95dd62f576f9694b11fef32d01dc58c63d69d5aa4bd119dd467199f3d49d19760be9b8220ff7420749c0c
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
+EBUILD mosquitto-1.4.15-r2.ebuild 2463 BLAKE2B 3e6c1a3ab075a62675e3f9158a665f65238c8a35c72bd7e1a4b5517f756907e5769bc4ea46b6f5c1cff2a74f3983caa3945fb6a0df3203d76ae182764d43f9ec SHA512 6cc77d34fd71a288db14c8f2b74ead1602953d8c5c96fba9c6b742fa74ec0c356ded19ff0d0d6436c1f7c8b8bf42c239568c8ed7c59fbf07b2e525dcc47c2b49
 EBUILD mosquitto-1.4.15.ebuild 2366 BLAKE2B 6df167983ebe736631cc55fb47b9487bd456928e17d149653e7f5ec333ab874f41e4371ee882ee16a984fc055146ddb1fe7727ff71f5917fd1e3c0dd50db76f4 SHA512 609584b242bbabca2214fa6027f948ce6c237fe9e6be43acb38625abdf83e5c898c9158244612b5a4201a18e99b0fd78b987b71d54dbbf6a0a62f4a60ce4bb5c
 MISC metadata.xml 656 BLAKE2B 58ecef974e662c6dccf267ba8732116010a3db7679d6ee3e163cd351073a210f0bb06e5098945564f048353caf4ed7fe73d69bc96cce42c56ba298073fe95384 SHA512 2034ecb6ff73024cd905d275da23b27568d897dd616ca70a2485922667a74d4ac1d6df11b0a7a413bc8d595962697959e4cbe13c8934e8b3333c6a4e290d657f
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
new file mode 100644
index 000000000000..1642597c5620
--- /dev/null
+++ b/app-misc/mosquitto/files/mosquitto-1.4.15-conditional-tests.patch
@@ -0,0 +1,12 @@
+--- a/test/broker/c/Makefile	2016-02-14 14:36:55.000000000 +0000
++++ b/test/broker/c/Makefile	2016-05-05 09:40:31.440608209 +0100
+@@ -13,7 +13,9 @@
+ 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
+ 
+ 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
++ifeq ($(WITH_BRIDGE),yes)
+ 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
++endif
+ 
+ 
+ reallyclean : clean
diff --git a/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
new file mode 100644
index 000000000000..48165a4db6f3
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.4.15-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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 +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	srv? ( net-dns/c-ares )
+	websockets? ( net-libs/libwebsockets )"
+
+PATCHES=( "${FILESDIR}/${P}-conditional-tests.patch" )
+
+_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
+	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/timestamp/Manifest b/app-misc/timestamp/Manifest
index 181a37307db6..c3384d5d8a87 100644
--- a/app-misc/timestamp/Manifest
+++ b/app-misc/timestamp/Manifest
@@ -1,4 +1,3 @@
 DIST timestamp-1.1.tar.gz 61578 BLAKE2B dd33dc27a7353f25ffaeb01cc2fb6af25288e03021b097783fa2a659bd8abe0fd3cff1e9dad7858f16529253e1573bec7f1883ab6f37a462f51374bae591f3dc SHA512 38952f40938e45e178e310dfc3b974c1974485614f4da7617790642f8594a4583e97ec056cb2f4fe2761d86d04595bc0d387312803bf95add929d48863fd6b9b
 EBUILD timestamp-1.1-r1.ebuild 484 BLAKE2B 1076e54410064f16fc82ada6daf163229ca03645ae1ae82d70a7974a3afdc00cf52349e2659d7e39a4d15eadc322d3c678c8615cc5704f9deccc3714eb52a1bf SHA512 94eebdcfca66816fb907fdbb10755283178495270e2b6e867a9800a15d03826d7ac1e6d127f5c66a233d5bcdde9fa8e95d1702d24a5043fbc94b33e2e7f7bf05
-EBUILD timestamp-1.1.ebuild 503 BLAKE2B 15251f7614236e3a4ee0640ad84fc9eb62d621d169d423c4ae6121702b3015c9cefb6b358ea318c8004f273a68c8d5e7db6fcdc7da66b36061c3c7fd7d37740c SHA512 7bd92b0ecf3a40cc7e149ba237b05f6afaaca5a52e4f933e5483a2470a2e0c2b937ddd15069660592f183da0e5d4318ff544b2b70817c2f26408c29cd8883dea
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/timestamp/timestamp-1.1.ebuild b/app-misc/timestamp/timestamp-1.1.ebuild
deleted file mode 100644
index 124854a3311f..000000000000
--- a/app-misc/timestamp/timestamp-1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="A text filtering pipe that marks each line with a timestamp"
-HOMEPAGE="http://math.smsu.edu/~erik/software.php?id=95"
-SRC_URI="http://math.smsu.edu/~erik/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="!sys-apps/moreutils"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog || die
-}
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index f884052a2f70..68e6948580b4 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,6 +1,4 @@
 AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
-DIST workrave-1.10.16.tar.gz 6375438 BLAKE2B 35d78a133b275e1c0adc8c21ceb91412f38667b9dde2ed9e08a8b01cde7b4d35780d317057d000bfa39ae0d5da4639f2e2252b1812acd66a3b81f7c1d1995dfb SHA512 f768c46a5b7dfbaca2984fabff92e64d5fd14f3b4e4d018f5a1cf46a87fbf7ec7fbaec9b660e899f7064a93338224d159b75052ed8e532ecaf507d2f249732f2
 DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
-EBUILD workrave-1.10.16.ebuild 2788 BLAKE2B ec945fe3e90ef1e8d99ff5dd52533ee33b4f2d01c33444ece2fbafc1a1b6cb225bd22c5c8f1f17aa0eabd7a654e7372a6aef42691ee531d4d88279c42d628e93 SHA512 783fd8d7cb0291d0339931c1c9c8227fe681bca4702b77f1f95d34fb4810eedc0c28f76ae1c00267227a9d4fd6b642ecae009b9284257f1b81e01487630f4358
 EBUILD workrave-1.10.20.ebuild 2789 BLAKE2B a43fd847b0075845b3cd44847e02ed02b4e069c4b3b7ddfa662963ba48848ae601fae4cb4d77bc119b1c227e58eb3daf1aebb7d4c9f29ed104621a6b772fb951 SHA512 de4678548aea26e576e2ec82e3a016209210f32897b47250e7ee411f8c32dac2803f1c1958c34501a0bb7e670d0c068f19bf3ff55ecd81ed022968ba071bd9e0
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.16.ebuild b/app-misc/workrave/workrave-1.10.16.ebuild
deleted file mode 100644
index c39e0a3560a0..000000000000
--- a/app-misc/workrave/workrave-1.10.16.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools gnome2 python-single-r1 versionator vcs-snapshot
-
-DESCRIPTION="Helpful utility to attack Repetitive Strain Injury (RSI)"
-HOMEPAGE="http://www.workrave.org/"
-MY_PV=$(replace_all_version_separators '_')
-SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-# dbus support looks to be used only for trying to use panel applets on gnome3!
-IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
-REQUIRED_USE="ayatana? ( introspection ) ${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.0:2
-	>=x11-libs/gtk+-3.0:3[introspection?,X]
-	>=dev-cpp/gtkmm-3.0.0:3.0
-	>=dev-cpp/glibmm-2.28.0:2
-	>=dev-libs/libsigc++-2.2.4.2:2
-	ayatana? (
-		>=dev-libs/libdbusmenu-0.4[gtk3,introspection]
-		>=dev-libs/libindicator-0.4:3 )
-	gnome? ( >=gnome-base/gnome-shell-3.6.2 )
-	gstreamer? (
-		media-libs/gstreamer:1.0[introspection?]
-		media-libs/gst-plugins-base:1.0[introspection?]
-		media-plugins/gst-plugins-meta:1.0 )
-	introspection? ( dev-libs/gobject-introspection:= )
-	mate? ( mate-base/mate-applets )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
-	xfce? (
-		>=x11-libs/gtk+-2.6.0:2[introspection?]
-		>=xfce-base/xfce4-panel-4.4 )
-	x11-libs/libXScrnSaver
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXt
-	x11-libs/libXmu
-	${PYTHON_DEPS}
-"
-#        dbus? (
-#                >=sys-apps/dbus-1.2
-#                dev-libs/dbus-glib )
-
-DEPEND="${RDEPEND}
-	dev-python/cheetah
-	>=dev-util/intltool-0.40.0
-	sys-devel/autoconf-archive
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/recordproto
-	virtual/pkgconfig
-	doc? (
-		app-text/docbook-sgml-utils
-		app-text/xmlto )
-	nls? ( >=sys-devel/gettext-0.17 )
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_prepare() {
-	# Fix gstreamer slot automagic dependency, bug #563584
-	# http://issues.workrave.org/show_bug.cgi?id=1179
-	eapply "${FILESDIR}"/${PN}-1.10.6-automagic-gstreamer.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# gnet ("distribution") is dead for ages and other distributions stopped
-	# relying on it for such time too.
-	gnome2_src_configure \
-		--disable-dbus \
-		--disable-distribution \
-		--enable-exercises \
-		--disable-experimental \
-		--disable-gnome2 \
-		--disable-static \
-		--disable-xml \
-		$(use_enable ayatana indicator) \
-		$(use_enable doc manual) \
-		$(use_enable gnome gnome3) \
-		$(use_enable gstreamer) \
-		$(use_enable introspection) \
-		$(use_enable mate) \
-		$(use_enable nls) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable test tests) \
-		$(use_enable xfce)
-}