13 files changed, 28 insertions, 258 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e2b498bb0e46..3a49f9dbd445 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/binwalk/Manifest b/app-misc/binwalk/Manifest
index a2de6fb7342a..8510def9be32 100644
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@@ -4,5 +4,5 @@ DIST binwalk-2.1.1.tar.gz 263977 BLAKE2B 8fd5f20dcdb22a6528131fbebc1454cc496079b
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
 EBUILD binwalk-2.1.1.ebuild 1019 BLAKE2B fa9d822762dcabdda9ec271a7b040f546e6f85aada1ac743117a36236a513a0882e46c85fb0a79b5b1dae044ff4121ccfd07749d00ca0f93fcfc6cf935beecbc SHA512 62f213c19d46e87edc08f5e2814ca920751205e3c2a5f53ea47968e734ab9db7670ebeb2d390ec698c89112007f02831c32d0665fdaed59821751b098241f252
 EBUILD binwalk-2.2.0.ebuild 1059 BLAKE2B 6396a80d093b73c5fb6d853bd224a45ed059e672bb93e572396e9f657ef3443a50773a36a2ec612b004a34f50abe65548ab3f451c0167fda0d9d381201d0600e SHA512 d98ef1db2e644f31b2ab4a6879b1de928c347cb4ff2d10565fb8f3ebb263fd106b76b6476f386c663b538aac12181109eef7f345d9e39b01817702a7a79264a0
-EBUILD binwalk-9999.ebuild 1052 BLAKE2B b1ec86c554fbd7c1689962798d1f3747723eafa62c36a2ecb5e62ae658bac6c482997591339ac9e2ddd1d91876f48adc30fc36f2d0814e9136c9d6f422fa39d1 SHA512 213abf5c656c664c1974bfa4ba5abda13b96b06be9993f78e97c97db8bb776395a451910a3a10916874b7e501726db73218620c69f16ba0b9455fa1b041cc9c9
+EBUILD binwalk-9999.ebuild 1059 BLAKE2B 6396a80d093b73c5fb6d853bd224a45ed059e672bb93e572396e9f657ef3443a50773a36a2ec612b004a34f50abe65548ab3f451c0167fda0d9d381201d0600e SHA512 d98ef1db2e644f31b2ab4a6879b1de928c347cb4ff2d10565fb8f3ebb263fd106b76b6476f386c663b538aac12181109eef7f345d9e39b01817702a7a79264a0
 MISC metadata.xml 998 BLAKE2B 619184d84a2afb44abb2d51f7504e0d6b5c6907930469078a4eccabae4219b2e99bdbcec2347e55732691fcd8c84cc455f6de594f70cb3364c07d988b95d7a9c SHA512 0afb8270a8f36361743b74008e7add19efcf793742595dfab580adb9cbbaa39ba15c427ab91e8e6179df7ebb60a6261bde9e4d8f1f1448e50025b18dd2e361f8
diff --git a/app-misc/binwalk/binwalk-9999.ebuild b/app-misc/binwalk/binwalk-9999.ebuild
index 3c01a2964970..a32600fbb9e8 100644
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="A tool for identifying files embedded inside firmware images"
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 9e327474e88e..8acebc8fe5ce 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,11 +1,5 @@
 DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
 DIST khal-0.9.10.tar.gz 171132 BLAKE2B c9356bd65197db3a492939fbeec3c51c092ce02388a61fa1c426cc16e97fe509110c2f129203882504dd4d7bbe6ddf95a01d7147abf78a0a9b6c898af89814ee SHA512 7618e34e35726670721dfd12e1434d5ffe4221ffad5d751ef26dc26edab4334c847582bbd4f50cfb93f37a07397ccc467e240adaf3dcf1d9446e0ca6faff7721
