gentoo resync : 04.07.2020

22 files changed, 216 insertions, 155 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d5f96527abc3..f0a3a5906c0b 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 380a28fedb6b..0b173fd1f8ee 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,3 +1,3 @@
 DIST byobu_5.130.orig.tar.gz 761162 BLAKE2B 8ad45f3f8cba9435638aced30022e67e927288ac7f7bcea7d464d248a3fa0edddf4716bf782d790b8ea75d249e86f19acb76aa706c875f525f1b3b1ae9c47321 SHA512 dae3d0de3f1a65e5f3a647c1135ecf89261bf2518fea44bb49e00109ba5e1e5a8939206bb85d97f45fa01482438b3bfcb6f9ddd03dbaa1a8caca807f95b279cf
-EBUILD byobu-5.130-r1.ebuild 990 BLAKE2B 7ee65e526b9a7d20bd5634e4c5c54342821ceed51c28040759875a04192b1f0c6218d4a708dc0e667856e6059febcb5db18d68945209eabaeaf0c95a5dd9785c SHA512 2df7ad9733bc9f12a3e895581c4630e7610b5671c8fe3cf5073e6853e689e206809e5f80fb2373863c32f91dc363baec63502fa110427580770d76999e3d1b49
+EBUILD byobu-5.130-r1.ebuild 992 BLAKE2B 87f095dbecf5f1a47e21b583e38c31807f73f98f4db939d3f35053cb8ca623a3014927123a88b6302d9d2246035cab4c5977d9f682379b3ade1c244d6445fd51 SHA512 049f7a3e3c4ec7c6dfde3136e0f1a51e9cd3a94dc3a68fb3281c810e928f43d9301e94a997924e95f76ba23c305b00ee57b2878f6fee0aef3a4bd46aff69e401
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.130-r1.ebuild b/app-misc/byobu/byobu-5.130-r1.ebuild
index 9b21e5cd6582..3d2ddef4731a 100644
--- a/app-misc/byobu/byobu-5.130-r1.ebuild
+++ b/app-misc/byobu/byobu-5.130-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit python-single-r1
 
 DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
+HOMEPAGE="https://byobu.org"
 SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/app-misc/cbrpager/Manifest b/app-misc/cbrpager/Manifest
deleted file mode 100644
index fd2252789437..000000000000
--- a/app-misc/cbrpager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cbrpager-0.9.22.tar.gz 146216 BLAKE2B 3396328ea7e017e0cf13722cc8545ce75ccf2cbc0446d1fcebefa02527dc32e3403ed29e456507495ebc3bcd94ce6a42b9b9f574b581952d94bee1efbc2a1ef9 SHA512 dc4bcf14528e6708a3ff0fc3b7e3163dfb9d6063f1cf40545b4f804915afedd9db4cd461834de7ee92fcd4b2f302b7f2ed0d9ae022e220dd8e6c95ccabea34d5
-EBUILD cbrpager-0.9.22.ebuild 580 BLAKE2B 61f96297dd8ff69b70398e19bf3821ead3b66769a68690bea7cf7ba1fb738b926e604f0e6de9acb0fbee10d83179af1cff7adb93031c6874fdf21e634252b045 SHA512 3c62931298b02360c2fc69d0603c45ad27acb99a82ad48b20d523ad895e4ce2d4a71e88c45abd42a7b5b8c6f88dcf8e4a2673314e7f4bf21db934a84a0baa519
-MISC metadata.xml 245 BLAKE2B 8cfa30b68f8de5dc22358be1f317c37cec9b3adaf5b6d833e8ba4b8471db7b2e37d3eccb1936f143bd4cc75719c08c8688ab6e7db79df97e36e27a055f92bdc2 SHA512 f28b0e7430d6e6aa7a27742bb4a3a237a6a7e5c9e2671fd6e2c454ca32e0dc70b94aef9165839a7fe2bb388ff5fe71fcb25d20ed29f881bf4acdaeee07ac78c5
diff --git a/app-misc/cbrpager/cbrpager-0.9.22.ebuild b/app-misc/cbrpager/cbrpager-0.9.22.ebuild
deleted file mode 100644
index 71d60c799200..000000000000
--- a/app-misc/cbrpager/cbrpager-0.9.22.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="a simple comic book pager"
-HOMEPAGE="http://cbrpager.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="|| ( app-arch/unrar app-arch/rar )
-	>=gnome-base/libgnomeui-2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	dodoc CONTRIBUTORS
-
-	make_desktop_entry ${PN} "CBR Pager" ${PN} "Graphics;Viewer;Amusement;GTK"
-}
diff --git a/app-misc/cbrpager/metadata.xml b/app-misc/cbrpager/metadata.xml
deleted file mode 100644
index ab75470f3ea1..000000000000
--- a/app-misc/cbrpager/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cbrpager</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index d916481cbd7e..1a97f5744a9f 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
 DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
 DIST gnote-3.36.1.tar.xz 3512000 BLAKE2B 00f5f8049085c855722f92fb3231684d53c4a15b96b7148a2a810d8fdd4c02b22510f4c4f9296fd7e2f4ba96e44d55215f71a2eb78ecb60170f8bb7ffbdef6ef SHA512 4c0c9d469836366a7886928beb0b47c48e60ee41591de193b9af597214f373c2c14b25745f6238ccbede8df8e7d4d83f39a34aed1b155895479bba3e043d2cce
 EBUILD gnote-3.30.0.ebuild 1606 BLAKE2B 74048690188d8e0c430082d90bde2b84b224437b0eb1cf5ba6ef094523fc985205ad1fbc6b5f0d9a5190f662180e1feed1ef9f27512bdadac4cffa00702035b1 SHA512 fc3688fa697ba4fc36b2140e31951cfae2b69092161bee5ec3e333bcae7b1167798c2a4b6796e469da5fa9ace62419bd20e5882f12f5dbb9464fec459019a0fd
