gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-misc
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
56 files changed, 577 insertions, 759 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 76e896cae183..04d4f6e681f7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/astrolog-ephemeris/Manifest b/app-misc/astrolog-ephemeris/Manifest
index 31b6833c6fca..b73168803400 100644
--- a/app-misc/astrolog-ephemeris/Manifest
+++ b/app-misc/astrolog-ephemeris/Manifest
@@ -1,3 +1,3 @@
 DIST ephemall.zip 4604012 BLAKE2B 0caee003272734a71a3f2d10871e1c034c9e9039f5cb0f09ed19d85122ba875794933d53624d6a379838a7f2c33728c2da9aaadbd91887fea018ecfc1c786557 SHA512 e7822cecb87466987107e84aae64d292dad31de9d2c268886869a37ea9e99bf81b2a530129c0f6538c6b55ad46b185e16ee0c5b0d8858acfe189f19e2595c6da
-EBUILD astrolog-ephemeris-5.40.ebuild 619 BLAKE2B 6f2b34f72179f26c2c36a4296a9f78e3a7a570339deb0e3b6025a3dcf623910034845201d98a4b02e5f5a4bad71babfd75ed672e9b4061effce7ac1eb0eab889 SHA512 99c8c27eafe99574565ece5935c4982d0e1014c575167c04eb8f98600135aa5911dadbea62d189b7a0912eafa43095c5103661308a7b98c968e7966e785536b6
+EBUILD astrolog-ephemeris-5.40.ebuild 568 BLAKE2B 3a242b0e1a42141774fc58eac638cd8bee9f71d1dfee0de49369ffdd800aac01168956f30471246b25979de38dd0e3d752fbde7577a0f44ef964390941c31640 SHA512 58c9eb0512881ad47752e44d39d6bbef1f05f87b64229dce6be8e91370f290339190972d39d552e3ed29d0249b8dee13ee608b90be13257a7d97ffd02c863b12
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
index 0e79b4d13905..269fbde6ea43 100644
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
+++ b/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
 HOMEPAGE="http://www.astrolog.org/astrolog.htm"
@@ -16,10 +16,9 @@ IUSE=""
 S="${WORKDIR}"
 
 RDEPEND="app-misc/astrolog"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 src_install() {
-	dodir /usr/share/astrolog
-	cp * "${D}"/usr/share/astrolog || die "cp failed"
+	insinto /usr/share/astrolog
+	doins -r .
 }
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 53ec83c5f57d..91b78c9bfde9 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -2,10 +2,10 @@ AUX carbon-c-relay.confd 362 BLAKE2B 7d33b9087ab77f07606fef84c4ed3dcff41e5604002
 AUX carbon-c-relay.confd-r1 365 BLAKE2B 10a531055296877bb027f5dc6546b054da7e5b84950bbcf8de8d4af552e61fcd9bbebeea3bc432a25f14103c4f2f30db4885259f855182e6923b79649e63fb60 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393
 AUX carbon-c-relay.initd 1678 BLAKE2B f97d7390e0d03ffaa9cca658ac206eff4ea22336f100e860aa81c72e593440c79596af6c0245a8f8759fff2c24084f1019581b44f21e984820a616f10543d09a SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575
 AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd971929fbb442be79f3913752f39b1d534d4e4e936ebe94ebd5883d56e3f04314b9033c0a5ef7a3cbe7e05e1aeeb42 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399
-DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc30238ba4fb173600e18a52af6a28bb954c476baffefcb229e42f3c2e6ff1d97196c188c527fc72fd5b98982f74451f SHA512 285f5d90c31644543a674b60e017c4d65f39762fe211b14a99583473e6d80313c3f907e4432750e6f25851e4a693457d1609a9bc176744b217f6cf0533ab4879
 DIST carbon-c-relay-3.4.tar.gz 297795 BLAKE2B 48e954af09db99fc6ab8a227be8742fadd268907c2dd203a9bd6b5417fbf77d604f13636416452108e9df77df6fe9350d5a3dba3f34b1f200b31aba5ebfb2d91 SHA512 12e5d952ac34d7ec33999946dc30c1c388fe5fba7d28355ead77377bca90228f003955353e8f92b743c1ccf5e55ffaf6c32188de3bfb0a1ad75a80cc418c5e00
 DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66
-EBUILD carbon-c-relay-3.3.ebuild 1468 BLAKE2B 682bd014531308e19c89b5ed966a04929c161d4ef338800e573d06dfa07173a121d490f5b02aeae90a2b76463adf9a03ecce325db8187d2abf04ed35e6568167 SHA512 2d5e58830ac28eefee38f254420d864d30512bd2ef6e60035e9cafe19d3bfa72de752cb672e1191b864d193d8823a4f856bb3f2b6f476dd175e33b2c56c8c967
+DIST carbon-c-relay-3.6.tar.gz 557612 BLAKE2B 9921a6488a0f04d6b8a7bbe54d13d23dcf979331103e1b862a8a504ead92afdc7530c665cd5a8973ac0cee952c7454ca8fcfb7b9e632ebf8c175083e83c10cc1 SHA512 7336e29890610d5248059c9de7653892d761005881897bff8279c0b12396a5d9aaedf4987121338f43951b8d322cddaaab43a2151b89e98eee9e4da8c7188cd4
 EBUILD carbon-c-relay-3.4.ebuild 1524 BLAKE2B 2a8981118520787f99095b5675c0b7a8796254fefb7c6060ef7433fc6b0e21b2688fbe6d87a43018efead41ff2ebe7c1d0e1e2ca296a7e5f1a9cf2f59bbca275 SHA512 d5245f24d09c3f352ad2aece0052744e74fae3b312313122b43d999453391a767a9ecca9265ec0f743f60e7dbbd9843de02454c7a4e2419daffa478f750897e5
 EBUILD carbon-c-relay-3.5.ebuild 1524 BLAKE2B 550a8f03ebb9db123c73bcfff8f34030faa8d14c3864325d324043e85b6690eeed21ef17bbb00c86ae3c846a7e84b4853f840ed72afdefa2ee4b9aa62c7833f0 SHA512 248b32b60392dd7648b8301c8474fc21dba7f35a2336497487968905d9884fa088e13189ae8d285242c69c103b44ad47689bf1f070531976b7603b36ac051b1d
+EBUILD carbon-c-relay-3.6.ebuild 1624 BLAKE2B 4a9816b39f4e1de9cae7bad1d17037ce51de22e7906dcf5afeadd7bf87ad93666178eebe120e55bc5aa2a02d98e26e57efdf334cb47cf7ee23b8f8f88784e254 SHA512 25c182b338e9674c85a727b26c40bbfc3bfae285e27c5b48eb4d75be58e150a863ce1fcf23b9f219b159fa906676d5a96f1306e38a7780cddf177f449f1b1253
 MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild
index f5a67797fa22..731e22fc2b79 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.3.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="lz4 ssl zlib pcre pcre2 +oniguruma"
+IUSE="lz4 snappy zlib ssl pcre pcre2 +oniguruma"
 
 # ensure only one of pcre, pcre2 and oniguruma is set, or none (libc)
 # unforunately pcre is in global USE, so we have to exclude that here
@@ -21,8 +21,9 @@ REQUIRED_USE="
 	oniguruma? ( !pcre2 )
 "
 RDEPEND="lz4? ( app-arch/lz4 )
-	ssl? ( dev-libs/openssl:0 )
+	snappy? ( app-arch/snappy )
 	zlib? ( app-arch/gzip )
+	ssl? ( dev-libs/openssl:0 )
 	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
 	pcre2? ( dev-libs/libpcre2 )
 	oniguruma? ( dev-libs/oniguruma )"