-DIST khal-0.9.7.tar.gz 173401 BLAKE2B a0ab87f8ff4546f589b7cc05586c1aa36cf80760234df00241d9eaaced3bcf37bb8b4bb282c39491f69c9ad6fea0f89af3836c29e23294356847bb88fce645b8 SHA512 24fd1ee472971f029f998b061da719a0dfe4ee9584a5ea237b6cf0c886b5c45d7a7ee4bf9c23c41eb0dd0c5eba0bcabed7a5f05ae486a890150429031e215180
-DIST khal-0.9.8.tar.gz 173717 BLAKE2B d17a355bd4eddaaf3cf838bac6e66f6a4a72170d6e166aa9fe00d44295031d336651bbb74e2ab73a6ae85275f02f8bf035b6798e280055dd6e38dd139f30c6c8 SHA512 4c47bd18e7458ca7a6adf0684872923b4e49e6bfe481269cf9f77dee29dd47dbacf0d557890080618b4d3f08766fc8fae32de7682167642f0705e5b3b6b5dc01
-DIST khal-0.9.9.tar.gz 171830 BLAKE2B 924df2bc8cfa8373ded88e9173e57a6017fd0c0d7ff507d79cd8ef8845d81e3962130d1def3a0070c6a68a00bf27a80d5b851bf79c23087f8513d1ae81222566 SHA512 cc38d8852e5bd47e266e23d48fbafa66aa1f84d67022780b7b0c8c8d4f54860be06a4d2675c49a48b4551fbdce1ec99762fd3b12a2ada69a0768d200697ef03e
 EBUILD khal-0.10.1-r1.ebuild 1264 BLAKE2B a59615939e8a7ffcfec1fac21b93cfece6a5375c7620750b26f1b4d4daec2d08a557c56f387e7b84c5d393c734766a8751e4f67d60dc701de07eceb065112537 SHA512 695583d16532841a04df14f4f22410a3f61ca07eb5dd99bd2403b5f3a0c20ddc745d5df2cf0ac473a29cec48ca92a7b9bfa9a4bb20d7d8222da60b431016b5d7
 EBUILD khal-0.9.10.ebuild 1216 BLAKE2B 368d898fdab658268309d486dbf00e081fb52ddcb78224b43c710526e34faec98e3ae92bdf049b240dec6207496e82ce742d3f5dcaaf284916a10fb066451be7 SHA512 9f71b2c9eb0557be1fd20fc1215bf6300a6a30ff0c7beb48fba84e66079ce3f4fda9fb8965d7ac1afb409f56d0fbbe3f154d2f5d2774014ade5370e4bc4313ed
-EBUILD khal-0.9.7.ebuild 1198 BLAKE2B 1295eac16ce431bda6789af02682b1648cb4a86edebf865001c6edb33a9b57570dead6cfe61827c65d2e0ecdf5f1cbbc1255260e0610ff45435257ec204b1d43 SHA512 8966c3842729adbe518ff5c270fd4955c08996d86489099abb18af8819265a5f8b777ba4decf34d871fba6dec6bd04c677040cc8e00c0da294bc5134fe975171
-EBUILD khal-0.9.8.ebuild 1197 BLAKE2B a1dbf3d29d39b8d6c2e8dbcf9989744628ab66ad2365031ba51c2206b6e5a7c10590499646e7baaf4db8949610b106d9ad8188c72d5b8f624b50727938a4b8a1 SHA512 38ac68165976c0607fc13ca575a50d68c38f9fba42fe9dfcf4f34a08082c7675517c05c12c14e3c7789b87a4ca340236f25212e3f6ff93b6e380ef45667e413e
-EBUILD khal-0.9.9-r1.ebuild 1214 BLAKE2B 9dd34a47d414644871025175c7f37b4e5ee3b71e5195b5cda456004162a7513e93f0ed7bde79aee6287c9141a4788fa4a32acb73885183d4cc1a3ef839d595fc SHA512 9c29e98eb5df300c51785f450b8181a7630b11e2de0cfae7f72a25fd74e49e436589d4de3895ef8908156e25bb0978b66d1c2772152ae3e144d1276220975e1a
 MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.9.7.ebuild b/app-misc/khal/khal-0.9.7.ebuild