-EBUILD gnote-3.36.1.ebuild 1547 BLAKE2B a78b2bfc54a7c1f323ef2bf6544e7518f2d54dd6ce11a4fde129bcc0fcf1fbb3e31c3fceede6fcdb29605069b4f549ac60d5ba4c9d62e8806f5bb2b9a754406c SHA512 942bc8c4f6024679ffda5dbfef0aa700d1c1f6f595d9f8f48283c1b7049dd7bb4dfaab25875b1d5227a2f455c54d2f9356f97c708b81e1b707e41c412dfb4ec1
+EBUILD gnote-3.36.1.ebuild 1546 BLAKE2B 4ce85d4d9ff99dd114b5bec5643d9c438ba77a563c8c878aa72d1fe2e789163960d18910d09273f11861561175d215fb128613d3dfceb192aedeaf16f2406fda SHA512 ef696ad04560cb4d27a7446e19f3d04c9fb8877a227e77c1f7dfc3c47aa2f276db6b7b095dbb484f94911a13a379f41bb298f090c7efb65ad400e2eef6895528
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.36.1.ebuild b/app-misc/gnote/gnote-3.36.1.ebuild
index c31e6fee60f5..0a1202afea6c 100644
--- a/app-misc/gnote/gnote-3.36.1.ebuild
+++ b/app-misc/gnote/gnote-3.36.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/golly/Manifest b/app-misc/golly/Manifest
index a4e7442cc7cd..72af4ab7336d 100644
--- a/app-misc/golly/Manifest
+++ b/app-misc/golly/Manifest
@@ -5,4 +5,5 @@ AUX golly-3.3-nondynamic-python.patch 1830 BLAKE2B b202aebb3975f55de4748a925d3e4
 DIST golly-3.3-src.tar.gz 5465595 BLAKE2B e74da3799d1086a46fba523e6b087e6bc50c908098b27a80573936629fd5ad6195968df46b2933a9984cff85068222a80040761254298c5f648b040d5532a7ba SHA512 2aa9c2e7b2ebe3fe85bcb6177e58ee83bd08475e0a37a04cdb7e649b9faf5c2f936c534af62c8cf2322baade65c6e5197768901dfb464c17b20b941e1fa77265
 EBUILD golly-3.3-r1.ebuild 1026 BLAKE2B 8cde2168e0b3ee5608ad790dc1d6197f715d012260bdecdc572e5a5c4ebe2887ef612b17b4064b8b1f2fc6a127ac067f678c79afad774a7bd053c95010860d5c SHA512 e14e63e356a06d1e78c0837636c3d34cca9ead96c5e10ded6f119c0df00f6a7cc968108e4a9017389973fe26441f4e56cd71618263bad4780fc0265e8fa82018
 EBUILD golly-3.3-r2.ebuild 1352 BLAKE2B 890bee53df3849f02d929b52a1947271d0e67991c0a2a4e8e4ba0b166d4139edbe36117f0e9b0092eae32a5c79fe5b5bb7cc47c5244a1bb8254e5fe6a579dd3a SHA512 6e5853d8a28373452f7c35104bbc3348ba2876642363ec041e38195b0672206f3da62af10eed4505dda15fe92157cf4d8b3c2656158650f487a4b805423bb5df