@@ -41,14 +42,20 @@ src_configure() {
 		pcrecfg="--without-pcre"
 	fi
 
-	econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip) \
+	econf $(use_with lz4) $(use_with snappy) \
+		$(use_with ssl) $(use_with zlib gzip) \
 		"${pcrecfg}" $(use_with pcre2) $(use_with oniguruma)
 }
 
 src_install() {
 	default
+
 	# rename too generic name
 	mv "${ED}"/usr/bin/{relay,${PN}} || die
+
+	# remove libfaketime, necessary for testing only
+	rm -f "${ED}"/usr/$(get_libdir)/libfaketime.*
+
 	dodoc ChangeLog.md
 
 	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
diff --git a/app-misc/cfiles/Manifest b/app-misc/cfiles/Manifest
index f1d9dcab8c1d..2040fc904c31 100644
--- a/app-misc/cfiles/Manifest
+++ b/app-misc/cfiles/Manifest
@@ -1,3 +1,5 @@
 DIST cfiles-1.5.tar.gz 237333 BLAKE2B 26eaa9f6d96bbcf07047a0c7f5cc941bdf8417c53a766f2340a8109d8a9333da509840bc928588976bb9a8c416fd138798abd57053162024fcac20299b30cf6d SHA512 b13141ea128e4095d095474917091770cbc66a18178aee9369434beb8102d8102fc530823b40d4c44fa8f00e17e28de5626b55986f878a393c1b59fa2f491145
+DIST cfiles-1.8.tar.gz 237966 BLAKE2B b2c0783ac4d5e5b9950b574f635b8d4adbe332178e09cd89966e2a44a941a34806332222fa606a097fbe21453bfe9a49f4718575c6fdae5f5b9b9433181e8fd5 SHA512 14880c71bcc6dc0b6433be722bdd75d30859556fae30754c668a9dacf8a1b8e4758cca3572de034a1e8fb4e947d38739351969139fe72f59a7af3dcb158aaa86
 EBUILD cfiles-1.5.ebuild 584 BLAKE2B 0a9c44e2665b8a67c3d61ba0a70fcf1cea5c8d15abaacd265aedcfcce6cfcf3813ecbbdcf53a393dc2898f5e97ae9cf34b228701cd9ef66d77c204425efb9de6 SHA512 62c4f4e6357788127a514e54b5f55cab373012beb69f836d343f0902e2efe194c75ead39a82d6490434a9e27ec33980f4cbc59d81dbf48e3c19d950cc84dc01c
+EBUILD cfiles-1.8.ebuild 584 BLAKE2B 0a9c44e2665b8a67c3d61ba0a70fcf1cea5c8d15abaacd265aedcfcce6cfcf3813ecbbdcf53a393dc2898f5e97ae9cf34b228701cd9ef66d77c204425efb9de6 SHA512 62c4f4e6357788127a514e54b5f55cab373012beb69f836d343f0902e2efe194c75ead39a82d6490434a9e27ec33980f4cbc59d81dbf48e3c19d950cc84dc01c
 MISC metadata.xml 590 BLAKE2B 1aa0b35129da61cf18a1512af1ca77561b35608d72974aa4d82c99ed9b218443ae118f6f72a362409b4f9d3e34a0781333494724be6d8ca88fd59fe7980de711 SHA512 6bb1ae35d085057ff824fb1e0cf6922c9ff5e631e80814923e42d95c117a06c2d9f66511d1fafe4fbff72fe5fbf889b5a74378b6441bbf94ad9f944040bf7f3f
diff --git a/app-misc/cfiles/cfiles-1.8.ebuild b/app-misc/cfiles/cfiles-1.8.ebuild
new file mode 100644
index 000000000000..9c770c677606
--- /dev/null
+++ b/app-misc/cfiles/cfiles-1.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A ncurses file manager written in C with vim like keybindings"
+HOMEPAGE="https://github.com/mananapr/cfiles"
+SRC_URI="https://github.com/mananapr/cfiles/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	sys-libs/ncurses:=
+	app-text/poppler[utils]
+"
+RDEPEND="${DEPEND}"
+
+src_install(){
+	dobin cfiles
+	dobin scripts/displayimg_uberzug
+	dobin scripts/clearimg_uberzug
+	dobin scripts/displayimg
+	doman cfiles.1
+}
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index cbf0d95b9f6f..93adf0b2512f 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -2,6 +2,6 @@ AUX cmatrix-1.2a-fontdir.patch 1794 BLAKE2B 2355315f4d119ba4df43b99b6aa7485eb933
 AUX cmatrix-1.2a-gentoo.patch 3034 BLAKE2B f882f43ffe02f966bad26f560bd9eefc726f8b5974657b267699cb111e9dc02dd1106d4effdbc2b13cc34273f591e2eb1d4d33ff508907f98d65f687b3046a9e SHA512 a72651c778fae74d0b05f59a7a94bf7a9807be0367dbceef9086d9a94da0062ab9f727c6708f5a573450c8e28fcbf729828ff4c8813b68a0fbfbf9106f451c92
 AUX cmatrix-1.2a-tinfo.patch 827 BLAKE2B acc326c3c70d3844ab9bd87751b590d357e8b29e5dd3f19381e8af69c78588b383982cdca292854f0bb95ce6fd829f34dabe22c61338ff35a187c3910e2f0df3 SHA512 cadf16edbdb2c43716de77b00bca725faa8802ab9cb6a4d5665bd20f3e1b0bf5aa5ac4b6d36c57573aa24985fe2abce4cef40b31ee288c1f13f87e31bab1922b
 DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835c374e6fc45be731fd5907333ecf1f179b6761da8499a40bd199afc0c3c018949a325f5ca139c8a09662917f SHA512 a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82
-EBUILD cmatrix-1.2a-r3.ebuild 982 BLAKE2B 0a2dec12a99b9d437f51f0a8ec0d1cd33bcfdbd735f8b4f0dde4a051117e99c44cced188f20b2cf148cdec3063b8099a75fcadd90913c9a3afcb2d1936b4dba1 SHA512 60657881884e4fa0bc5685aab5e75a2c9beaa70311f568be22dc5c5e374dc1b33c5096d59454877998d945759fad573b6bcf473ef4180d1f095c0703880c65ce
-EBUILD cmatrix-1.2a-r4.ebuild 1058 BLAKE2B a4f17fff50d1ef03a8eb31daa02580c9055e8fbe0e354e30fce4d48410f04abe8a00d675541bb7db7dfeaee0862ad804ab44b5a6b352ccd6788347b56af4ad9c SHA512 279f0b7ecdb5723405904bf24173b82c27b1e7218c3a16769ae9da4fd4eab926c11eab1c8d3c700d0ceadbb1faf47464140766cf86873c821aec0f865af1dfe1
+EBUILD cmatrix-1.2a-r3.ebuild 989 BLAKE2B ec16cb5de6b9339790373f4ffbf6445cb78e878febaf7b2ad79df5b70c3abd03e52510e3dc905ee9403b5cc4aeee5ab4e1243c04e6ecf2c5cac464319ac4cce7 SHA512 95f1a50f676e3960b212fc650dd1dbaba919284e89dac07d1393b2502d8e1152244f92b274f6eaead4b48daa718d5e4fa5cadc4e8d0366faac1953136994c9a6
+EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
index 86d198d57acd..2c2b301e60ad 100644
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="X"
 
 DEPEND="
-	X? ( x11-apps/mkfontdir )
+	X? ( >=x11-apps/mkfontscale-1.2.0 )
 	sys-libs/ncurses:0="
 
 RDEPEND="${DEPEND}"
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
index c500c953e5d7..7caf29f9a2ee 100644
--- a/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X"
 
 DEPEND="
-	X? ( x11-apps/mkfontdir )
+	X? ( >=x11-apps/mkfontscale-1.2.0 )
 	sys-libs/ncurses:0="
 
 RDEPEND="${DEPEND}"
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 509a050d7460..63d754c52720 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -11,29 +11,20 @@ AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed27
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-5.6.16.tar.gz 33894983 BLAKE2B f96e78f1f28d8106948c91a0d31ea3d41b538fb0fd8534e2f52be651cf22986c76eae67c58c8ef10fef218d1646b1b4b5aa0a3625520e62e482063420775e92e SHA512 cc831e50ce311366484c47cf9fead9bd6562035132e6fd29508e78776dd71846c713d8d1e7a0a99338df46cad124149fb5d767e0ae0bbbed0b50153e234f2631
-DIST elasticsearch-6.6.1.tar.gz 114126547 BLAKE2B b335b224af0c241cbdf83f81feec103274d9cdd9ee7f9c3c5a788cbfc4d7a24b3a345aa14853e378796f733c151f7f21b5b081b2071b56f40f0f068ef6b07939 SHA512 3f8619ae6a10a34c57d8bc0c2ba3851b79a494ea05a3d02119a6e12d2c6cb6a651e73b43adfd674b7fb16664b709b643d4be9ba0785dbcc6d7a7cc41da7b669f
 DIST elasticsearch-6.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee2434135fdef85d0bec5baa873f7bfd7cb6d340932d6b67b13a8f5095dc04d1981a029ab7f87d90c2b4a796eb198e9b8c531db9d SHA512 dcd3a6beae8b4a2322144058871074f193974565341da5703ec991947c2749ee67e87202e937148f653594f5fd33fdbb8adc891a200d4e03d8363575992eb9ec
-DIST elasticsearch-6.8.1.tar.gz 148584086 BLAKE2B dacc3fdf142fc46ede2a5891f95f69a1200632c46b57eb03f948437a39ef92538da7d3e64afd52c4acae478e6758b355729f8cbf8ceb91aa3d34353ff434fed4 SHA512 1d484287e9b67b16c28f1a4d2267e7ceb5a4438a18b26b3a46d4a176bb3f2f6fcadcbda617a7a91418293880d38c027266cb81a4e8893a28adee9fa693b2318b
-DIST elasticsearch-6.8.3.tar.gz 148609846 BLAKE2B ff32122bd53eca3e25f4ca797d76aae6d24787646fe532bd30aae737aac5c1d134b4fe73c7f60ad57e410e05d7b049a57beeec8a113de2d7c666e0b437f37bbc SHA512 191aa34f0178bcc480fc77f7a3c1736531a4b4db2d8f0196eab53a0dd28b34cc88df3064703cd523cc692da8b8e58e6310de256d728c33537c992935b3546bf7
-DIST elasticsearch-7.0.0-no-jdk-linux-x86_64.tar.gz 149074223 BLAKE2B 3c210b81de8882f99be45adc811c3867acb276978d3c788db5cb00ec0eacd0f096933849dfa066160ca2ec05e3fa2962329b200614db9927e4424602da53508f SHA512 b499aeab6a3f883547974b36221fd808a9da70ae0622856582287dcf729c3a2acfb1faef2727b17be97f64d8bb56ac5cdbae6d63f2a146027153f170ae6d91fc
-DIST elasticsearch-7.2.0-no-jdk-linux-x86_64.tar.gz 138948007 BLAKE2B 0e03779669f6113eac1561a3a907d8a3286ac7c7229e0ff7ad46ede4f22a2829f8d2ffafb319427f789fb95cca6669c59f8d840ec83625889bcdd6ada91be1d5 SHA512 b49a6d6b7361c499b1d9a9118746229113eaf4b88c1ad755c1ae8fd713428db4bc296cd75f3df58a239b09d6a8281f670f69c320839ef000596c776141cb1ce6
+DIST elasticsearch-6.8.4.tar.gz 148628251 BLAKE2B 09f7a18a1ee6f40154f2181bf354c15da910c712226dd1bb5ee418ebdd371a1ea24e1164e7218736d28f580641c85f70cf40918eb77772470a186f61ce9cfae4 SHA512 bfd00de65b007ea64a88af22f14005774994e7d3a12c416dbda64465ce656634c5ea5f36e5a397ae67ed1e4b4893d758ab4e6e4770c8a65ccc61b2270aa17fa7
 DIST elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz 138949755 BLAKE2B 3c77cec89a93c6b5d213afc326ef84df7d77c052914b387dc4ba35276d8f9814689d5305a131e1c647ece31277533e882b1170ad03eb3869f8443471223db066 SHA512 d2827be0b06361ab08f558dc88f76c614fb6a243a6d845749b3d23dff4078ffa58cc1b3407b84197d0f027ea9af5475fad8e3a503fc573ba31756bdd16a589d9
 DIST elasticsearch-7.3.2-no-jdk-linux-x86_64.tar.gz 140098396 BLAKE2B bb2eb1e69b459533ed785f244ebbdf06032f8115f298e4151164fa27c913c6cff674dc8e75d96734185ffe47c2dd16dff11f3f7447a21bd0020fd45e58abf5d4 SHA512 9d73f6fce0b5321099393c69b1ba8544f9fc919f5a850bac3eb5a77af50f392e8eeb20ff34ba85283649a19d9bee33351a4ffd363cda848d4d53cde91632e335
-DIST elasticsearch-oss-6.6.1.tar.gz 34492424 BLAKE2B 9a63aeb86ec3bebbe685804b262316726cb93b42693f9ba8937cac65c7ec186f0bb470893568234a0b7cc8b58f0c91d2af94eb16c3d016e7533231eba32fdbb0 SHA512 0e536ff760673dd740f790f1b0c01d984bf989a4a9ad3c4fe998de4f824330ce0d5ea18f04421a8648af719aabd25a4393f90182079186e48cef539b5621914c
+DIST elasticsearch-7.4.1-no-jdk-linux-x86_64.tar.gz 140407217 BLAKE2B 5bf378d66a199de45375e9e07e650e9cdd8fbdd8868c8a81928571be4aaf2d2b1bacf6cde8e216a98b448d1d6ef0db89b2b410d5b2d0bd5e0b40309b7e68f7e6 SHA512 7714a0bd8a69bf921075b2020863469e9d44896e73b383ca073cb243eadd29dc9a76936530c33304fb2e8505dfdc88b7591ddca9543ee1cf11e74df3bebd5b25
 DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
-DIST elasticsearch-oss-6.8.1.tar.gz 68419519 BLAKE2B cf34c4cf095b4271d067802df8130d66167e5f01fd0231361ce3e7f5e1023b39e6fbc325cc575f2c353a30b011127934b7b7a04f9a48998f88d27ce8a5560bf4 SHA512 cbcc81b8dd3a7a63c6e6574405417821c5dcd1a0b5df813818d39353fa29ea28e443db64b1a1938a1ffb23aa17d706e3edb6a46fdb24992b92f918d8d4f0c08a
-DIST elasticsearch-oss-6.8.3.tar.gz 68441884 BLAKE2B 45da3d4b027dcd36480d4d13de8d05bffaa69511b87b3558d58989449736639ec66fe38a9422a87f71245294fc52609f91c4e9b13907455946b04a9f5a386e71 SHA512 0a83a60c7959cad258453c12857d02e2adde7f2088dafd023bf6737180c3877e03012f6f582c6eb21da7385a74e9568676e0e1182eee0bfc6fa0c5c3598798fa
-DIST elasticsearch-oss-7.0.0-no-jdk-linux-x86_64.tar.gz 68788144 BLAKE2B 29206b277dc9997b155b54217f485c314a7efa35777bcb81908ce900e134e62d7ef14629cfeebcd3ebb724b76fe5380085ae6b50df46bdfddf5f657a0d2da3eb SHA512 ec9381d9310145b80fb2b8cdd7b7953ea7b2b45a66bf8435d8a982aed0eeb59f734f3936b4b40ec4530e106878d25c2f63d4ea7a734b12f1c8d86b39f7894963
-DIST elasticsearch-oss-7.2.0-no-jdk-linux-x86_64.tar.gz 68964879 BLAKE2B 6bebff074d9a22abaf1a7b669d9a47254a658f4954b2e27d4251860a0b8cd29f4bbc3baf217d7fb90c492d5dabce802b1e4d359531202e677ffcfd573b51b343 SHA512 a538c82dc177a66004912ce20b1b50ee1270e45b56879b4f0b7e2d4bfa00d9fe5c113b5e4927cb6f5669f8a1f2f4953c4bb12dc4a10510af4658bbcbcaba3cbc
+DIST elasticsearch-oss-6.8.4.tar.gz 68444348 BLAKE2B 812180686f1082607c4c75679d591cb2d3517d16212c29b8f81b5792a2331b8faa5245540e1acea998b385eca6e4b06419c172b5d520913b8b31842dddcc4757 SHA512 d55ebb56bd13dbccf633f51a5d8cf5b0eee7d1e8954fe106e44286d5498dcffdcdf98117b42d8601ec987699a25d88a27dce7fdedd4612efd52bc18c561dc5ca
 DIST elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz 68973563 BLAKE2B 5248a5e8443794134c55ef14d1b175ff931d599a45b4cbd0f187e864dd3d4b322f10df31672c0900417e84da0e83fd934234bba31dc116c5c3b6b9f14e9c62a6 SHA512 694aca59cc3e23bfcf41142d7bf3d3c75f6fcdb6d0a1b35157157cb2f4ac8152db1e424951e62ba1a2bd4a2d32a77bb9499085558b7e1580680c0de90fbc0902
 DIST elasticsearch-oss-7.3.2-no-jdk-linux-x86_64.tar.gz 69289138 BLAKE2B 2ab3658a2acf1899f44fb29252932862759dd134ffe4872daac15092f9a08b536492197b9cd44287ec48a7aaee1c3f78edf2957f807aaebac866bc835972a592 SHA512 abb183a05db25a877d4e5a8f8b75fba517444008f34e35e82806a6239c3ccec1c32dc787313b899be55caefdab8343a62db31f9491bffbabefaecccaba1210d0
+DIST elasticsearch-oss-7.4.1-no-jdk-linux-x86_64.tar.gz 68527811 BLAKE2B d8965b429d4ee9b7becdb0ff407ac1ae03322a5c17ab7e793569fdd4ebffa302d95772e7ba0f4ae505fd07b62c2e6983d57db9feec7fd4da42676166287b460b SHA512 a652905b130ace0097b5f51df1d2ef5977d0eda8b551acaf7b3d7015397b054f83a868874fdc96b95e2c780c65552001ee2a90cb7b9f88f43b5ea813d0b078dd
 EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
-EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
-EBUILD elasticsearch-6.8.1.ebuild 2579 BLAKE2B 8581c232ba6a291994a61ef4c9406bfaf0fb6590fee36c60cab0d319a8a0472e2899fc2e136ab4267c1b6d6d52d601d4d4cb7fd5090ae05e46b63856dd986974 SHA512 956ab4ca9d9d5643ea3045cb15d6e98c6de74fe4bed56b4e44cca9a5b9073ad3d04fb24c8b7c04bb0dcee7f0a5baa9a44aea8e00999857fe51437e42bd6015a1
-EBUILD elasticsearch-6.8.3.ebuild 2539 BLAKE2B bbf97b9bfd59a523d6a15a1ce94b5143faf011ebfb62e89d07424bb56bef16f172d3770516d7b170d7469d67f0b3462251778c60621f3472fe3d966bddc3f778 SHA512 dcd7a9909aee6c957e53154e34308e0df6ca3f7b02d815a9df7ea861fbe8753dbba46bd32c63c819dbb13f194eba909058ba18b7e3a6a6cce24cb1e50b2d9b70
-EBUILD elasticsearch-7.0.0.ebuild 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
-EBUILD elasticsearch-7.2.0.ebuild 2478 BLAKE2B 152933e675b5d159de07e31592f883d16206201b844056c3e27ba69b27769700ff0891938e017deb0600d3be08b1d172d2856b482b7a98887f648ef54f151e49 SHA512 de5df3dae8215eb3fa3cb2306a0da5b87e3dd4135b8cbf663fd297d6b8e074b643b4c611f34da5ac87fce7658b46efc7803ff92f97b44cd88ae6af5d98fd5e8c
+EBUILD elasticsearch-6.8.4.ebuild 2539 BLAKE2B bbf97b9bfd59a523d6a15a1ce94b5143faf011ebfb62e89d07424bb56bef16f172d3770516d7b170d7469d67f0b3462251778c60621f3472fe3d966bddc3f778 SHA512 dcd7a9909aee6c957e53154e34308e0df6ca3f7b02d815a9df7ea861fbe8753dbba46bd32c63c819dbb13f194eba909058ba18b7e3a6a6cce24cb1e50b2d9b70
 EBUILD elasticsearch-7.2.1.ebuild 2478 BLAKE2B 5e3b853ed335f7a691a664a3dc1b6e8307d09be38b97c7a632a4d857c059fded6e1f20ceadc6fc6afe99d7bbad3dfb2f041ade09d62e39733e62d87fd4cefed0 SHA512 c634e16b86ddbd3b3cb689c467aa992bb9a78179e93ef190547a8d55e511a30c47c3459df2d3dd55c865cd9ce96bb48497c683c1bd4875967a3a0838f8a09341
 EBUILD elasticsearch-7.3.2.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
+EBUILD elasticsearch-7.4.1.ebuild 2438 BLAKE2B 430878ac0dd8fb2d67694248c24d01399e2bfc66bed965b5c785c155d36a69b5870d54de0c6ea04bf6325e3a7e6203d2a61e167e1cce09ae5d7758b132e0296e SHA512 df94298047f304b0b30a9f6bb4b623a4c08bec91f9b19b06c02efc787788ffaaf89196338851288baa081a7a67db954b9db991b77aaee8ce059bb1b8b7d8d032
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.6.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.6.1.ebuild
deleted file mode 100644
index 80521b9e40fd..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.6.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.5" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.1.ebuild
deleted file mode 100644
index fa7c0272257f..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.8.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="virtual/jre:1.8"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm bin/x-pack/*.bat || die
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.3.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.4.ebuild
index f2652b931f0e..f2652b931f0e 100644
--- a/app-misc/elasticsearch/elasticsearch-6.8.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.8.4.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild
deleted file mode 100644
index 8d3ce3b93b46..000000000000
--- a/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="virtual/jre"
-
-QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm LICENSE.txt NOTICE.txt || die
-	rmdir logs || die
-
-	if use x-pack; then
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -r config || die
-
-	fowners root:${PN} /etc/${PN}
-	fperms 2750 /etc/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	if use x-pack; then
-		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
-	fi
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
-
-	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/${PN} into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-	ewarn "Please make sure you have proper permissions on /etc/${PN}"
-	ewarn "prior to keystore generation or you may experience startup fails."
-	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
-	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
-}
diff --git a/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.4.1.ebuild
index c4dd0389607b..4c17fb08c836 100644
--- a/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd user
+inherit systemd
 
 DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
 HOMEPAGE="https://www.elastic.co/products/elasticsearch"
@@ -14,15 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="x-pack"
 
-RDEPEND="virtual/jre"
+RDEPEND="acct-group/elasticsearch
+	acct-user/elasticsearch
+	virtual/jre"
 
 QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
 
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
 src_prepare() {
 	default
 
@@ -62,7 +59,7 @@ src_install() {
 	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
 
 	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.6" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
 
 	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
 	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
diff --git a/app-misc/glcdprocdriver/Manifest b/app-misc/glcdprocdriver/Manifest
index d7343afc9e20..a1bd6a5a960d 100644
--- a/app-misc/glcdprocdriver/Manifest
+++ b/app-misc/glcdprocdriver/Manifest
@@ -1,5 +1,3 @@
 DIST GLCDprocDriver-0.1.2.tar.gz 21438 BLAKE2B a480d241ad1f7b88ef63a0d2934d59325a9d5739497313c8bcc3f720a071d5bf2804986715e4392fc4713fc3641ae23e5f54cb81cdf1d45db9397d985555260a SHA512 b39dc9d68225bde63a053f124260cec9a081da1d2df6d245be109c8017d60e0e495f056fbc7ee077633d3ac68aaf7cdbaf606e1726f383aa583775a75eea5433
-DIST glcdprocdriver-0.0.6.tar.bz2 17209 BLAKE2B 631918337227c43eac163d7353182852500c08db0d1d0f3d4145d9b57895a66eb8c47a16715c1c0e4c3ab044a0de5ed80c282fd57850cbb33636cf775b721a4f SHA512 c489b6e6d6a72306867adb94ed6a6cf6354c834a27fd2ab2ac733707954b18bf93dc56a868e167fcb183602c03ac648bb941699760817e414ab8e8592edb8b7e
-EBUILD glcdprocdriver-0.0.6.ebuild 745 BLAKE2B 770037eff2b660262de1969140ca7ed5f5ca6bf6f0c2ec4682a7d211839347e07c626939f05c7103d58ea9b821297ece5b2ffad90f5651c19ad7ac5833c239be SHA512 3a7a28e045eafddbfc97b935454a557ead15aed88f1b6d2f9eed50f1fc1655c28a59b9bc810257a3de5eb32086e823e5821278c60672ab80b3a6caa263c81a65
 EBUILD glcdprocdriver-0.1.2.ebuild 777 BLAKE2B 3f91821217a37f85a059abebdb9549e882cad5421a0803b810ef34d065d528593c3105f99e3e3102345b301855ff50195f13c3e064d4cd3177058f92672e3f5f SHA512 4ea8fed15eff664e6c7670d964d3a51d782ffa3b7a04dae333df7255d7ac80662cfcf858a512c2e0c5f0854d2409db18b26601432635e6f6560c66517239c0ea
 MISC metadata.xml 1089 BLAKE2B c8d3e6cecf76a95e23b73b2411e68c0ad7174ce1dd497c50df74a7747bf6cc38267870522ba8eba50021f04c46365193516619f9b36aa6bab6b5fe6adc739241 SHA512 7d628191af503365b442deeb69fda18b451d34e87c903addec0cbdfc86c767522f11bfbd56ffa602c15cceb6355ab5844fba3390e5388cf333f5a458273efa4e
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.0.6.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.0.6.ebuild
deleted file mode 100644
index 81329a2f6182..000000000000
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib toolchain-funcs eutils
-
-DESCRIPTION="Glue library for the glcdlib LCDproc driver based on GraphLCD"
-HOMEPAGE="http://www.muresan.de/graphlcd/lcdproc/"
-SRC_URI="http://www.muresan.de/graphlcd/lcdproc/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=app-misc/graphlcd-base-0.1.3
-	sys-libs/glibc"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install()
-{
-	emake DESTDIR="${D}/usr" LIBDIR="${D}/usr/$(get_libdir)" install
-	dodoc AUTHORS README INSTALL TODO ChangeLog
-	dosym usr/$(get_libdir)/libglcdprocdriver.so{,.1}
-}
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index c7dc3e3f6724..3c501c831140 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,5 +1,36 @@
+DIST github.com-AlecAivazis-survey-v1.6.1.tar.gz 976163 BLAKE2B 331ca2a097feb8bed063eb09976ce5ccf71c5d1c74f6f844d83786f9e476c1f630f95f1e87974578c6002b46d4221ab15fc4e9de529e1647660445a933ff1d64 SHA512 7b2dd3cc0f9acbea141756c5c4da791559578a6317905cf12ce894524e9bbdb9bccb6903d27e8142ae327be0db5cc27e599064907a7a246f87634cf45be57afa
+DIST github.com-alecthomas-kingpin-v2.2.6.tar.gz 44383 BLAKE2B 91841e6353af639c9d1ad4ecb0fec797ba1d497c223c0d457e1999dc7560a84e1d75f209f5a18386874a499939c5c7d6a450ed61ebf265b6706077131fda486c SHA512 09c6bb5782639efc7068ed7606fe22c463b2397dc95a89c27ba567a58da10660bfea60d7836b63dcedf7db702f79fe7247575c33a503990f5ba6ca92e29b06b3
+DIST github.com-alecthomas-template-a0175ee3bccc.tar.gz 55291 BLAKE2B fbd48545b6a5809d210629ca3aeb03c366051601d5b2f7718f79a96ec18fa09f18922c1a3ffcbac3abcd9b8955871b5bb4c71c23a1839cf7f17d8372bc3478fe SHA512 5ca546170725c3bdd4d9b27ca3976d6dc6376be8db685e6e26cfaef4a51560f78702b7babbe5ed0b2d934d0c32867bc69b11ae757071dc143a4453e6e7ffabdf
+DIST github.com-alecthomas-units-2efee857e7cf.tar.gz 3442 BLAKE2B bb3a4acac34764b249cbec5f21fd260ab6dea6810183d12e13943657037903b874a209686b6913e8529a578cec4fb364adad475577c28456bf92add7f5ac9498 SHA512 855f15eeb83bdc16981694f522aa1e200a3857ed11ae87fca9b0cc70734eac76f5082bc3ed92f843b818da14b58dc921dbb1aed4ea35de056c087a64b7e25fe4
+DIST github.com-cheekybits-genny-v1.0.0.tar.gz 15585 BLAKE2B 0b5d4e398b75ba2e413cd41d455bce346aadf8b31b9233b6287608b88264e0f698863bb151d44d75488caae011ce4e68fb574b301fcca77be53b32865b7db4ea SHA512 a045ce3dbe5c54e1e04705b87d2e3a18bebd71382a68156f975e28c6426aa82861e68e6ff162d3765704d5538a0493693cb973781e35b9d1b9ef8c4541ec1e19
+DIST github.com-coryb-figtree-58176d03ef0d.tar.gz 206696 BLAKE2B 7e2f4194dbb8a6837f57f0c9f4f44c086c98371882455b2d953f3a889d068fefae17a9751d7d03285fd3ef9b88551b6db5ae5f0918b2246b19e5d09dfeaed4da SHA512 35c2f42d97e1fc507b1672b568928e5a9bc60f02b4062f84bae8c4949219824f93e5c7b3a78eb9bdd2e145175ec82758a345cf285e96704a7dab70bc809c231f
+DIST github.com-coryb-kingpeon-9a669f143f2e.tar.gz 106411 BLAKE2B a01965e9d8c62c151819a3e5935474e642cdcc5c9b9d62df8c18306a9062443de25728fc4939e61fc05b3a28a9089ca5ca23181d3f55c382dd43fec066a31cc2 SHA512 a190961873ca55e27f774ca83c73c3ee5e5d105bf94011935ef1c0b97b4dc35dd40cdace58e9e208327b4633f241eb9366ad06df3237d954745767d584f76640
+DIST github.com-coryb-oreo-3e1b88fc08f1.tar.gz 49152 BLAKE2B a08e314cc5f8f6a11fddaf36bde7bb55da447d542e35e5c2a766ee5df71df1c79b37a5ccae3375713707788004817ba0a22a9d574dc33f4be76d288c6d46147e SHA512 dd2d755ea6e6e67e7940588471ca42a0efacf78727a81a8d5c121d1fbc8c4f2a72da2a117c5b2f6327e30cd99cd1cd366587c703d6ee7c4b13fceee51f6e5a8b
+DIST github.com-coryb-yaml-0e40e46f7153.tar.gz 61502 BLAKE2B 5d18515f3e32f75f61a5b3542b9628a995628d5f05aa42206e5cad11d0d862be0b4f9c01f38f021d27001d69f0d4c12c546485bf8af3c498e06ee84125466611 SHA512 6c2689271b4463847577ba02af863c7cac16195660f43988c567eb110084a791023ed65ecd4f433697e82e20d661d2a30e34d7aa98cbcad1206cd9428ade77bf
+DIST github.com-davecgh-go-spew-v1.1.0.tar.gz 42337 BLAKE2B 691ee430beca602ea686aa065b23af5e00356e866cbca2b014bf0c8f4cc965a2318e6a39232772098e250d61d5bd6707afb769fdf4223c81a8249cad267d1971 SHA512 20c9f0550a2d5030265dde8ad3ed009ce5c6490d010f184ad3f656b8fe5eb6e5c6abc9594408240aa731c0977afd9739d293490e6164cc0ce156652611b05b39
+DIST github.com-fatih-camelcase-v1.0.0.tar.gz 2989 BLAKE2B 4970cb544427bdc2ddb7a65342a601042dd116965d3de8124141e64cfddeffc2abe1e427dd4429c59ce6e34991d60c19112cf47e218d85bb3f64fe6fe86f5be6 SHA512 13377a896fc6ef8f5851c80262a081c070b108880f14f61b5be85cd5577427982960cae03bf10903b5f9df761703d6b6b786dd0a6152723d5eaa4919756eb0a0
+DIST github.com-golang-crypto-c126467f60eb.tar.gz 1624243 BLAKE2B 02b478df31069205c405d0ab11570cb2009a3be1bc8255e79a82c8ddf8a9d9d15bf842139b07f6a166f63fd622db9639b2619b3bc3cdc40eacb40ce703bdc8d9 SHA512 9afd41f015c7e71f6fd934db0e9641d41371c16ca849a7c5de560c25cb5f3f4f156c92d36d8a599dae237450a7adeed2251c49c2083c5e9a7589130db069fbf8
+DIST github.com-golang-net-01c190206fbd.tar.gz 926192 BLAKE2B 2c6b077aa69af7c4a351d40e6766dcf9fbbed44c7bc1d8a8bc7f8ac310d0b2770d906c001f9b53967030fa9718aca276eba78e9253badeb6b0f33ea34dc3ac39 SHA512 84133b8ed841e904f313e9de13488b45493676b0a50bf24116a17936c21d43d785bb398eeaf814a7c5a2fa07c322319d68126d46b1fe09d5a908b64a69f97e5e
+DIST github.com-golang-sys-bd9dbc187b6e.tar.gz 984696 BLAKE2B 25e6131a9d788ad2e044f363c6af70eb8514f6a38f295a5c3a645adad646946672ad1b0915c8a23153e607132d0fb12aeec5488df317351b64cbc171a7f3c2a1 SHA512 8c24993842f21d66a26819fdba03a5c355e347658e0abb9cd519ff83cda6525996c48e4fcef1f1db619f79ebd8cc098e8483e9d9be5a302fd22abe1ef113a613
+DIST github.com-guelfey-go.dbus-f6a3a2366cc3.tar.gz 37292 BLAKE2B f0257bee176ed830297e6188fcb26c73c72420b7444b88f86e7b9b5cbc8e3ca7982e089cb405b344fe0bd290845e17a0e17caf9e116ed6942acb4b7545f31e6a SHA512 e4cb632b7aac4d9c966cfac7479c3221b17827e2e27f3ba032690f0c896243c4b93556245ee5f2cf852a4478ab1f143d7176f09c96cd664d53451e587d64dd0a
+DIST github.com-jinzhu-copier-7e38e58719c3.tar.gz 5397 BLAKE2B 3546e4fd2177b9f7fe116fd506941540bb12ffdafb2a5759f52765e38b564242d5841e439091d0dc40ccadf9ad425e5aecc98939be40f1081105fd3e8edfff06 SHA512 6db89b49c5d6c3186c079ac6b713d539b7bc5ec8b0c30c4bb83f6d71d34d8c98a2a12ab51f921912fbf9202114c3ea8885f85e16d6fec302b00372c4985bb183
+DIST github.com-kballard-go-shellquote-95032a82bc51.tar.gz 4327 BLAKE2B ca31068aeb60ebea4568901fe91de1aedb6842533c98a9b2cfe2a989d6f0a3dc76cb113989c84acae934150f599173af186b7886661ba94a549dedd3508b3cf5 SHA512 6fc381005c055aff7e451145bd2dd5a20591481b416d2d94c1c05ddcfac84c76e3915046d86073f3ace97ddb38eeb6e8a925825ca4629f1687b7f274809d9c83
+DIST github.com-mattn-go-colorable-v0.0.9.tar.gz 7593 BLAKE2B ce0e8b4ea658b41da2f1bf38eb5eef108393e672792adef98baa56a5885508766ed0cec4041f2cbcd8baf20d03a967c3d62d539a9bb07a0b90651123a3f3a647 SHA512 59be33ee1ff5f2410f57421f4af21dbd85d0b48e3070a4179c016eee1fd9017ff83058eca2b0e31a5af725ae48b794b49ade37a5cf5ab0a1954606eb52bd06b6
+DIST github.com-mattn-go-isatty-v0.0.3.tar.gz 3364 BLAKE2B 1df33a5e546b1e9be70dc6eba5f91b31ded363602b9cce856773e7db5d8fbe16c39a44bc4240f2c82ccfa173ec56544f2b5f408404d5fd4beb70ad2cfb174286 SHA512 60afa46beefe482bb13ab9dd0b94c45719a91d7f5d98f87452154636b520648fd900961b0df2bb3170bf42cdb62635073cfc48f923639aa2391ddccd6382fb1d
+DIST github.com-mgutz-ansi-9520e82c474b.tar.gz 4874 BLAKE2B 45ab35bdc8beb866430d3be71bf870a537cd757912dc57a00f412cf41be49ff4a35a721b70e0043739d07a770cecef408e0bbe2e6866ebaf80d246a67fcb4cd7 SHA512 893f9823f06edaeb35dbb1a19d908bd08a7d8df6527addf3d7197efeb0c2a83d85405043efd910027d472ed25cf869f4999ece4241cb546e9f648843bdd006cd
+DIST github.com-op-go-logging-b2cb9fa56473.tar.gz 35887 BLAKE2B 93c68896fedb25cebaccedf6dabd62e417b90f9b9837a4e1e9caee6a3cf46cda2f171d7d85e8576cef620c20f438300e73640671555cdfbbb2f6169d704ae072 SHA512 d11e60d7b630176c3dcb06f00ac29ec296dc4f20527224726066d19b7f8fa7e022e7842a60eb251993ea8af77ca5b9d602a1624278a00a3eb335ac7def50feb5
+DIST github.com-pkg-browser-c90ca0c84f15.tar.gz 2943 BLAKE2B 2062070872318b81cefaba8151cc27902e0a554281376947878e0512909f8b0eaadde0f2d21d4f3ad0d908e03c3c76dad4c4a6f690d13e7e13938d695c82061b SHA512 dd5c80d12970ea1d07d4a583ea90473b4c227de2fc8f68ac160decead4cdde144dcf1d1c7bd94a6f88a8b7c48e59f47e536dc6b53528892f166c29461afb732c
+DIST github.com-pkg-errors-v0.8.0.tar.gz 11344 BLAKE2B 50fd44e65872bc2c365f649b79784f1f88adf5101c9654f632fc0f96cde67ce0a839dd799b7f195f056f8cb12bbdcfa3167a54b6ffc107575d32f97e6705eb5b SHA512 82055b10c02f13a8ce497388729568ddde7ae61e9fb2592b9acb11c61dfe94d5554432aee168e7c7adbd8345511c3e4ce0ba4c1b23cf253480e199a95316c443
+DIST github.com-pmezard-go-difflib-v1.0.0.tar.gz 11398 BLAKE2B 8f317c172d615e07c92337dd814c07c772347de3fe81b952bbc4fd1a643d495cfb6ec5b694a531f2745e1601eca2d4977ea2c1202ac7fb1e3cdba31e90c4ea34 SHA512 283927de73a3d0405bbca8b5b0c24137dde2f1063539c6ce4437331ed99e732175b2a384e5a70cb9a87cc74da94f5347e2a9785fbf3e46ec2431dc5071c3f045
+DIST github.com-stretchr-testify-v1.2.2.tar.gz 101698 BLAKE2B 8280ff92a5005f9862ebfb80c6904b61105315189b6f56f087ba891dba47eaa5789a055e63c602b355c6c0c6ad68eefe3c26de9f1fac7a6dc44f9715bbbd86f8 SHA512 d925fe6c118f212868967cf1985aa70ca460bf4e3486d58be689e05ff6368485b42cc9a4ae1d5ce40eed38be45678b11d399a26000ce35d6e5ad218fc7d022ed
+DIST github.com-theckman-go-flock-v0.4.0.tar.gz 6763 BLAKE2B b59fa02376e06a553e62dda80ac327884c76958e0a23a136eb61ed01c7d153a0e981161896fbbd1c133040f7a8e32e7b07ff4b8dc63a87f328400e73266566a4 SHA512 06f7a90ba8fa74d01028f1e753fe0478b307fff8214d54f9fb572382e03561c54b6dc59ba3a459d2e6e6612a56a89474356ab417bf9afe2b93984b11fbd102df
+DIST github.com-tidwall-gjson-ba784d767ac7.tar.gz 40630 BLAKE2B 1bbacc153b676ebfe50feb0d17ce850351662a8209116422134238c13d38811b3cd19181ac53428ab682ff3d32c7681f2c650b975d11301f415a73974c98d800 SHA512 299b6e6090cb06f56450d150a0f90618def2d5ed5b69ff4d5f1f4c54c83745b08f52d4d7c4965d5bcaf1c2b83a004c02e9d139a3b232748b774cb4fa500be0b9
+DIST github.com-tidwall-match-v1.0.0.tar.gz 4278 BLAKE2B 143b216243cfc056002613caf8374542cd0f941900de1f8f0dfe78c4b4a71b389557802b0436eb2cbb06be939492bad680879896ce75fb09dc7758995f786c54 SHA512 a107d12e6400ff08696831c108b1107c56aff31af5c1afbe92e49164d55de9cab61488e3f28516acd7e2abcb83e7813588a2579af2625cee8aa9d63ac6e9ee0e
+DIST github.com-tmc-keyring-839169085ae1.tar.gz 5133 BLAKE2B d3b639d30174aec648e29d222a87c43a0e7b6023db5d8f23e5ff2e5c8b737f1ea099fb88e3d9b676685de3a79232ec0b3332c870acf2ca416b03e269c8e5e46a SHA512 d1c268681ed59312be3d60ce406fb6139bd8fef875161adc64ea8c4077feabba639fa43e752dda4d95340ba22bb4cfe9df6cff7d5f8cfc13180b5384e33cc4d2
 DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
 DIST go-jira-1.0.20.tar.gz 1292990 BLAKE2B 788dada892809df730988193e50bd1033b2efe4398cf1374c7c2a08c197e10215aa83feeb2b0573a04c7de72badf83089cd45da85d0e60a31d0fbf41615debae SHA512 f07e1fa6e24fa29a50e348490b0ebf6f3dfa1c1bcbc8420320f3c87b3fac74e6ff1d9acb8936fefb25debed2411508689f832eb19ce09f1c39657942c092220e
+DIST go-jira-1.0.22.tar.gz 110574 BLAKE2B 0d30ea3f6c29a1d903affee3d4da69d5239b1826157a5b461e008334ca18cc15d3ed47e90e02c84db459a9005e1475b7f6898b1fa60a64eb1b3c2e3c20c0d304 SHA512 533a6da6c85be585374da90a60e44caa975babc4906711fac4e2194e6213aecd4159abe7a223e4c5364a98e4a18dde098a725cf8c3ccd79a44f2ba3b00d5c856
 EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
 EBUILD go-jira-1.0.20.ebuild 682 BLAKE2B f84e1b3a3791b2ed02f85d4362d6351077c9b720d1bb10451430d718ec00d501c4c3436f8284c5f6e06c9bd0c0af53db55b6337bf337e8e44fb75badac9c9ea0 SHA512 b373767742339c8a03ba0bc82226354fa0dee314fa7a4c6d98a17299e7a343008b556e27b6e63028dfa23919fbe7cc36ef19ace34788a0fae5aedf013d033c1b
+EBUILD go-jira-1.0.22.ebuild 1879 BLAKE2B c74793154559863c85c7db999a8e393fb7eb45ce40c6ca3aec606a82cece488731563603ae18f64ba05c83c32311cb3015ddb5dacf122d9ad751fb14f39bf3d9 SHA512 4473fad4603ce3e06f9e7ac24e1b590454e9af1cf3a9efdea100fa29e100b07ca64087fddb5c1e0674aef074501a337dec2e5e99931611be2abab19969e87db8
 MISC metadata.xml 339 BLAKE2B 2b1e03ce70c1b7ff8244dc3673ce59305a6c9eabd2fc9d52209f3c85db21da04490378c95fbe647c21a0d26533d078a5b3842b4a41703a46aa670dc8dc569913 SHA512 f05c51962c3d381861ca4486baf4c1e4207c19ba87fb8113c4fd66c3a6b526ee5d9a74c98395631a7fca007fcbe2902464b02fb927dcc45b9f5ea0d4fcd96ef0
diff --git a/app-misc/go-jira/go-jira-1.0.22.ebuild b/app-misc/go-jira/go-jira-1.0.22.ebuild
new file mode 100644
index 000000000000..66a48f981c1a
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.22.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+
+EGO_VENDOR=(
+	"github.com/alecthomas/template a0175ee3bccc"
+	"github.com/alecthomas/units 2efee857e7cf"
+	"github.com/cheekybits/genny v1.0.0"
+	"github.com/coryb/figtree 58176d03ef0d"
+	"github.com/coryb/kingpeon 9a669f143f2e"
+	"github.com/coryb/oreo 3e1b88fc08f1"
+	"github.com/davecgh/go-spew v1.1.0"
+	"github.com/fatih/camelcase v1.0.0"
+	"github.com/guelfey/go.dbus f6a3a2366cc3"
+	"github.com/jinzhu/copier 7e38e58719c3"
+	"github.com/kballard/go-shellquote 95032a82bc51"
+	"github.com/mattn/go-colorable v0.0.9"
+	"github.com/mattn/go-isatty v0.0.3"
+	"github.com/mgutz/ansi 9520e82c474b"
+	"github.com/pkg/browser c90ca0c84f15"
+	"github.com/pkg/errors v0.8.0"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/stretchr/testify v1.2.2"
+	"github.com/theckman/go-flock v0.4.0"
+	"github.com/tidwall/gjson ba784d767ac7"
+	"github.com/tidwall/match v1.0.0"
+	"github.com/tmc/keyring 839169085ae1"
+	"golang.org/x/crypto c126467f60eb github.com/golang/crypto"
+	"golang.org/x/net 01c190206fbd github.com/golang/net"
+	"golang.org/x/sys bd9dbc187b6e github.com/golang/sys"
+	"gopkg.in/AlecAivazis/survey.v1 v1.6.1 github.com/AlecAivazis/survey"
+	"gopkg.in/alecthomas/kingpin.v2 v2.2.6 github.com/alecthomas/kingpin"
+	"gopkg.in/coryb/yaml.v2 0e40e46f7153 github.com/coryb/yaml"
+	"gopkg.in/op/go-logging.v1 b2cb9fa56473 github.com/op/go-logging"
+)
+
+SRC_URI="https://github.com/go-jira/jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(go-module_vendor_uris)"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/jira-${PV}"
+
+src_compile() {
+	go build -o jira  cmd/jira/main.go || die
+}
+
+src_install() {
+	dobin jira
+	dodoc {CHANGELOG,README}.md
+}
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 4f413403a237..e8ec9eb3b083 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,5 +1,7 @@
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
 DIST gramps-5.0.2.tar.gz 16706686 BLAKE2B 006c8d10d574d7fe92b661400c257f6f1bc2b2e9e27d788ca761a5d51aa8593f9d26fdccdeeb0fb2860bfe1b08d937e938b3fb21094a42de0fb306d3c16dca49 SHA512 abbf885189bedcf9897bcb3216df86af41498c94b3b9c133350e84a8a61057ab4ed4823c3923823ec99fe0be92648e9259fdceaafd31f968c7d1560a0cd859da
+DIST gramps-5.1.1.tar.gz 17281131 BLAKE2B e729183832799a66547bb3958b4892c69359ec8e506766f4c64450f8bec3bf253460850f54388fa73659243cd96679c787fbbb9d645214682df26041c43b2c56 SHA512 fee7df5d2df2ae202c5e8ff4b941df4db6675925f6fce185c0fae709dd35ecfd6a1b81c8266d3f417f4949bed4e39f984a56917e74f56a3f3e499a4353927c37
 EBUILD gramps-5.0.1.ebuild 1990 BLAKE2B 8012d40f4b7a242b1b7bb925182806af27551f537c495e2da48f6b79af71948260719e2ea9bec01aeb62d499e57938fab418c0d2929b2a25a091b1b934132ca2 SHA512 278b9b856616bb6df57807ccdfb7c89d801ac8d0f4b5e8c8cae5d6aff29ad6ab0a2ac4d8bf9f46142a0af5a8bd3ff4f3c01d8303898643f279dab34a8484fc04
 EBUILD gramps-5.0.2.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
+EBUILD gramps-5.1.1.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
 MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/gramps-5.1.1.ebuild b/app-misc/gramps/gramps-5.1.1.ebuild
new file mode 100644
index 000000000000..3ce0f03cb286
--- /dev/null
+++ b/app-misc/gramps/gramps-5.1.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_REQ_USE="sqlite"
+
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Genealogical Research and Analysis Management Programming System"
+HOMEPAGE="https://gramps-project.org/"
+SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rcs +reports exif geo postscript spell"
+
+RDEPEND="
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	dev-python/pyicu[${PYTHON_USEDEP}]
+	gnome-base/librsvg:2
+	>x11-libs/gtk+-3.14.8:3[introspection]
+	x11-libs/pango[introspection]
+	x11-misc/xdg-utils
+	reports? ( media-gfx/graphviz[postscript?] )
+	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
+	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
+	spell? ( app-text/gtkspell:3[introspection] )
+	rcs? ( dev-vcs/rcs )
+"
+
+python_prepare_all() {
+	# Install documentation to the proper location. This can't be done
+	# easily with a patch because we substitute in the $PF variable,
+	# and that changes with every revision.
+	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	mydistutilsargs=(
+		--resourcepath=/usr/share
+		--no-compress-manpages
+	)
+}
+
+python_test_all() {
+	# GRAMPS builds just fine out of tree but it confuses its test suite.
+	# The following might be an ugly hack but at least it lets the tests
+	# run properly until either I or upstream have come up with something
+	# better.
+	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
+		die "Failed to symlink build directory to source directory"
+
+	esetup.py test
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 3f4292b3cd68..a97d768b7cbe 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,7 +1,3 @@
-AUX graphlcd-base-0.1.5-nostrip.patch 3062 BLAKE2B ebcb8bf96457871e9cea6a5f8bff6e4458ff8c5f1868216645b1b5fca062904adbd3865784cf3fa260a7653e757f8e9cc534a411ed3b92cbe9f4e76ef7fccf84 SHA512 10af50a5c223cfde3248e448ec02f1160bef6b2b66e11e6fc24d3f2a5e6c40d82e9808b9c2ddf3865cd8a15223ebb7acbed4c1e4f247eaed977a18595cf9b3a0
-AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45ee4f739d44eef28ec861040ca90b105cc8fa05ca1602d984c8ec9e08bcc8007825a3f87110f18371d530d65828b1a0d163fa9a98c2832a SHA512 7665e290b4e5e46fd62186ac1ab97b8245af8d96fa73e274e07c1660dc65c51c9b8048e4e5c0e316aa8c01233e758ef84c9202cf9142b1e92b9f172559081776
-DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
-EBUILD graphlcd-base-0.1.9.ebuild 1057 BLAKE2B 2d1925c6859ad5e99bb183ae9faaa0c3ed7b2d08ef5ae710b017b4af0912c7c5d2790f34b18cac36d00607c1eb0b81b2f72f4816b3dfc09c67dd68317b384872 SHA512 63d3ac21c5980b49fd5c86fcfad5fd26323ea483c560bc987af574fd09d2edaab6767591b5b9afea3896f90233fd54e94741e0596947ce04a5b4a4cc64dbe9a9
 EBUILD graphlcd-base-1.0.2.ebuild 2164 BLAKE2B 6b4ae541c0947ff0d77864c57a7be8c2359c991b051451f8a79600c8c1f95547a84d0c90b1bf14984d779b0abd062c2e4f8dc790a4f54aedc650b6101acf1211 SHA512 c38c31b8c6a6e9653273b7803e3bd5ba393893d45d7b152052dceb38c90f7273ec82728d5c47343e6fdbfe68f540a635bed4c466021c00275289b9072be90287
 MISC metadata.xml 1077 BLAKE2B e0356b1628b9485ac746483a17cd3f8b026001676c605751f0a14b476a6f0ec37937cda4c8f6d7f4a627f7a23a68d5f5002714af5cbdfca8fa6c8ccfa43aae74 SHA512 f087452936369496699927c86029277c90cdb95504c637b118042c90726ac54b2518eab963c16b6a3deffa11ee7dcbcd2900f72af0d8a39dc0f261a4e5121fd4
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch
deleted file mode 100644
index 9973394f150b..000000000000
--- a/app-misc/graphlcd-base/files/graphlcd-base-0.1.5-nostrip.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-remove strip -s in makefile
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 06 April 2007
-diff -Naur graphlcd-base-0.1.5.orig/tools/convpic/Makefile graphlcd-base-0.1.5/tools/convpic/Makefile
---- graphlcd-base-0.1.5.orig/tools/convpic/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/convpic/Makefile	2007-04-06 20:35:17.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/crtfont/Makefile graphlcd-base-0.1.5/tools/crtfont/Makefile
---- graphlcd-base-0.1.5.orig/tools/crtfont/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/crtfont/Makefile	2007-04-06 20:35:32.000000000 +0200
-@@ -35,7 +35,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/genfont/Makefile graphlcd-base-0.1.5/tools/genfont/Makefile
---- graphlcd-base-0.1.5.orig/tools/genfont/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/genfont/Makefile	2007-04-06 20:35:43.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 	
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/lcdtestpattern/Makefile graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile
---- graphlcd-base-0.1.5.orig/tools/lcdtestpattern/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/lcdtestpattern/Makefile	2007-04-06 20:35:57.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/showpic/Makefile graphlcd-base-0.1.5/tools/showpic/Makefile
---- graphlcd-base-0.1.5.orig/tools/showpic/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/showpic/Makefile	2007-04-06 20:36:09.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
-diff -Naur graphlcd-base-0.1.5.orig/tools/showtext/Makefile graphlcd-base-0.1.5/tools/showtext/Makefile
---- graphlcd-base-0.1.5.orig/tools/showtext/Makefile	2007-04-06 20:34:29.000000000 +0200
-+++ graphlcd-base-0.1.5/tools/showtext/Makefile	2007-04-06 20:36:21.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- install: $(PRGNAME)
- 	install -d $(BINDIR)
--	install -m 755 -o root -g root -s $(PRGNAME) $(BINDIR)
-+	install -m 755 -o root -g root $(PRGNAME) $(BINDIR)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(PRGNAME)
diff --git a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch b/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
deleted file mode 100644
index cbdaf1ceb59a..000000000000
--- a/app-misc/graphlcd-base/files/graphlcd-base-0.1.9-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- graphlcd-base-0.1.9/glcdgraphics/Makefile
-+++ graphlcd-base-0.1.9/glcdgraphics/Makefile
-@@ -33,9 +33,9 @@
- -include $(DEPFILE)
- 
- ifdef HAVE_FREETYPE2
--	ifneq ($(shell which freetype-config),)
--		INCLUDES += $(shell freetype-config --cflags)
--		LIBS += $(shell freetype-config --libs)
-+	ifneq ($(shell which pkg-config),)
-+		INCLUDES += $(shell pkg-config --cflags freetype2)
-+		LIBS += $(shell pkg-config --libs freetype2)
- 	else
- 		INCLUDES += -I/usr/include/freetype -I/usr/local/include/freetype
- 		LIBS += -lfreetype
---- graphlcd-base-0.1.9/tools/genfont/Makefile
-+++ graphlcd-base-0.1.9/tools/genfont/Makefile
-@@ -9,10 +9,10 @@
- OBJS = genfont.o
- 
- INCLUDES += -I../../
--INCLUDES += `freetype-config --cflags`
-+INCLUDES += `pkg-config --cflags freetype2`
- 
- LIBDIRS += -L../../glcdgraphics/
--LIBS += `freetype-config --libs`
-+LIBS += `pkg-config --libs freetype2`
- 
- all: $(PRGNAME)
- .PHONY: all
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
deleted file mode 100644
index 7c3f216d9771..000000000000
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib
-
-VERSION="501" #every bump, new version
-
-DESCRIPTION="Graphical LCD Driver"
-HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="g15"
-
-CDEPEND="media-libs/freetype"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	g15? ( app-misc/g15daemon )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.1.5-nostrip.patch"
-	"${FILESDIR}/${PN}-0.1.9-freetype_pkgconfig.patch"
-)
-
-src_prepare() {
-	sed -i Make.config -e "s:usr\/local:usr:" -e "s:FLAGS *=:FLAGS ?=:"
-
-	default
-
-	sed -i glcdskin/Makefile -e "s:-shared:\$(LDFLAGS) -shared:"
-
-	#gcc-6 fix
-	sed -i glcddrivers/futabaMDM166A.c -e "s:0xff7f0004:(int) 0xff7f0004:"
-}
-
-src_install() {
-	emake DESTDIR="${D}"/usr LIBDIR="${D}"/usr/$(get_libdir) install
-
-	insinto /etc
-	doins graphlcd.conf
-
-	local DOCS=( HISTORY README docs/* )
-
-	einstalldocs
-}
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 )"
diff --git a/app-misc/pfm/Manifest b/app-misc/pfm/Manifest
index facfd720b322..536c510cf3f5 100644
--- a/app-misc/pfm/Manifest
+++ b/app-misc/pfm/Manifest
@@ -1,3 +1,3 @@
 DIST pfm-2.12.3.tar.gz 2272053 BLAKE2B 257fb8b4682b884e1ee850668cc283cc1fc83d2cdc1366b5186fba6d71fa08b1f4c7d10123609c4bb8c79ab25f89c25994d749df098219efb9e9547e5e299d61 SHA512 d9feeaa95a0114ee513835a9273b62164a851ae8599d27575b3545f02144b4cf970a066afd5acec03092f0d49c85929c8127d1e134d1e80c15fe6d0a9b6921fc
-EBUILD pfm-2.12.3.ebuild 661 BLAKE2B 8db1ecfb700930261978f40decec52700c607e5ed284a73bae68123ed12b14cba6187295e0764d741a89bc0ec7c3a8931e76ee690623b6d68d143a0cefef5d00 SHA512 8b7748520ad387e9ff3b4e1f57c4d91aa5c44b1fbbfa9e9838037dae2f9b349ae00531de987f7450c51995156e4536ac4dbe405731b2fd8e8749dd405ad9f351
+EBUILD pfm-2.12.3-r1.ebuild 649 BLAKE2B c0bd1f728ce41f8cd16be82426104a6dc6560070bab21cacc0e155c463c2b5eb9bc62a4bf3231ad0992f2db48e93cb7152eb9f0f3468994975e4e80ed88733fe SHA512 e69a8dc78fa5eee4d700701b71b683d78de68aa55fdd2d7a6197f01288367166656ff1b40ee2692c4d12d8009ad47ef7011b4e0b8f45b51cf8bd616e605e681d
 MISC metadata.xml 326 BLAKE2B ddedcf63628c21363e6b9f5835d5f3646c5ee32267dfe53390b4d7b9b69e6d7e7452503aef493d6814824904005ae5345cceac36abb750a97595a71069fecbd0 SHA512 74b827fb7bba6a09cbd67c07f3349b0e724bbda26f7b27cec24488a75d2dffc11415468c9bdbd12139115d8d40af137af10e51209200e5874b9f988cb27d7ce1
diff --git a/app-misc/pfm/pfm-2.12.3-r1.ebuild b/app-misc/pfm/pfm-2.12.3-r1.ebuild
new file mode 100644
index 000000000000..457e7d74b5e5
--- /dev/null
+++ b/app-misc/pfm/pfm-2.12.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+DESCRIPTION="A terminal-based file manager written in Perl"
+HOMEPAGE="http://p-f-m.sourceforge.net/"
+SRC_URI="mirror://sourceforge/p-f-m/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~s390 x86"
+
+BDEPEND="
+	>=dev-perl/File-Stat-Bits-0.190.0
+	>=dev-perl/HTML-Parser-3.590.0
+	>=dev-perl/libwww-perl-5.827.0
+	>=dev-perl/Term-ReadLine-Gnu-1.160.0
+	>=dev-perl/Term-Screen-1.30.0
+	>=dev-perl/Term-ScreenColor-1.200.0
+	>=virtual/perl-File-Temp-0.220.0
+	>=virtual/perl-Module-Load-0.160.0
+"
+RDEPEND="
+	${BDEPEND}
+"
diff --git a/app-misc/pfm/pfm-2.12.3.ebuild b/app-misc/pfm/pfm-2.12.3.ebuild
deleted file mode 100644
index 0d060d619cce..000000000000
--- a/app-misc/pfm/pfm-2.12.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-app
-
-DESCRIPTION="A terminal-based file manager written in Perl"
-HOMEPAGE="http://p-f-m.sourceforge.net/"
-SRC_URI="mirror://sourceforge/p-f-m/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 s390 x86"
-
-RDEPEND=">=dev-lang/perl-5.8
-	>=dev-perl/File-Stat-Bits-1.10.0
-	>=dev-perl/HTML-Parser-3.59
-	>=dev-perl/libwww-perl-5.827
-	>=dev-perl/Term-ReadLine-Gnu-1.09
-	>=dev-perl/Term-Screen-1.30.0
-	>=dev-perl/Term-ScreenColor-1.130.0
-	sys-libs/ncurses
-	sys-libs/readline
-	>=virtual/perl-File-Temp-0.22
-	>=virtual/perl-Module-Load-0.16"
diff --git a/app-misc/pip/Manifest b/app-misc/pip/Manifest
index 97bfd7558277..e3cdbaf58bb0 100644
--- a/app-misc/pip/Manifest
+++ b/app-misc/pip/Manifest
@@ -1,3 +1,3 @@
 DIST pip-1.2.tar.bz2 17752 BLAKE2B e6a9c5467cfeae9a24d181fb16bd8dbb259250fb5f54add810f8e3fdce90d18c251a1c6e72e827b13dd52a40e578ac013d5e71725be7efac97944a6268237f13 SHA512 a09695a881585baea292d305c3e0dc4ed7d5ccc0cb8138f402d73e75bbc6d014e09c3b3091f6b92be97a8034c262bd98cebf71e08cc7c44e635483bb31a40a29
-EBUILD pip-1.2-r2.ebuild 594 BLAKE2B 0c98a4fa7e37beaa86d57a21fd93207c505ba1b4bb5ae15ad030050910d5739b40a9098b804b716e75280f8d7808190ea34081c78e2dd6bcb564591f837b8714 SHA512 8de15e038d81ed660c49ca6d6cc39eb4dca4b95da88270a5753ff7e41c2d722bd41bdf402f34a9e680fe077827056afab85e5091614118c19ab79b342d717c2a
+EBUILD pip-1.2-r3.ebuild 661 BLAKE2B f76358ac6065ebe166bdd4313d66f54a9331b20f5e5304f7d342a8ce111740dd8332c557f91ac625c1413c0023e7423b354c29ba666c9e22ffa42c474e41b2a6 SHA512 8a92befabd15f842823d2f3f53baca83ffa975fc242c7773b8887e2aabba82e0f95b2d63ed3cb07208c4295767a0e5a40adcbd4efed28324f163d0ad814753f4
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/pip/pip-1.2-r2.ebuild b/app-misc/pip/pip-1.2-r3.ebuild
index 4455eec5191e..d297e51db44f 100644
--- a/app-misc/pip/pip-1.2-r2.ebuild
+++ b/app-misc/pip/pip-1.2-r3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils perl-app
+GENTOO_DEPEND_ON_PERL=noslotop
+inherit perl-module
 
 DESCRIPTION="Wrapper around programs that don't support stdin/stdout"
 HOMEPAGE="http://membled.com/work/apps/pip/"
@@ -14,6 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
+
 src_install() {
 	perl-module_src_install
 	mv "${ED}"/usr/bin/{pip,gpip} || die 'rename failed'
diff --git a/app-misc/qcma/Manifest b/app-misc/qcma/Manifest
new file mode 100644
index 000000000000..4aa3ff2edc80
--- /dev/null
+++ b/app-misc/qcma/Manifest
@@ -0,0 +1,6 @@
+DIST qcma-0.4.1.tar.gz 239952 BLAKE2B 342272cc1bab74e34f545ed7c54b7f12732723e55f53224b16a2525bea161f49d4ec799e1e1f868af63067f3021a73389eac581299582a9410aa372e55ea265a SHA512 d061c43528dcb5b361f5e3f7cb303926df29f86f22603a9bc25326c1056344478dae6335d5f82d3f2e56ce98154cb5b1b3e94a3ab1128d7c79d42f8bf92fc7ec
+DIST qcma-0.4.2_pre20181227.tar.gz 244336 BLAKE2B 5a7a33384d4c73050954901e8e8f31ac72d4a2e1ae285389197eedcafe2c9f5d035588bbd330ba72c20048bd889b483259ab5824ad1ba7bdee7351b848ab2e12 SHA512 3379b5b804c169f3dcc1bd3079cffbaa016248631e69563d3e509dcc4de198f259edc5a69bcea4f65cfa16c366d1a2919bdf7aa6703b6648a6f218e9d58f806c
+EBUILD qcma-0.4.1.ebuild 942 BLAKE2B 46dbbaad37e7213b9f1be161318df1a33fd1db83161cc080c4f020410e0edb67465b22e27a31ee8dc85a5c7597f453903329df9a0cc64376d08327624c83fb3b SHA512 5ddcc125f584614ec7d4cfbc67d932ab9e2bc212e30c46f7c9980e7ea6d9e9dfc9c2bba5b0fb447a897b56755aa9dcf1c37dcf5a5bcac71199120650403956a5
+EBUILD qcma-0.4.2_pre20181227.ebuild 1017 BLAKE2B eb3dd5f777c425365ed2053dae32f59fa8f0605787aea99b10e52c86c98f68cdc9e2501d320cf03b3b2cdba0d514371f25f4c8de0f7eeb6035e78f05e3ea907f SHA512 0616dc4d6e2d4717e5de542f00069ba28be193dc56f76dbfbe799ae000dfa3c0b38727c79e5bd9d7017d361dca938c3a1c46039147914091891775fcc2a594cc
+EBUILD qcma-9999.ebuild 888 BLAKE2B 60914b30ecf6a12d8723795e2fb21bf4f137f639eed8d599d4e44134ee9b244297344db623575040158cd92669ab29d8b56c99758ccec433427f3e1cd94737b1 SHA512 b55b80ca481d111a11b4721a24441256b8c8725084e20178598a37f99984f880e19374f6c7cc1c5fe07fabf65ca074603a8af6ea23d76884924f450f2e1f2e46
+MISC metadata.xml 442 BLAKE2B decbd7d9d4961c0750267cd1a52f4c269e0cbe9ecf50af99d515d908346e581e26b93dcde20e7c94b769b8ff8526213f209a96608ca35d8e561ba7d087bca354 SHA512 c7fd8f8df81d3d7077de804b688e6310f62a86ebb223e4686334e201503e480f5bf5f7cb151a5086ab9cc5119897d37a7c794d79bce7e73ad98dcab3888ead1f
diff --git a/app-misc/qcma/metadata.xml b/app-misc/qcma/metadata.xml
new file mode 100644
index 000000000000..1587fbdb1e91
--- /dev/null
+++ b/app-misc/qcma/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mva@gentoo.org</email>
+		<name>Vadim Misbakh-Soloviov</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cross-platform content manager assistant for the PS Vita.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">codestation/qcma</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/qcma/qcma-0.4.1.ebuild b/app-misc/qcma/qcma-0.4.1.ebuild
new file mode 100644
index 000000000000..865bbcb3f107
--- /dev/null
+++ b/app-misc/qcma/qcma-0.4.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Cross-platform content manager assistant for the PS Vita"
+HOMEPAGE="https://github.com/codestation/qcma"
+SRC_URI="https://github.com/codestation/qcma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ffmpeg"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	media-libs/vitamtp:0
+	ffmpeg? ( media-video/ffmpeg:0 )
+	x11-libs/libnotify:0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools
+"
+
+src_prepare() {
+	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
+	default
+}
+
+src_configure() {
+	lrelease common/resources/translations/*.ts
+	eqmake5 PREFIX="${D}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+}
diff --git a/app-misc/qcma/qcma-0.4.2_pre20181227.ebuild b/app-misc/qcma/qcma-0.4.2_pre20181227.ebuild
new file mode 100644
index 000000000000..2e59784ff9cf
--- /dev/null
+++ b/app-misc/qcma/qcma-0.4.2_pre20181227.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils vcs-snapshot
+
+GIT_COMMIT="65f0eab8ca0640447d2e84cdc5fadc66d2c07efb"
+
+DESCRIPTION="Cross-platform content manager assistant for the PS Vita"
+HOMEPAGE="https://github.com/codestation/qcma"
+SRC_URI="https://github.com/codestation/qcma/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+ffmpeg"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	media-libs/vitamtp:0
+	ffmpeg? ( media-video/ffmpeg:0 )
+	x11-libs/libnotify:0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools
+"
+
+src_prepare() {
+	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
+	default
+}
+
+src_configure() {
+	lrelease common/resources/translations/*.ts
+	eqmake5 PREFIX="${D}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+}
diff --git a/app-misc/qcma/qcma-9999.ebuild b/app-misc/qcma/qcma-9999.ebuild
new file mode 100644
index 000000000000..7c2734bf0313
--- /dev/null
+++ b/app-misc/qcma/qcma-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils git-r3
+
+DESCRIPTION="Cross-platform content manager assistant for the PS Vita"
+HOMEPAGE="https://github.com/codestation/qcma"
+EGIT_REPO_URI="https://github.com/codestation/qcma.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="+ffmpeg"
+
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	media-libs/vitamtp:0
+	ffmpeg? ( media-video/ffmpeg:0 )
+	x11-libs/libnotify:0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools
+"
+
+src_prepare() {
+	rm ChangeLog || die "Failed to rm changelog" # Triggers QA warn (symlink to nowhere)
+	default
+}
+
+src_configure() {
+	lrelease common/resources/translations/*.ts
+	eqmake5 PREFIX="${D}"/usr qcma.pro CONFIG+="QT5_SUFFIX" $(usex ffmpeg "" CONFIG+="DISABLE_FFMPEG")
+}
diff --git a/app-misc/resolve-march-native/Manifest b/app-misc/resolve-march-native/Manifest
index d362f87251d8..ad41a50b754b 100644
--- a/app-misc/resolve-march-native/Manifest
+++ b/app-misc/resolve-march-native/Manifest
@@ -1,5 +1,9 @@
 DIST resolve-march-native-0.9.2.tar.gz 7729 BLAKE2B 21cd69ee529b732f48db37616291757235792648d1b800a8091b091c83f4ccb523ec4e4576a4a34f6d85d91899c4890431cf41bae5c8641de06fbbd4fde301fc SHA512 918290cf0858c16f4a3730aa169768782af9f329a901e70db944172bc47c78ea18c07c448742a0c0c611951a3f50dee85cd6ffe8aba407cd40eef6f5e28c5b29
+DIST resolve-march-native-0.9.3.tar.gz 7780 BLAKE2B db86a0fe9ff92fc0bc45b94ff36bb4474b27f49098ff6f861fff5e6bb11c8a66a5f277fc0751abf444aeeea4eaae7e512a69215137e0562002b0c829980fd230 SHA512 045d7ab3cb31e309b0db8f5bf3d304334eb35841af05a9ca7694bf7077e693f923955cbcc16955b0cef68ad315b29615c6921a741b311157a3101eb8608ee5e3
+DIST resolve-march-native-0.9.4.tar.gz 7829 BLAKE2B 16c3492185c89c7a4dac48c4f9d9ce4ff6ca6ed794cf826cb141cd83936c2762db43d1d7b64fa6f39e1216b4738a58c35a07d9df7a78dbd061de636b7b181fed SHA512 b73e34c9f957dd3f8941b7db25af88b32cc1f67e4384c97034a310b98e6f6e6645a583ec567f8b1547bea41e072fcc20189017930a172781061d741839c5a9b2
 DIST resolve-march-native-0.9.tar.gz 7688 BLAKE2B 78ef662691071b480fd382a30024f9fc73ed8f7b22b3a814237c99139d3ba6d22f348ead7c413d199875ed74768618ac97d897204a7f633977a5c5bd8726154a SHA512 2079153a1d7f8f352baa1a0000d9e120d976bca8cef2a81dde85ba1689a260fb899c8b6d97f9cd79dda41c5b67b9fe76bfdf0fc5bc88ef09d2915a29f3ed33e2
 EBUILD resolve-march-native-0.9.2.ebuild 486 BLAKE2B dc0a9990c7da42847d560aa4df84c2edb6fc720d13b3090358e82c9e228b1b1e7c12d1bfdc2e47d30f00e9453d35334fbe71d5fab23a57e4fe1e98b0a38b870c SHA512 a591cec96d1bf8900df12e33f455ad1979fcee82f976248d2864a12ab9336175bf9cf3bfa18ebff05fe4964cb825aa66326e5dcc1e33b0a64bef133ab82a9fde
+EBUILD resolve-march-native-0.9.3.ebuild 502 BLAKE2B 78461bff40938bf11bdb90d8468f54796ed299a1a4d0cc8d6f286f5e33baba23e4404806b9007139511d95dbc65ebafaaa54c12e89d45f59a2f3e5bcc143ac81 SHA512 2378880e8969327db1409d020f29796bb65a32162a638bd7dc38b86d7803fb5666a9d6539541220d576d1489340339a2ea6ca8476c6e44667d71a88464dbdbeb
+EBUILD resolve-march-native-0.9.4.ebuild 502 BLAKE2B 78461bff40938bf11bdb90d8468f54796ed299a1a4d0cc8d6f286f5e33baba23e4404806b9007139511d95dbc65ebafaaa54c12e89d45f59a2f3e5bcc143ac81 SHA512 2378880e8969327db1409d020f29796bb65a32162a638bd7dc38b86d7803fb5666a9d6539541220d576d1489340339a2ea6ca8476c6e44667d71a88464dbdbeb
 EBUILD resolve-march-native-0.9.ebuild 442 BLAKE2B bc0d1a73c4e58c75a7ce0ea00bd152218781602a225a6fb895d112addc71015ecac6ccc6a9ab86c4bc5c37306ca9f22c8545a99a72ecc5de19521b16b470d85a SHA512 399cd94d773ec28b5dd53961c290aa6a9c5a0a99c089df3f4e348cc877876f0b0c0560a97eaebca104c954b61108a510f71060909dd9f11d003e0beef248b24f
 MISC metadata.xml 343 BLAKE2B c2ce3c2f5c54a08cede40b51e58afb974f563d9729da5f9e33ea9650615bdd7c206661d8ca5511ee6a039b59b50d942d82334e86275e80cf5e502e0235c865e9 SHA512 46c1ae61e1cadebfbca360b2729a957c9b2830f502ecc559cee6de1e46de3526788eb5d53cdcfab173a55a575ba3f1b8d0da58baae2027d7815d53f4ba67b813
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
new file mode 100644
index 000000000000..c2761b473b9d
--- /dev/null
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Resolve GCC flag -march=native"
+HOMEPAGE="https://github.com/hartwork/resolve-march-native"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=sys-devel/gcc-4.2"
diff --git a/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
new file mode 100644
index 000000000000..c2761b473b9d
--- /dev/null
+++ b/app-misc/resolve-march-native/resolve-march-native-0.9.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit distutils-r1
+
+DESCRIPTION="Resolve GCC flag -march=native"
+HOMEPAGE="https://github.com/hartwork/resolve-march-native"
+SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=sys-devel/gcc-4.2"
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 5c6e1a377378..074834b7efe5 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,4 +1,6 @@
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
+DIST screenfetch-3.9.0.tar.gz 77670 BLAKE2B 9d5710f93d7e5614add98e303eee7bd13753af3aab8e5e266a09bd0a5a126d2056075364cff23428436953afd2bc840735362dad631f5001e08de797d2274fc7 SHA512 ff99dcf6f6276f54d88d05f6f6bdb82cd8c1e7e74befb60786993118c543550929090ba710142df7793112f7253dc415a031715bd6f85f2625260d281ffdc817
 EBUILD screenfetch-3.8.0-r1.ebuild 669 BLAKE2B ca0a711dc8bb9a75020635066cfe41b42c56a9027e6f537b79edd6c22e06641c9a8b4292da7f2c62462c62258e4e64c432a8ff2ab9ebf5b2a97ece10fbb27e6c SHA512 f09e0fc6e505d94fb1d6cc82081157ac8bfb40a9fb5e2e9c34a6dbae21bbf2b8ab57ac6832bcadad9c5b69b2f90260442c945803b7afd088486d60e56a157e4b
+EBUILD screenfetch-3.9.0.ebuild 671 BLAKE2B 2d008b74395244174537713a17b82aee64940f64b9a75d1a48188ae4b70ae00dca1b31f4fe8831b51e915c3d5a7f98813aa8daf264d2fcf8362110b39aebc332 SHA512 21b8540103086070383681811e5d3a7abecde478d6e1545d17a64e960899231a5ac115555e11acd0589fd176a4b79ff95f9e26c91b92dc3f697e8f59f475dc80
 EBUILD screenfetch-9999.ebuild 671 BLAKE2B 2d008b74395244174537713a17b82aee64940f64b9a75d1a48188ae4b70ae00dca1b31f4fe8831b51e915c3d5a7f98813aa8daf264d2fcf8362110b39aebc332 SHA512 21b8540103086070383681811e5d3a7abecde478d6e1545d17a64e960899231a5ac115555e11acd0589fd176a4b79ff95f9e26c91b92dc3f697e8f59f475dc80
 MISC metadata.xml 433 BLAKE2B 50f5c928a8db5e71033fd780bd2ea13af87d8d14d83b694ff6765fc65ca3f7313c53de0a22ee5cdc0ed4ad88c754a0ccd750e59e46cfd1456b4ea185162ae1df SHA512 d07492a28cab27bba43976cc18148cde296f7e3a5ec76f06f066812b085c8b1a2b7ba9ed0a5eeea7aa838b052f177a2fde0a99ff5ff5ef9a46c4c0553cf012e0
diff --git a/app-misc/screenfetch/screenfetch-3.9.0.ebuild b/app-misc/screenfetch/screenfetch-3.9.0.ebuild
new file mode 100644
index 000000000000..09b465b4c1ac
--- /dev/null
+++ b/app-misc/screenfetch/screenfetch-3.9.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/f/F}"
+
+DESCRIPTION="Bash Screenshot Information Tool"
+HOMEPAGE="https://github.com/KittyKatt/screenFetch"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="curl X"
+
+DEPEND=""
+RDEPEND="
+	curl? ( net-misc/curl )
+	X? (
+		media-gfx/scrot
+		x11-apps/xdpyinfo
+	)"
+
+src_install() {
+	newbin ${PN}-dev ${PN}
+	einstalldocs
+}
diff --git a/app-misc/tmate/Manifest b/app-misc/tmate/Manifest
index 6c909f481ae4..bcb9bd2f7dcd 100644
--- a/app-misc/tmate/Manifest
+++ b/app-misc/tmate/Manifest
@@ -1,8 +1,5 @@
-DIST tmate-2.2.0-upstream-patches-0.tar.xz 6784 BLAKE2B b21a2065ba7a7832238cb6b6bbfe3e730593766a34244e139d0e357cad538a4462e68a9e884a6250fc72a10a775fa13e53054618c35804cc05ad0cc31854d9e3 SHA512 3e16e0b7988d3d1942fcac0a535d2cc8d7156d26332dc84fd21c4761afae40159282b0fbeb71cd5f6525b5a1c7a46e7813c8e6a11851592077570c1a001a73a7
-DIST tmate-2.2.0.tar.gz 610793 BLAKE2B febe2ed652e8387f65d938f09c6abbd92841a71a285035f6322bcf786aa4f80f71a0f49fc475743a8565bf4c7e434d9f503ffc6bae26d531429b1c58bc0ffbe9 SHA512 e9429833cdb8c28873d01bfc6b9a0d1241e30346ef1b3efae6763389c8444943b831283c1ea65e49c68d11936d6586186b38e0f7c14d373d9f63e841026c3338
-DIST tmate-2.2.1.tar.gz 610745 BLAKE2B 8a97d7726b528d12e14c74c07f795b18510a4b7a0068f1e1168b06e2a6856945518b3b9a35f71ba8598b8f9390d754443eca197f95f5c9c61d6160f4008ff65d SHA512 3d4ce7510cd8da39bc4fe63f2a64179846a813bb3560ca811d9e1e2a28b06d95a9033047a900d76bda069c249d7ebbe1143daa082b23212c5d32a50bf1819d2d
 DIST tmate-2.3.0.tar.gz 611262 BLAKE2B c4e789b20fbfb1736eacbf36f368d8ceb573937ed2c72f2b79b8da175a811985af12d9823fdbade9ee3f72bfb43427e8fa64eea75ba5fc3cf64273c31856d4d6 SHA512 b7de8f28ab5ee8ea389d4882ed64de3d71bd53d626ae6bf323d5be732066e63a7dba2a85318c0202a088af53df7e0d976256c1253895ad81739d270ee65d0eb7
-EBUILD tmate-2.2.0-r1.ebuild 1192 BLAKE2B f3af176ed3e72e976801e6710aa09e4fd3c1ec0ac9dcf2f7d287263c69339a03c36ec82bb31fc5bafd3b83966d392f6d1f57eff6277048669723c833c1558777 SHA512 3c37820c3ad97c90fed4a3cce146ef302dfe1f6eb00615cfe9eb8ec3e2de900caa59587136155ed2ae64e86a2c3ab3ac90a15c73f57e704bf853cf3649eee1d2
-EBUILD tmate-2.2.1.ebuild 1191 BLAKE2B 29f44defa32bc9a39e9f6122cfb2362ca8935918f23e2154edc514b67fa55807fa81b3c3c5a1bc1278ff852f0a6ef28f0b1883c2a635ef0743a6c008fcf5d788 SHA512 33df330f7aef0168a338d48a51e57066d304b100046bca6fa02b239712e58063bf6990dce9d60c0be75abaf85ed61f409cac3dc775afe0a2b575744f0b03b785
+DIST tmate-2.3.1.tar.gz 611136 BLAKE2B bbcfb137cb9e712bbe3c36b2d57e6f1ea5a68c884e6e6ccd252315bca689b1bbec7a53cd131f0f36a6bab5b1defd3acb26bb458684894c81d676d2585db4790b SHA512 98531e3a3c1cc4da11894e8298df560fd58f1ede6a81ac8cb5f8cbea86f5c21672a016977dab801ec06e14f6c718a64599a9e32740934fcd4c0a155f92710520
 EBUILD tmate-2.3.0.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
+EBUILD tmate-2.3.1.ebuild 827 BLAKE2B c1ccaca2b5ef4569d59838755b1826a8677454d89291dc768b39ee77a86040a8b54940b67a7bfbe291409a1d8ce9ca3572cb84dafaa409e51ef4defe4edadc19 SHA512 6a7548e1f248b2c22b5478a10734294ab6bd48f237e2d8c56308b733f5d7748883598ccec390a8432034726561a15d1e876f1783c0fa3122b7dce56d55960dbb
 MISC metadata.xml 329 BLAKE2B 4b983e08fb7a5704f11c7e07e91a322258b128d5a2826fbea1f62718b83daf71552d63304df6e0995a68ce33e05bf3e276aded270a004a95a43fc8f98501744d SHA512 0097a64f483d6b8a24bfa5006f6df9dbeb697ee04152f5451111449d69d54813ff6f474e8fc91b33a2db2e0ba6ad85d25b359ef6684a74c884d2bcf16cfa9e75
diff --git a/app-misc/tmate/tmate-2.2.0-r1.ebuild b/app-misc/tmate/tmate-2.2.0-r1.ebuild
deleted file mode 100644
index 22a9a0bf3174..000000000000
--- a/app-misc/tmate/tmate-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit eutils autotools-utils
-
-DESCRIPTION="Instant terminal sharing"
-HOMEPAGE="http://tmate.io/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-UPSTREAM_VER=0
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-RDEPEND="
-	sys-libs/zlib[static-libs?]
-	sys-libs/libutempter[static-libs?]
-	dev-libs/openssl:0=[static-libs?]
-	dev-libs/libevent[static-libs?]
-	dev-libs/msgpack[static-libs?]
-	>=net-libs/libssh-0.6.0[static-libs?]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply tmate Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-misc/tmate/tmate-2.2.1.ebuild b/app-misc/tmate/tmate-2.2.1.ebuild
deleted file mode 100644
index f4cfc6999c04..000000000000
--- a/app-misc/tmate/tmate-2.2.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-inherit eutils autotools-utils
-
-DESCRIPTION="Instant terminal sharing"
-HOMEPAGE="http://tmate.io/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug static-libs"
-
-UPSTREAM_VER=
-[[ -n ${UPSTREAM_VER} ]] && \
-	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
-SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${UPSTREAM_PATCHSET_URI}"
-
-RDEPEND="
-	sys-libs/zlib[static-libs?]
-	sys-libs/libutempter[static-libs?]
-	dev-libs/openssl:0=[static-libs?]
-	dev-libs/libevent[static-libs?]
-	dev-libs/msgpack[static-libs?]
-	>=net-libs/libssh-0.6.0[static-libs?]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# Upstream's patchset
-	if [[ -n ${UPSTREAM_VER} ]]; then
-		einfo "Try to apply tmate Upstream patch set"
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		EPATCH_OPTS="-p1" \
-			epatch "${WORKDIR}"/patches-upstream
-	fi
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-}
diff --git a/app-misc/tmate/tmate-2.3.1.ebuild b/app-misc/tmate/tmate-2.3.1.ebuild
new file mode 100644
index 000000000000..bdddbdf93b17
--- /dev/null
+++ b/app-misc/tmate/tmate-2.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Instant terminal sharing"
+HOMEPAGE="https://tmate.io/"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libressl static-libs"
+
+SRC_URI="https://github.com/tmate-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+RDEPEND="
+	sys-libs/zlib[static-libs?]
+	sys-libs/libutempter[static-libs?]
+	dev-libs/libevent[static-libs?]
+	dev-libs/msgpack[static-libs?]
+	>=net-libs/libssh-0.6.0[static-libs?]
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 0025c4fa4652..5493f599644f 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -8,6 +8,6 @@ EBUILD tmux-2.7-r1.ebuild 2095 BLAKE2B 312426a0dd7859592493317b0e0d04d06d3737a45
 EBUILD tmux-2.7.ebuild 2116 BLAKE2B 6f4506f20999fff4c87989a8e1a74d83791108a22dcf68693a84654d41a2764e029931bc9e779cd2c59354533d53d7da0ef9cfec1673f3b6ae33850c44c28076 SHA512 2c757e1c617758b401fbf6df06c740d4bdfc513b7dfa45b12c31c29e2461538c0b85e0056dc0377fafeb8cafce94533b9e2558f7ae7245d24f54dc62d41eaade
 EBUILD tmux-2.8-r2.ebuild 1977 BLAKE2B 747a0698a1c703de04b84aeefc9d8a8e4bdd167577d65505a91945d1bc7bcaaff570b6f69fa51578c1b56059012800d315efc3989343596d17e9658b23a1e6fb SHA512 86c1a5141c46daaa5272399e0ffe9be4ce29fcfe6f25f149bb1e73c17441ae3d717346907c05c23bdbb92d221fb301f6695cbb46b9758adbaee8d8020af0171f
 EBUILD tmux-2.9.ebuild 2321 BLAKE2B 339f8e6e3ac494c37c1a751c2a1cf3fabb9d6d49cc4233ed02018dd5168133d4297cf014979385810b9f8ff0e8b18e3bbcc2c3a29bb0014e7b070e85f1cabd5d SHA512 26a41df6ec0798ede92dca4dcfc5c400f7d2ff8f6cc625fe9bad87f57692470261cf309b8bbef058f3a36d83ad84a82a67186d784d1084a41af15ddbad4eaa77
-EBUILD tmux-2.9a.ebuild 2305 BLAKE2B 45fdd0930f9dc95f1a434eb2c9219b3173c0f4cd2f00a94dede83aa9fc355bdeda9a355b090e60ea0849e08867b98b018300f8401404fd5e358eb76963da420e SHA512 369603353bdebafd0371472e881f4c3fe90dabfb6b89ff02986930773c6caf5f6c781fcb008b1e8f67b0ce88fafa7e900aa75be2ff4cc1d13d66e127b8e62d74
+EBUILD tmux-2.9a.ebuild 2304 BLAKE2B cb0fa73a6037ed21d08ea7eaf769077249b898ecd325a687337c03c2a9ca4c0f45c2b0317825b192ca63bc33db6eb18d36cd04f4bf9af6d20f4a43621adf9e02 SHA512 9fcbe33fe2704764ff494f1cb8b4a34af83402f0a544212d5a12d89d4aeefa9d14119550dc12f876b71d313a124e3b77472f4c70c0d6216a09562721b2a5f521
 EBUILD tmux-9999.ebuild 2316 BLAKE2B af43a63f58a79848de0ec6f00e5a945fd463d225afae30d81ecb33766bfd0a2d111fafc363c05eb85076b3216e4956589c0062c3aedbe0f62370022036e44346 SHA512 f6097f8e6a66e9c5705a8f33f8fd0c9f02e9e584245d2318eeb971f5fede131361d2bfb690da2a5f300668edb2d6ccc84de17ed3ade83bb6f0b07c5eef1fcb43
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index 9a6980c0acfe..2f279e119314 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index c1520fad5f7e..c3e80362247b 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -6,5 +6,5 @@ AUX 2.1.8-vala-0.44-compat.patch 1597 BLAKE2B d26e88039d9aca0544c5e5fd510f8b5d52
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
 DIST tracker-2.2.2.tar.xz 2792104 BLAKE2B 654dd5a6e4d8ea8a47d209f747e0dd4e02b7f6c862c4dedd92edf271cf3645b2a7d3f956f6aba5bf104df9972bc287b49a40d77892cb9a65e40c1007f5e3ca6c SHA512 2c18c324d4d98fb62bbf21eac8f647bd34463cee4d9f71d411e22d695fc28cc0c5334e2d41517875a5741213d9405e768f3efae6a8a4a8e72d01563c335f47a7
 EBUILD tracker-2.1.8.ebuild 3048 BLAKE2B f527d63e3ec0329a3f8cd4aea893d75af331ffb1e6a7f1917eea077c3315d2f4ec015c6a5f4e73923eea906bc865ad5d05a9ebb1a32d5437780d79c673b2dabe SHA512 2ecbbd4d9132ea0ed5ea344e737dac175ee257f167227bf5dc8526f0f5b5b1bfe1b85c534e469eef29db79abdd8dd0dc5ca876858d8c4e0f15ea63293cbd6bb5
-EBUILD tracker-2.2.2.ebuild 2567 BLAKE2B bec3a46352daccfb286c8a79d257cd52517946c30df0b5ae18f7b64d567011fb0b602ec7df8a99546ea588ce042cd23f7cf562c67e348c26c26796f554f9c813 SHA512 e9502f2f39271d501f613b6bf0f5583b599babcc072f71a6e24f87de98c41e91c1fefe3f52cbfb929672100336519ba9afa004d50c989553b4f2b010def37497
+EBUILD tracker-2.2.2.ebuild 2595 BLAKE2B ecdced5a62924ef6732bf3aa0b8bb3430838d416544a8c17ff7eec1d826d7a351ca68f056ec84b03326b984a3f6db7e6b2f2ef8aa7d500f6766ad04f321bf932 SHA512 6fd5e1ec34cb32587b6dc448ad36b3db485d449ce92c3fc855a448088bda7b885798b50dafdd49942b833d4bbaf3d68552be2c6a5a8c704413eaf281fa887107
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.2.2.ebuild b/app-misc/tracker/tracker-2.2.2.ebuild
index ea0f9592c917..83eff7211bab 100644
--- a/app-misc/tracker/tracker-2.2.2.ebuild
+++ b/app-misc/tracker/tracker-2.2.2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
+VALA_MIN_API_VERSION="0.40"
 
 inherit bash-completion-r1 gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
 
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index c17f47a3fbf8..789391ca7784 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,5 +1,7 @@
 DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66 SHA512 ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a
 DIST yq-2.7.2.tar.gz 14010 BLAKE2B ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f SHA512 0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43
+DIST yq-2.8.0.tar.gz 14434 BLAKE2B 1389a4e5df3a5e23fb9d9fad17f7f62b7ce85af917b5a29169ccad71c47d856658ac2fe649df4e98a9980e2548b1170ef468d150d6d84b121f093bd374746e69 SHA512 aca4aea16d80947d030c4c98cfdb431bc8bb25cbbcd388decac84842f7107617b31ef5dd25f409b90094a28452e6623734f7293c16ed75f0e8758b2d53820a09
 EBUILD yq-2.7.1-r1.ebuild 1013 BLAKE2B f39627b1837f831abef226a3aab6af871152cc91127cbdb655b77007c9a961b396f94bf0a0a2069a1d279cdf82c64ea5e6192f406c589457c2481be80a6288de SHA512 7f50f7e0a789c4f9535446017c0e204ec1640ea3635d7b79194702b24e6f53082bc4822fd2194883384b0d02a0990d3da3c6331d3ff980dd3d4b91a4195fcff3
 EBUILD yq-2.7.2.ebuild 1015 BLAKE2B b43d4715abfd258f23250c3e4a7a2abac1b9ae18df4a30b192fced01937493cba60c6603d612ec0036b1c298850783b9f09d244d602a3a6aa3eff2507236ade4 SHA512 a13faa51953d299c5bf44a3723d61947f40724a37327d797d2aeff1ab129ac5e3ffb6c1dbdd4fd3ba4fea366c425827dfa0a2829cff5d5b73c1fe369c0ab7d6d
+EBUILD yq-2.8.0.ebuild 1015 BLAKE2B b43d4715abfd258f23250c3e4a7a2abac1b9ae18df4a30b192fced01937493cba60c6603d612ec0036b1c298850783b9f09d244d602a3a6aa3eff2507236ade4 SHA512 a13faa51953d299c5bf44a3723d61947f40724a37327d797d2aeff1ab129ac5e3ffb6c1dbdd4fd3ba4fea366c425827dfa0a2829cff5d5b73c1fe369c0ab7d6d
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.8.0.ebuild b/app-misc/yq/yq-2.8.0.ebuild
new file mode 100644
index 000000000000..7dc084a4b39b
--- /dev/null
+++ b/app-misc/yq/yq-2.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-misc/jq
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+		-i test/test.py || die
+}
+
+python_test() {
+	./test/test.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index ec691207e6a7..cd3ea91607e7 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -4,5 +4,5 @@ DIST ytree-1.99pl1.tar.gz 122996 BLAKE2B 2e40cca19cf9c9c3726e877bd05158acb34f732
 DIST ytree-1.99pl2.tar.gz 124601 BLAKE2B c0cdabbdcc46169edb64c52bec737e51e1dbe4d70ff58eb6ad414fbdfa08a57027ea755609b31d098539e17d4ec9794a384bf0f5b9d655157de597503b880c3b SHA512 a82c897a0ba6c744a213bd04d8d1a2032419761f4a0948e0ca605ee0eacb8a477b960bc7485cd72dca2cfc3e4844bfca0082e84d2cd78eca8d996222e5b414c5
 EBUILD ytree-1.99_p1-r1.ebuild 702 BLAKE2B dcb280f1f0e436a787273509f1141e34a1b6b425995231ebd021792bfd8b7fb71666d7f40996fef1e473adc3e6ea5a639d0d7726523518bb82e0df51eaa814c5 SHA512 2261faeafd3d3753f83f84907cf2e65ec4c02189dde87836b220de7f7300ca83792040221cbb558907512761c2bca10aabebfc0f6d0a1399f9fffd8bd16fa300
 EBUILD ytree-1.99_p1.ebuild 642 BLAKE2B b4dffbcb98eae5f27b36d51772c091c3faa26bf56a85a0564556425d8fa55a48cf026e7f694665d4cba7bfc5ceee378a43617f5b81175e1dd9e323ec4d18d5da SHA512 19c27f5f852bfa4dcdaf25163160a9af3710907a4ade674faad5698f3ac6484b6f2110078b9383ac79b9687898a7910ff10f347d0ad89ec46c86031cb8f62e4d
-EBUILD ytree-1.99_p2.ebuild 702 BLAKE2B 87148834aa34832bb1699d416096b84b1b05988c1678111e27efd9b0c1256bbf82af7117f8b0f1a6ac8a6aa0b102f6e45ce2620ffb0bdc3fd3889be56c2a6baf SHA512 0749786c82b411117c5a911370078d84842de62857d4fc1b1de99a2164613e3f654990a2b1c0ba24b97068c421f2544457f64965f19579f67349aa27bf87eb70
+EBUILD ytree-1.99_p2.ebuild 700 BLAKE2B b05b0c665a908d55a5c0cbc1bd97449a4c5a355e5d775c5ac9d2ef08e5bd6b8b2ac4385d3a80bf821e0d5b326f4a217b426f02ef8e04f9adf743829edcc5e6d7 SHA512 9f662d7f715606dc47505bae8ff539f108991e488c3ffeb42de044690fd1a6f2e4cdb182ea7fa15532524ed591e29c38cfc3fe65e78827de5403beaa1bd8b60b
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/ytree-1.99_p2.ebuild b/app-misc/ytree/ytree-1.99_p2.ebuild
index c988a0685894..d4e2e2e040c8 100644
--- a/app-misc/ytree/ytree-1.99_p2.ebuild
+++ b/app-misc/ytree/ytree-1.99_p2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.han.de/~werner/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="virtual/pkgconfig"
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /app-misc
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)