deleted file mode 100644
index 099cbd824662..000000000000
--- a/app-misc/khal/khal-0.9.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.9.8.ebuild b/app-misc/khal/khal-0.9.8.ebuild
deleted file mode 100644
index 2df4105e2987..000000000000
--- a/app-misc/khal/khal-0.9.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.1.3[${PYTHON_USEDEP}]
-	dev-python/icalendar[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/khal/khal-0.9.9-r1.ebuild b/app-misc/khal/khal-0.9.9-r1.ebuild
deleted file mode 100644
index 5b49eb16928e..000000000000
--- a/app-misc/khal/khal-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="zsh-completion"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/icalendar-3.11.7[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	<=dev-python/python-dateutil-2.6.1[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/tzlocal-1.0[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	zsh-completion? ( app-shells/zsh )"
-DEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/freezegun"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/__khal
-	fi
-}
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
index 86dff33b1272..4fe87c3d89c0 100644
--- a/app-misc/lfm/Manifest
+++ b/app-misc/lfm/Manifest
@@ -1,4 +1,6 @@
 AUX lfm-2.3-no-doc.patch 418 BLAKE2B afefe598a4ad9d1540234cd92c7574fef10e59bfeb13a9e9e2156bfc9296d9c7bd72fa2f7221c25533bb286014f8f73e5ccf1f1de023db49ec773952164aabce SHA512 d914da807c56a8ba38a9c9c2d6ac8c1ab5a9ec935cc55fd0a8ca5d12ecda571fd64a41938942586c9cc0e80a53a8d83cecc347decc66ebec719f78ce9a0b0d3b
 DIST lfm-2.3.tar.gz 119120 BLAKE2B 12d72d1caed7745dc336644589fba359c198c145d29bb419dbd0586ebe5e170d1a743e24638913a4581137c6e0d2f312a58fb84b22218ecb3f93942cf3d63db9 SHA512 d244cd03ebf4b145c0d364d9d7038a2b640010e7e6bc413a3613d4519afac4856ee7694a962176d7693bef6503b80703685b1cefab1eda0f8d0768ae10abf6c7
+DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
 EBUILD lfm-2.3-r1.ebuild 487 BLAKE2B b90afce9b3e1fcccf340b916a6f559a2ab9045072b90f413ee168da331aadf158d178f745a74426db6d463629dfcd74225ce48aa4c32574b9f24149dca28e024 SHA512 0a336f8697a43fe176bc3001182be2eae2ca6e5058095247e6e5af3eccd89b89ce6d2af4bd486d4ba5912dc8d72d345b408f8d681b7a563929afe50aca0c0d26
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD lfm-3.1.ebuild 424 BLAKE2B 67781cc586f7dc65f4ad081c1bc561ea28089d473a5bf915ccb6c3499564bc9c28b059625d18d4dd92abbd46c364b31f778532c207b71ffcea18c1dbdc638af7 SHA512 6a10a255d627b5dd091223e25c9cfccc993ea9390905204290fa3930fc4901aa7fed5417801c2d617da5257ebbc47142b61862d277f8c7d00f6fdc8d9d7103ba
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-misc/lfm/lfm-3.1.ebuild b/app-misc/lfm/lfm-3.1.ebuild
new file mode 100644
index 000000000000..f533bb150061
--- /dev/null
+++ b/app-misc/lfm/lfm-3.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="Last File Manager is a powerful file manager for the console"
+HOMEPAGE="https://inigo.katxi.org/devel/lfm/"
+SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-misc/lfm/metadata.xml b/app-misc/lfm/metadata.xml
index 6f49eba8f496..c67d4dcaca5b 100644
--- a/app-misc/lfm/metadata.xml
+++ b/app-misc/lfm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 0c40339e750d..7ba7dbea84eb 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.6.7.tar.gz 591062 BLAKE2B a215e311197fd84f1fa1ff0b681c8d1157db1a3e538a5a16afa1f11d17a08a720d44ae16b306cb08d6b585c8c4d4b2e38df972ceebc4634c727f4c8e0994c170 SHA512 0a75cf192483053ce78c6d9e3be158bdf66366d7731a68cf29e24731f6936027af1d86045c2b973f642e42e58efa033dbfd17842e3e95550bac4c1f44ab346e9
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
-EBUILD mosquitto-1.6.7.ebuild 2836 BLAKE2B 88fffcd2ad6d45a40f6da80acc6c3b97f7a464d155d92553d32522bc658ccb5ba03b81eb4041659916f96479907ac065f884784676b77b2851b5cf3acc774e7c SHA512 ddfb0b172bb77a87449b924033a6778d768651a2d9132b35ac45f13303c4e04456b0249cf60602d13bd381da13fc01a44f8778a966799e06d1b687fa8935b804
-EBUILD mosquitto-1.6.8.ebuild 2845 BLAKE2B e1bd8b03db7bf6cb78ff0f882eaad674bf79edbaf93a6c042d023508d21f0863fdd7a6857f851dd3e0feb1454c291dd3af260aca22de085eee7fa25ad968ad73 SHA512 faa9ef5ebe804c1d4bc89b084bd04462f52b623135a266227ee248c2faa36e6706ad7e50ef671284cdf0ee737f78d2a32768b45b23bf6b9c86fd4f8384b8c63f
+EBUILD mosquitto-1.6.8.ebuild 2844 BLAKE2B 184a91a2834bce30e09267647ceb52a7a2be5aaa38497cdfb0432ba7fa06a4175f45089da2ebaa96e9f51dcccb02aa41564e3b7583d8236854bac083a45b8b7d SHA512 7ada49932aa9eae6b67e0d38e7654c5f4228b3d47682a13b2f27b09e008814fa0b2940bea45b1c393d325932d226423ed2eac9e8d0d9d19d004fbca1846ab9f7
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.6.7.ebuild b/app-misc/mosquitto/mosquitto-1.6.7.ebuild
deleted file mode 100644
index aa17c9776561..000000000000
--- a/app-misc/mosquitto/mosquitto-1.6.7.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-any-r1 systemd toolchain-funcs
-
-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"
-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 )"
-
-_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/mosquitto/mosquitto-1.6.8.ebuild b/app-misc/mosquitto/mosquitto-1.6.8.ebuild
index 87e7f10973d4..491f0ca1ecce 100644
--- a/app-misc/mosquitto/mosquitto-1.6.8.ebuild
+++ b/app-misc/mosquitto/mosquitto-1.6.8.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 libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"