+EBUILD golly-3.3-r3.ebuild 1357 BLAKE2B b54590a3c3a6102149a4981b091a4369999ee93980fca1ea2d21e5ade7edb2762db935c542734493e1e21fca30594617c0985e8b1cf6bcda917c2baaf4baa9d2 SHA512 9b970c06e4fa0bdcb65de218bf4c4778e63ab2dfa4dd7efaa923063a64daf42c580c0984cb68e451cfc0672b5439d2d8943feabdc00d7c0e0c49d1f2a9fb007c
 MISC metadata.xml 326 BLAKE2B 6064832ecd0867971a46cd3c998419df96a09aea31c361b98cc81212e1a84bb99053f14a86321b194196df7e74d1859d7c82c2f55adcf0dd887224754aed381e SHA512 be4d2ed3256cbb48987657dc4a6569c4fa415a495488f17bffe0954bd54127bfc4f6652912b18666a02887bfe31769d1b0c1a67c311e286abca347a9b756301f
diff --git a/app-misc/golly/golly-3.3-r3.ebuild b/app-misc/golly/golly-3.3-r3.ebuild
new file mode 100644
index 000000000000..10240aa63d7d
--- /dev/null
+++ b/app-misc/golly/golly-3.3-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER=3.0-gtk3
+PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
+
+inherit autotools desktop python-single-r1 wxwidgets xdg-utils
+
+DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
+HOMEPAGE="http://golly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="virtual/opengl
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
+	${PYTHON_DEPS}
+"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-src
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nondynamic-python.patch
+	"${FILESDIR}"/${P}-allow-py23-exec.patch
+	"${FILESDIR}"/${P}-glife-py23.patch
+	"${FILESDIR}"/${P}-allow-py3.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	setup-wxwidgets
+}
+
+src_prepare() {
+	default
+
+	# patches change configure.ac and Makefile.am
+	pushd gui-wx/configure
+		eautoreconf
+	popd
+}
+
+src_configure() {
+	ECONF_SOURCE=gui-wx/configure econf \
+		--with-wxshared
+}
+
+src_install() {
+	emake docdir= DESTDIR="${D}" install
+	dodoc docs/ReadMe.html
+	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Golly" ${PN} "Science"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/ignuit/Manifest b/app-misc/ignuit/Manifest
deleted file mode 100644
index 7c7b7684262c..000000000000
--- a/app-misc/ignuit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ignuit-2.24.3.testing.tar.gz 573592 BLAKE2B ae3fb9d5b0616a7305e00aeb54a55199ded1f518725342af39d6b79079589fecaa6bc3b3de541cc963f32972e79348a6fc824410cce975a9ea3ef9592f663852 SHA512 c52997745e905abfcdf8bfa8dfb04065fe05a34a9abdd0348bcb3c480d4bcb56ca279c9074d4659a237593a4697cb18ec7092fd79ee682a2b1a26749e8987d4d
-EBUILD ignuit-2.24.3.ebuild 1223 BLAKE2B 786982de2736d8d0162c71863f626a60ce3e6ad44578404369498065d127c288dd71e915f4484c1b52192e85cff63fe581877fca8ac6fd6f334c2a414c86a02d SHA512 17f0ae5174505773c08c7ecabffc1721cb6b1a228a55cdd9120b2c23abd29d4c258bc9534f64168b00f9e27495a44a4fb7156df7080bf508dbfa42ab7e890dd0
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/ignuit/ignuit-2.24.3.ebuild b/app-misc/ignuit/ignuit-2.24.3.ebuild
deleted file mode 100644
index 764322cae997..000000000000
--- a/app-misc/ignuit/ignuit-2.24.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-DESCRIPTION="Memorization aid based on the Leitner flashcard system"
-HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html#ignuit"
-#SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
-# Upstream has put this out as an "emergency release" onto Google Drive; mirror it..
-SRC_URI="https://dev.gentoo.org/~leio/distfiles/${P}.testing.tar.gz"
-S="${WORKDIR}/${P}.testing"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="examples latex"
-
-RDEPEND="
-	>=app-text/gnome-doc-utils-0.3.2
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	>=dev-libs/libxslt-1.1.28
-	>=gnome-base/libgnomeui-2.24.5
-	>=gnome-base/gconf-3.2.6:2
-	gnome-base/libglade:2.0
-	>=media-libs/gstreamer-1.8.2:1.0
-	x11-libs/gtk+:2
-	x11-libs/pango
-	latex? (
-		app-text/dvipng
-		virtual/latex-base
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-"
-
-src_prepare() {
-	eautoreconf # Needed to fix bogus intltool rules
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/app-misc/ignuit/metadata.xml b/app-misc/ignuit/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-misc/ignuit/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/joymouse/Manifest b/app-misc/joymouse/Manifest
index 8974f755d0f1..3098d58fb4a4 100644
--- a/app-misc/joymouse/Manifest
+++ b/app-misc/joymouse/Manifest
@@ -1,3 +1,4 @@
 DIST joymouse-0.5.tar.gz 92464 BLAKE2B 9051107bb11445011f4d9cd5a546ef7652c857dc48d307a168af948de6bb2dc18a5894598ce0b6940a50cc8afca7eefbde9f1301bb620210bce887955dbc470e SHA512 85831ee72bf518dd8337b6d5cc7fac48bfbe9f4e038d3b05e42279e2aef58c6aa191e4027f9a06cd0e4713ac1d3f692cd5d58d1a263cbe234f590011eb8a6c2b
+EBUILD joymouse-0.5-r1.ebuild 555 BLAKE2B 3c3d55809577070514fced93d24f7fada87167ec994e0d637d7731d304cb4ea6bee9d56110f0b416a29912fedc6006a39dda7f07c0ddecef9b20f2d34bba47ca SHA512 3913e3885aa26911a7a5e282c6965f66803c8ba6ee75314edd13253c1f89c1751c7d19fac7935cc8d6c5d0b27b38e7b9cd56c3ddf885bb5aa176d27bd16849e3
 EBUILD joymouse-0.5.ebuild 581 BLAKE2B 8ab7b839a8337edc617c6986f7dd23f2ab34e0cb3bc07725307fd6cd5f5dae254ef4a2777ee2746a34224b655b6f3c89de92420a98fcb08eac8d99e35a345840 SHA512 aa27ab89637b9f09c6dbb6f57f371bd0fd1fcaa087448ca55a3964d7801928484672085ece5eec72a063c36a26169715dc39674ae2879222d1faaabc4d10005a
 MISC metadata.xml 337 BLAKE2B 966b79dfb4d85c9c7955fd8555421a9e284de99a2a1ae26b428ad9fd4087e537d862426002c6d67e7d39277ae7a1ef2f33dc3174e292c110e985a770788f5ece SHA512 8591ff3f582a6b43725bab8eb4c76c391af184a8845c11d135f2fd029f7e2097f16aef1e76a2794c9305d9f002b33f50b210b58221f4176811f6e8180062d209
diff --git a/app-misc/joymouse/joymouse-0.5-r1.ebuild b/app-misc/joymouse/joymouse-0.5-r1.ebuild
new file mode 100644
index 000000000000..1d3764620503
--- /dev/null
+++ b/app-misc/joymouse/joymouse-0.5-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An application that translates joystick events to mouse events"
+HOMEPAGE="https://sourceforge.net/projects/joymouse-linux"
+SRC_URI="mirror://sourceforge/joymouse-linux/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+	sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die
+}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 97b0dcfef470..60a6bac4b093 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,7 +1,9 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
+DIST mosquitto-1.6.10.tar.gz 613060 BLAKE2B 8c148479f79a1aa8a9abdb2bd386dbf9466f1afa41f4e0ed4d29a52adf7571ebca47231f32ec8cbf2760eb7a27bd6633985851fe4c8cb413572c32588a12097b SHA512 2050a7a7af864057a177728f1cab9f6db70d6d1ea609d90c637723c2c9cfc9716429739302abd6742bde932716fae340854fff35956693dfee4ef31ce7b04a25
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815 SHA512 f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7
+EBUILD mosquitto-1.6.10.ebuild 2884 BLAKE2B 80875c72c5c2569b06ece1aca53939f6e6156ff6ad1a9daf5dbf96de185a75dc496ec89faac43e492f6a25712599c27b432a8f508096dd224de27f1079ccc17b SHA512 d38a48bb3a73cf2942a1f1f48f01acd843a3e4a861aa3e906a05e99e610f6e290c86f652fc629b290ed82518fbbff3995a2ce0958660a50ef5cc29d3fd183275
 EBUILD mosquitto-1.6.8.ebuild 2844 BLAKE2B 184a91a2834bce30e09267647ceb52a7a2be5aaa38497cdfb0432ba7fa06a4175f45089da2ebaa96e9f51dcccb02aa41564e3b7583d8236854bac083a45b8b7d SHA512 7ada49932aa9eae6b67e0d38e7654c5f4228b3d47682a13b2f27b09e008814fa0b2940bea45b1c393d325932d226423ed2eac9e8d0d9d19d004fbca1846ab9f7
 EBUILD mosquitto-1.6.9.ebuild 2884 BLAKE2B 80875c72c5c2569b06ece1aca53939f6e6156ff6ad1a9daf5dbf96de185a75dc496ec89faac43e492f6a25712599c27b432a8f508096dd224de27f1079ccc17b SHA512 d38a48bb3a73cf2942a1f1f48f01acd843a3e4a861aa3e906a05e99e610f6e290c86f652fc629b290ed82518fbbff3995a2ce0958660a50ef5cc29d3fd183275
 MISC metadata.xml 611 BLAKE2B be4691b67eeb17bd99ecf3783ddb5a7065f4ea89d2a4ff1a73fd572e6f720f105c7d49b91b7328e69e10b69b46e4e06147451586e3dee08f7a46bbeda3307deb SHA512 3fd1d005ee668217d3fb24c3954bdebe469f2194b332539f561fd168c8e738bc00cb858c497aa83629cc347481e9609c588ec889be260bf49c822e304bd21ff7
diff --git a/app-misc/mosquitto/mosquitto-1.6.10.ebuild b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
new file mode 100644
index 000000000000..4b5abada49c6
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.6.10.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+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 ~x86"
+IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="
+	acct-user/mosquitto
+	acct-group/mosquitto
+	srv? ( net-dns/c-ares:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl: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
+
+	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"
+		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
+}
diff --git a/app-misc/transfolio/Manifest b/app-misc/transfolio/Manifest
index d3b502292abd..e39a30721160 100644
--- a/app-misc/transfolio/Manifest
+++ b/app-misc/transfolio/Manifest
@@ -1,3 +1,3 @@
 DIST transfolio-1.0.1.zip 158362 BLAKE2B 291e80e3576c3d92f00905c49d891c9ff926229cc2d843520b9b69f44660ec16ea274b4b68f4d8f3e353d140a6f8549697f3d2456310a5cd3a0e736ff6e0b61a SHA512 5d8c348cabcc3765c192a200ec011344960704085e815d249db23ac3669760c15ec343b16ecdce3469f49f76872f6f93563d50a96cf305f75ed19235d3a5d665
-EBUILD transfolio-1.0.1-r1.ebuild 639 BLAKE2B 630fa4a2eb20c434ba41283f54ad3a450376ab6a5449551087c6d5c8f78b4c38d92a6bdfa804c6a5ca69fc82640611b24a76c5c05028ef1f493f51a8af5f7f77 SHA512 79ce9e3eb31350470bc00a05e471f60e2bde7cd880e58d9e7e81619e4a7ca7aafc1e5035bdc7e53b484ce36f0ab885615f64a894c7a21ba7237a20d5f3a1ac6d
+EBUILD transfolio-1.0.1-r1.ebuild 638 BLAKE2B fc8495b60f14bcceb3cc77bb0d5323d6eaa6ae3add2a7d8913248ec24320e87478c2882384047da8ca8803005dbced9baf83dded91c57068f7a61de71f91a29b SHA512 ebffec4c0ab71527cbb4d9eedc443aee8e27a3291afee0ea0234744b222487b9fd10b686cfb0c710e6eb0df0911ff5de1a50e56ac4798457e44cbcc0e23576ab
 MISC metadata.xml 455 BLAKE2B daac1fc9779cbf0d98aa7e7bb3a42bb5b39b23a2e37f286252f7a427a327e6f15bb7357cf08d98a7f13331fc2b34d721f3723d28d5ca770b82eecaff07e96835 SHA512 b3422e3bf6f540318733516149e402521f2ccb83c3ebe89d5554a1fb505023eae6bdba8649a85c820208704213ec355555309189a49815cbc2408fafb7e5f99e
diff --git a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
index abcad10102f8..6c68ed5ec6f0 100644
--- a/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
+++ b/app-misc/transfolio/transfolio-1.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://leute.server.de/peichl/transfolio.zip -> ${P}.zip"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/app-misc/yagtd/Manifest b/app-misc/yagtd/Manifest
deleted file mode 100644
index bfc5c1734f54..000000000000
--- a/app-misc/yagtd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yagtd-0.3.4.tar.gz 1402287 BLAKE2B 52712e11fb30c6951ea1c6dd7ca826a8e38d68c95c6716cbc93524959d98c97f75413166312cfb6c684d27d6423493c215e9bec22f3a7112e064b1a413c9c16b SHA512 99f8dd5344615285a09e039f9c829fdcb09305baa1beaef03710fb5661ba5dde53491264142e9ed2c207e89e06855cbd64621e447468aa033e9f972b896385a8
-EBUILD yagtd-0.3.4-r1.ebuild 716 BLAKE2B 0d9b7b166e718a9d69b830305704258749795cb244d238d3110b1656a120cbd19b71a65e08b70e542931974244588868e858aae4f34d86eda39f4a92eef0694b SHA512 e08af3a6e46cac85fade6e7cd5d76edb51b291ee4ba89de30aeafd0a046db269f5f759f0d05d245fee0977f7c4031bd30dec59c10d001ddbe8179e5297946cf2
-MISC metadata.xml 598 BLAKE2B 291f0e2b7556cee527dc1fa85b29315efd060eb1e831f5f3c90ee7055158c1197254296d08b64c8ea10cd8c29437111534e3bebb36c78c9b3547700bd85dc74e SHA512 6b8a68577ea7e42575d795b3aecb3726b325e0cc6bc8828eb497c92175a537d551baf3f1872eb205d08d2312b3cc6fba43ba6df62519f157ffd3a29b33cc2864
diff --git a/app-misc/yagtd/metadata.xml b/app-misc/yagtd/metadata.xml
deleted file mode 100644
index a28d1359ca9c..000000000000
--- a/app-misc/yagtd/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-yaGTD incorporates major features from Allen's 'Getting Things Done' philosophy and 
-notion of urgency and importance preached by Stephen Covey 
-(cf Seven Habits of Highly Effective People book).
-To resume, if you are comfortable at the command line a simple plain text is an
-age-old but perfect method for tracking your stuff, and yaGTD can help you to
-manage efficiently this file. 
-</longdescription>
-</pkgmetadata>
diff --git a/app-misc/yagtd/yagtd-0.3.4-r1.ebuild b/app-misc/yagtd/yagtd-0.3.4-r1.ebuild
deleted file mode 100644
index d1f94ec737ae..000000000000
--- a/app-misc/yagtd/yagtd-0.3.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="CLI todo list manager based on the 'Getting Things Done' philosophy"
-HOMEPAGE="https://gna.org/projects/yagtd/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_prepare() {
-	#fix doc install location
-	sed -i -e "s:\/doc\/yagtd:\/doc\/${P}:g" setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install() {
-	distutils-r1_python_install
-	ln -s yagtd.py "${D}$(python_get_scriptdir)"/yagtd || die
-}
-
-src_install() {
-	distutils-r1_src_install
-	dosym yagtd.py /usr/bin/yagtd
-}