gentoo resync : 22.01.2019

22 files changed, 261 insertions, 73 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 130f62854f1c..5f3639716b54 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bottlerocket/Manifest b/app-misc/bottlerocket/Manifest
index 8b82174c2a6e..756bb9408f67 100644
--- a/app-misc/bottlerocket/Manifest
+++ b/app-misc/bottlerocket/Manifest
@@ -1,4 +1,3 @@
 DIST bottlerocket-0.04c.tar.gz 40533 BLAKE2B d42adfc40194cde1229f6e20a3ceed3115d1e1b41789b51f508edc09d12525f6e702c470f38aa94c95d9987b986f467a7723e65f616cbfdfdfa12a05096ea932 SHA512 37673bd9a519307f0ae3003f3a458dbb99d4fd0c96ebaa664f4967fe45b20c1132828c3c7a31e769157e6034c43c9cdcd1ecac8c6791812d2a04e93d4c0c6888
-EBUILD bottlerocket-0.04c-r1.ebuild 881 BLAKE2B 3ca7e8421209e09396cce6b84197fa2bec3cd76b242176dc94c2eb3ba6f4faffdf66cdc2173f734d7139ca815920b2c4d43a10613297b5eecc2be59da96e988d SHA512 1b022113885a17a16c3ff555cdad77b4f498b8b4eced10f9636998883c0cd046f813bea88d51bf19d4a096a19c475079a3ea97d286e1419f39d7ae73966dc33f
-EBUILD bottlerocket-0.04c-r2.ebuild 850 BLAKE2B 86b862e532c99ce9328caae2a722a51dc8f3b1e1d5633895b76fb434d769080cc82bfd3041900d24f05a089a60f9b1516f056b94886c132c66f509e362f4997c SHA512 ae81eb3428fc555f7899443e9592267e07b15f99c9909e776849bc240902879ba217d96b4a09253552635da460793f541da94279c7de7dc2bdc767a9b6d63928
+EBUILD bottlerocket-0.04c-r2.ebuild 845 BLAKE2B cf81d2c8db9fa29363112602c0e314283b84935bf0ed32fa9841f26de0c3fb8ea3d6136d32a46d61750a333ad7a9d3ba34b2fc3f2237bbc6b4faa95fcf2da3e4 SHA512 fb208e7f313837176faafe00a42e853c14aac2c9d78f6573c9bd78af1ec020fe55768ddc9e0ae57d1d7f66370a1e8a47f7d2788b5617dabc899a127df7393c28
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild b/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild
deleted file mode 100644
index 4bebb91dd777..000000000000
--- a/app-misc/bottlerocket/bottlerocket-0.04c-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs
-
-DESCRIPTION="CLI interface to the X-10 Firecracker Kit"
-HOMEPAGE="http://www.linuxha.com/bottlerocket/"
-SRC_URI="http://www.linuxha.com/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-src_prepare() {
-	# inset LDFLAGS
-	sed -i Makefile.in \
-		-e 's| -O2 ||g' \
-		-e '/ -o br /s|${CFLAGS}|& $(LDFLAGS)|g' \
-		|| die "sed Makefile.in"
-}
-
-src_configure() {
-	econf --with-x10port=/dev/firecracker
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall"
-	dodoc README
-}
-
-pkg_postinst() {
-	elog
-	elog "Be sure to create a /dev/firecracker symlink to the"
-	elog "serial port that has the Firecracker serial interface"
-	elog "installed on it."
-	elog
-}
diff --git a/app-misc/bottlerocket/bottlerocket-0.04c-r2.ebuild b/app-misc/bottlerocket/bottlerocket-0.04c-r2.ebuild
index 882443c5b5f2..dbc423b04cb7 100644
--- a/app-misc/bottlerocket/bottlerocket-0.04c-r2.ebuild
+++ b/app-misc/bottlerocket/bottlerocket-0.04c-r2.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=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.linuxha.com/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-misc/detachtty/Manifest b/app-misc/detachtty/Manifest
index 4a91d5090cf1..78838c3f38d5 100644
--- a/app-misc/detachtty/Manifest
+++ b/app-misc/detachtty/Manifest
@@ -1,3 +1,5 @@
+DIST detachtty-11.0.0.tar.gz 23189 BLAKE2B 734489fe35acb5bfb381b8fee1b91d60f15ec795f2ba58f5855544d913957f7da4174c15583dc4090e397c5f562e78a23c1534a741a9812980f4a9cd2d2e291e SHA512 608d68ebe9b8fae55b4295b9c50d8e9065226dbb78818535af79bd2e70cc4a831820b6c673414289548b1063843b5dc80c8b7d2371dd716a16eceb20cd064a10
 DIST detachtty_9.tar.gz 13081 BLAKE2B 28bb6a946d04717bc60ac7f65b791a8bb59a5ce1a2f7d7fabb63776538ade3fe046e874007effe7dd6ba7ebac8d739e16b0b0e2372ce4154385164d7939b498c SHA512 8ae7edc1a1c7727eb4d32a1a4327932e374ac838b441f34aee99cfe83e922f1d70383ab0aab2299808f28fea6229f5c122a7624b7ff992ab92b9c3f53483d035
+EBUILD detachtty-11.0.0.ebuild 592 BLAKE2B 10295df5f463fd693d0f3448c4c8b77bfdcb5efc9e6e7a71fe568e78059cdc4e355f32f9ceb1b914f1d027747a988951e2d79ac467ca939aff197c4dec2cc5bd SHA512 cd9ebc51e2dc0b4064c140bc22987d19380d668b78a3ea9f0414f41f73ee1a53f58df741f9efd7136b7467676f49083a5b972ccd7fd2b73c07b12661aa666d96
 EBUILD detachtty-9-r1.ebuild 600 BLAKE2B 26747aa2903250488781353bcf93ecb0f66b086e63a691cd84725f3e9b7e7717927509aada2d64b017ca4a12c6cafb0c566ea7cf354b076c8a88032d8b6f0315 SHA512 4902bab8a023b424d9d6f1d583ab431b50375e878d0ed5e7e08840a762e4176dd56c681e632b01fb8a0bd20220c254af0b945561cbf272f5bdeae1f6a0759cda
 MISC metadata.xml 703 BLAKE2B 68c8ac450ee3a0fba9c9e217653526978c03635b843e9068f6c6e0937d927a030d78a9683f11f81273aaabb8c94f039f1211a1cc5b5ec58b2126d1ffdecc281e SHA512 00e9860010346c6dbad86cd3dd2eaea29f1e91df559b7f5b7dd634a48a0875830a46cab665efd3e3e87eafd6566ecec6ed6e4a691fdc48ebea327f527a312794
diff --git a/app-misc/detachtty/detachtty-11.0.0.ebuild b/app-misc/detachtty/detachtty-11.0.0.ebuild
new file mode 100644
index 000000000000..570e3b528b6f
--- /dev/null
+++ b/app-misc/detachtty/detachtty-11.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Attach/detach from interactive processes across the network"
+HOMEPAGE="https://github.com/cosmos72/detachtty"
+SRC_URI="https://github.com/cosmos72/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin attachtty detachtty
+	doman "${PN}.1"
+	dosym detachtty.1 /usr/share/man/man1/attachtty.1
+	einstalldocs
+}
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 6c574490b687..cf61e68f4ecc 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 464 BLAKE2B 05f6f7540c4859d50d54bb2b12b215c75393d0f3e15c91e7a47abcf9d835c9d5b84bf373fab0200e2ae81f0fa610f89441a5555514c9f4bf5d0bde5130e2444b SHA512 934755b47e1835affcbd1d5f92545b42ea6f315ed810d397ae069fa69aef9f4a5abd99e4a1ef92528db86ebcd2aad7c04462093813b4af5fcd940b38020c1759
+EBUILD dtach-0.9.ebuild 467 BLAKE2B 3048c246e47ee8949f6f27a45e3a31f6147993477c138d2a55168a63dc6a0240ff0ec63d214ee127f7d3cbb15823c727442b0708c20fa8c59b7838abcd022a8a SHA512 c4adf975ca5437e51b7a2f068283b0a2684df3350aabe8ef451b691f0245e96b0654249ebd88d4212fe598177d30ca7c87fe1cbf956c750ed53a390bd96ff295
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index 9f494f43e668..44924a0b86b3 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 2a2624f7dcce..f2880767ed8f 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,14 +8,14 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.13.tar.gz 33894848 BLAKE2B d6b486154c4b4df155e443adee7d07200822f4a14f9cc50753e5b4621630c3b5de7b6b3d3ad7745b898f5a24c02aaddbec05aaf0f5d38fbda8acd78eed433939 SHA512 dbda463f0fba0b921ac65ca8743f53cb21410001cb6113aeaa2bfe3e22fbdac9f9010a3bdd2df5b8bc6c7cd59513d9fbac8b408d22d2b885ff5dadbb463b7981
+DIST elasticsearch-5.6.14.tar.gz 33898195 BLAKE2B d153ec39f2e74f9a600f6a12d609d24999c08d0af4da521865f1c8fa22c642d57bcf24f4907e390399c538bc14bef17862759be7e9b5362a283f9aff1d3ef672 SHA512 d384797c652d5ceb2e081c3a05d62a8af3c543e818fa501bc0caff0826e6a56447f0dfc03d1e7391f7eb043e500c8a9942083bb141d18a02d464c5e5d8011bb2
 DIST elasticsearch-6.3.2.tar.gz 91452574 BLAKE2B c422990fabad70e6e77e8f59f6fb9e9bf5a84eb7e6b8b67dfd91f53e474b1b501b3a1d5ea8f54f0793631504f194a116e816eb3558782b67c8dadecbc2711ee5 SHA512 954cd1e16a5f2e0b0efaeb7e6b19c708d1588d30814a31defb09037c3b90f78c5e9dbd1ca9af9c700d517145a4279bacc1d8ce7cc6894fbe7bf71eec9ed3110d
 DIST elasticsearch-6.4.3.tar.gz 97872736 BLAKE2B e8c5db4f7238afccce4cf1ca0eced7b7e97891455cd28583eafd7ba028ba3cbc3596cedb2dc4267e677b3c7bbd459b8144284eca358f8c0e34a9a0b8a33426a8 SHA512 2f48720fd1644b1d0f103ca93bd19632c2a12bd3c94434ddf58bc692cb0b23631222f8d23cc0d0e85e271e11099fe0fc8aedf402906b76845ad680eb592f8987
 DIST elasticsearch-6.5.4.tar.gz 113322649 BLAKE2B 876dd23f80e24390e4efa1aeca6fa5791e3320a292d60d1b7628c685d1a3210f8ab15b78013ccbad5e589bf65fc05153ee810a1113d6ab9b2bfe62a335887302 SHA512 dcd6afdac02cdacdd4bbb3d9f73bffeb7a93750b35f5a5a991dae6c7d9f8883e33401ddf3096346e008047bfcf08d09435ea5f0290e717ff3a041600ea088584
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
 DIST elasticsearch-oss-6.4.3.tar.gz 33727639 BLAKE2B b4f4821af7a2447a6a16158c32bf676ebbfd8598fde8af558dd19d6e365df66be17d0984e3acb9380a0d5e0cff486b85f6edf96312bd3bb3fc5ae52c270306f3 SHA512 b1147baa95119a8a96779125351358b4c62f2a546b65a9750c11d1d1b9270f06db6da8ff1d9ad11efade1eaea8487087e2d8839b0edfc5da6d9b54da6c6df4e7
 DIST elasticsearch-oss-6.5.4.tar.gz 34267092 BLAKE2B 18a35c4556a93d953665c1b740265c539e9f7f2232070a2ee9a0419f3c4b09748f8661bb53c5c785b4a26b001060a8b8bf96f4fc50af3a9252380e89623c9253 SHA512 1835aa2862104d328deb5bfcdbbab5d121cd8dff883b7f56f14cc4dadb88c7560b688ac21fb51e0d086b6ed07e0345f26de91c2887253b40abf23c4d5e37e197
-EBUILD elasticsearch-5.6.13.ebuild 1686 BLAKE2B 5275864107bfc5c8be3e0725eac78ec21021aff4716f494f8e793e2198223450ff5fa7eaeb63959641af4a4c9e30c3ba865e7871cec6ec903010a97b1cc3c107 SHA512 ef36e2a07bf258cacd735c87b765d72c678a47c2a968e89e9ed11ce2592aa42ec2509dc65fa39dd2a66ff4e681d724c05dc4f7ad93439753beee75aa0dccc744
+EBUILD elasticsearch-5.6.14.ebuild 1686 BLAKE2B e5a66c3eb054f849bbfbc90abcdd8fdb8b5ba8ea69ddbcc8f2d9964ad70864cdd094c29480728c8d5b830184289fcb2a8c9efcefcfb6c026d7a5dfdd2f211497 SHA512 4e6f1a2478e0cfe515add2c63f6f906fbc62822fe4b79b65146e9589dba6bbfd4540c1bcb623137dcb8417c6ee36d4518621c3dac683eab02a57f0cb01a7720b
 EBUILD elasticsearch-6.3.2.ebuild 2603 BLAKE2B 329924c83731282a8054c4c5965f30fa6c2748b4558044fa7b1407ef406dbc02a02735274ec942c20830396e2eec9e614b7406028623e03bab570e42bba522ca SHA512 9435e7af52a42bbe8626330dce0c2b80a827d697a8fae96edceba3a9665472775e71e23cee099b931bf17dc65eddce2fbee68e36823d1796bc7187169153db55
 EBUILD elasticsearch-6.4.3.ebuild 2579 BLAKE2B c397625f021c0dfccede2c57e24cd0584def56204ec33ea7fecd36e901fce6a8cd9d449b03dd19cc3c7ec66be5e700f25454e0cc2e18e5dd924791349b66f7cf SHA512 b89368ddc71306ab1345257ee899e2b0be87276587e5157d714616ca7548175ec7be80fc646ded6ac86635fae785def9b63401a642b805470b7abf54e0038d8e
 EBUILD elasticsearch-6.5.4.ebuild 2579 BLAKE2B 1bb66e455f8c832d2ba9d51800f2c5a859367205a440c758ac07770f671afe84518a10adda1d8ebe05cbdabad1a1cf340873236821c2b54fb29a718680b8f7ba SHA512 12871743b8e8104d55baaf301b679b130add0534fa8b40b90b458116d5a1b524d327180ea458af7114022e57e6ef810e7c63b64bd66d57b34bf0c038810f2fb5
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.13.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.14.ebuild
index 32370ac9f8a8..f5399ac194fb 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.13.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 096fad34e8df..0ecacf4d0268 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -6,6 +6,6 @@ DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba0
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
-EBUILD geoclue-2.4.13.ebuild 1670 BLAKE2B 927f3a40e32f616621bc152ffc96d4226138e2e3c713978f73f0dc3d22b567fefec57d6a70dff61408d2c497dd8d71a5819caebbfdaeff18197b02cc6d904119 SHA512 9d6cb2985d67e0743ab603784e9154691ac9eefce5d1094213de1f36812ff3ac29946e6e9ee967b2b6dfbabcce3b78f0488ad079f98d5ed561a0eb14baf7a056
+EBUILD geoclue-2.4.13.ebuild 1682 BLAKE2B 96815c2ca11afecb006e9fc617828b9182943fd6521934a6c47031402653996a9257366828503247838a569aa6d11e7faff3df756820863f6ff41d54bfbd5dbc SHA512 f2be75fae7d6400c7973cded35c6c61e4d6e3958d44e1bcb374ca7ea3e9394315c40319d50f5999713affb52a36a5f99b9a90e57bb07e4a36a2ad4706914e668
 EBUILD geoclue-2.4.8.ebuild 1594 BLAKE2B 0c55271ca750c2b6cd3d8471c7e8b9ac053781bf0f467903e67472e77476f7205af16dc93f2d878995dc3265f2f052707b0bbcf2478daa1ef8ac9f672766adaf SHA512 397335446dba393fa5b737cc274fb72eadff774c8a95635a0dca7916130091b94f24f02e304f2420b727223bc39c1ed7dda0be4f31657485734650d0ab02bf98
 MISC metadata.xml 1062 BLAKE2B 11f3d019f7c014387f5b3faece7dd7f165e106dd27132cf56bf59b35be2fe2ac0dd02751eb87e4e8bfa77fdecf076217eb76e6e5b37acb33c26d2f26cf1ca942 SHA512 3747063a944f72bed17f4948a0c8041746cf61fe85f2b4886cf6b8f88c01dd4cbab37a94447c3a900416bf1a374d88deb812f89789e74f4465654b26fe18899d
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
index 93ff80b44085..153c7db03815 100644
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -7,7 +7,7 @@ GNOME2_EAUTORECONF="yes" # 2.4.13 isn't properly disted, as released concurrentl
 inherit gnome2 systemd user
 
 DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
+HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
 SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
diff --git a/app-misc/gourmet/Manifest b/app-misc/gourmet/Manifest
index 338f9f154e80..b6831a823301 100644
--- a/app-misc/gourmet/Manifest
+++ b/app-misc/gourmet/Manifest
@@ -3,4 +3,4 @@ AUX no-docs-0.17.0.patch 338 BLAKE2B fae9f389c8ea29c275ac917358a572d2b7aabb98f11
 AUX tostring-to-tobytes.patch 988 BLAKE2B 05dad2fbf164fa5cc13bcdb831bd05444829c712fa3930a0221a3b47ee21e2c32ae30858d2d06b84f20ba3d7764c402605ce89496c6c5b5d33078eed1f3fdd77 SHA512 72b12c9e775bea34ce82c53a8e808fd212eec523f03ca591735ee90121cc45ec6a6464168fe16d66c9889e92168accf8643b0486bc53ef8d144aa92070f3f94c
 DIST gourmet-0.17.4.tar.gz 8487830 BLAKE2B 511da1ae85a788fdce622cb9eb1822e6f264daffc76f25ceb8148de0a4658d9a2307278e6e981073d1aed0fa6e96d543386ed7357e0c9a3c1b511bd107dee62d SHA512 54010a5527f33e08b38d0fdf143cc4528e8ccc65ccad3253074135212751c3bc4385ba5f721327268f455bf85ff6f248e56ebfa1b98933a4ee061983eb9daa4e
 EBUILD gourmet-0.17.4-r2.ebuild 2312 BLAKE2B 817f9e8f3b3cc8609eba941a3406b7ee4dfd8e3ee789337cb36fe1b6d14c734d0f20243d32d4dded941f3e7c8c9502ad6cd10431411c66ed4889d455c36a1e99 SHA512 4163adbc0a8d7142a4779855d920f238f6870d2b94f3142b09b0f99bcf22108ebbd8c0161c808eaef6ad63d9d1ed858ed8a300d1b29a1b2a81b17ad91ff0a04c
-MISC metadata.xml 1585 BLAKE2B 1f533902211f87a711ea73f3d0979bca74866271fd96a4e71e9826e473ef91ce169dab035a27c0886329867750535a1e6f1198fc948c71b188013da4551e1c8e SHA512 257a5072d155af3104f20014fbe9cfffe44d8ba283f0bed70ca4cdee96e873bff60a1573d16ce78447f814b2d3b4c5581bdc06a55f21cdbf7eed93c3808c5671
+MISC metadata.xml 1480 BLAKE2B f96a09ee6b4b64d8590ac2223f816f5c646ca9c0bd0877798764e85f5c0f59102187a298a6ba94b249e11b39b76128f309cb6e03e9e81ff309b76aa84dc51885 SHA512 f0733d15e836ec241f4a73feca814856f6f02bac52026acfdbad2445a02eb0c0e8d1d5b7dfc959ce3c2d0329a4c5d81395d5a4164fc53cffbf0b86c159881186
diff --git a/app-misc/gourmet/metadata.xml b/app-misc/gourmet/metadata.xml
index e36c4e51d64e..78a34f757c57 100644
--- a/app-misc/gourmet/metadata.xml
+++ b/app-misc/gourmet/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
-	<maintainer type="person">
-		<email>nixphoeni@gentoo.org</email>
-		<name>Joe Sapp</name>
-	</maintainer>
 	<longdescription>
 		Gourmet Recipe Manager is an application to store, organize
 		and search recipes. Gourmet also makes it easy to create
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index aab6696fb9ee..342cdbf328a1 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -6,9 +6,11 @@ AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 DIST mosquitto-1.5.3.tar.gz 425844 BLAKE2B d868dd67cd86e57f6af8e5556e0cee520f60cac4f16a24ceeec163acf5663339908d77304b7e70898ef5afaeeabb57c2a2857df297600180e1b9db6f2bf990b1 SHA512 8aa4f85914316c2dc08908a649779946ab33b23ea669c6f7eed0d8a1af7ae26381cfe1a50c32d220658f8693ef6a86045690824af4b7ca0271426ff3455e7796
 DIST mosquitto-1.5.4.tar.gz 430602 BLAKE2B 3d9aefdd6caac926fd211df20932904dbccd4bae923bcf2ca1f698d962098fdd606145d229c849dc87ab4daf10af97dc1ecd9e1b4073e9abf67ca8bd17856311 SHA512 4e7ae21304afa843d4d48a8ea0bcf0173deca25961bcd294f86eedbdd8ec59eeca3c8cf5f2d72765128756b2cdf9460f5718041a67c66ce6ac76679cdac247c7
+DIST mosquitto-1.5.5.tar.gz 431998 BLAKE2B d6963235c70fd5ad1f73ea6964e800041afd6fad89a83f3d2c5fd6d843048f328dc93368c99e83820f110dfabd56783fa175a1169bc75316331df62f846409f3 SHA512 4984a8c3a48450ae87dfca9ea825433332c22a5c1b214b7c6d134789675431ba1bcebaceea2fe32c5d32c91ec47b9ded7b61c0c2caf6551f10e4f8dc455a5351
 DIST mosquitto-1.5.tar.gz 419614 BLAKE2B d405e1e4f967f1030229a2e64793b84a3c8dc356a3b8d95a9bfc50a623cdb79517bbcfda87275f23c44002f3a41a20db58fed5a33d2c7d63da95e0d6d15951bb SHA512 29b82bc0c6510fa5062cb43c06bd91ce5223be5689cba077df8b2cb5ac377cb125b8a8bb292b53bcec0d4b186977c25c3ecdd8c92d4ed996fde07f8c759c0668
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
 EBUILD mosquitto-1.5.3.ebuild 2439 BLAKE2B ba9acadf951e4952a0c139ec4f37bf72be33d7c32519bf9bcfa0399ce43861d1ce4d0c258266f39d1c0fbc37d4b818a25af564e3ee787d4b70b3d80d7354e488 SHA512 2feb2ac21f4ee9b4b3e46e6eddae71cccd5552e5815e2ab5ad50bc967059572a3c3b1791505c58a5eb6ab00cdb7926e78c9adffc38ed4ed6e74d84000df6bd07
 EBUILD mosquitto-1.5.4.ebuild 2442 BLAKE2B 139888e22d3441c68fe5901abcf9247a9db13ce8f51389db78ef455bac0ede577b76463651898da6aeefa66615c47c885c4bf55d9e7fbf04f043ad62ad58c1f5 SHA512 cb71c209ebb39f2a5cce3cca59c50aefacf274795537f9b37728ca90d41105e41ef9b34c5f9d891b2874e08e192791ac12fdf172e616c4d685415feb2455812a
+EBUILD mosquitto-1.5.5.ebuild 2442 BLAKE2B f91a39e79de01c819dd6f1463414d57a598dd9d89e6e08d477bda35b7e55d6f4e70870435af614aa207cc91e8c60333df24441b445a2bfe73013dd4bc448e461 SHA512 7b17165cbce5fa17e956bb939ac96110e5076ce4210e4aa7bbd488520012658de96434c1bec24a0f57b58a3b6f55b00ad2072c96e3936b1fe2df4b68202305a9
 EBUILD mosquitto-1.5.ebuild 2553 BLAKE2B e24122599e0d670a92ee3a6b1063d0bd5eb342eae27ea2029f4a60b5e3ddc9c9c98fc07d7cd980ac1d72b9743e7f964210b05f7131101e8330d7974096006df3 SHA512 c73492cff20a123be5122fe37d9c0c4a12ec86d0dac6c18c8257d8999aa31d1696cb4524d5e13bd09d71a6be1545734f1b5cc4d367b65de3aeed11679c9a6e7c
 MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
diff --git a/app-misc/mosquitto/mosquitto-1.5.5.ebuild b/app-misc/mosquitto/mosquitto-1.5.5.ebuild
new file mode 100644
index 000000000000..30791550cf93
--- /dev/null
+++ b/app-misc/mosquitto/mosquitto-1.5.5.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit systemd user toolchain-funcs python-any-r1
+
+DESCRIPTION="An Open Source MQTT v3 Broker"
+HOMEPAGE="https://mosquitto.org/"
+SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="bridge examples +persistence +srv ssl tcpd test websockets"
+
+REQUIRED_USE="test? ( bridge )"
+
+RDEPEND="tcpd? ( sys-apps/tcp-wrappers )
+	srv? ( net-dns/c-ares )
+	ssl? ( dev-libs/openssl: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/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index bd7cf7246467..fa7afdac945c 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,6 +1,7 @@
 AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7e1acf91019d74dfe1c1c9c44c900d835fe550adfce89140b991b96ea4d63267f48da7596f89cf7daf1c93e43d4e7f6924 SHA512 dcbe424084b8b0cfe77c461b5897cb027e30778f9283bcaef358d70e1496473cbb5b7ed7c55347859c86571b77f9aad4c051d1b519823efed6c9e6314defc187
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
-EBUILD pax-utils-1.2.3-r2.ebuild 1765 BLAKE2B 37602b6c4593bbc53e8b1905647881e0d4454b5bf192b90b00d66506b1c7b57a38cf00d9b126cceff0a96ea245e2a6236ba79675e4a6653e9de9565033714738 SHA512 bbfc6232f0d1d2c81fe39ed35a74d6a7f0f66ef136112f44f8317438047d210e13770b251d9fb446b16b65bb97b9fab18c2a62749d106b9e71bbb9440e214932
+DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
 EBUILD pax-utils-1.2.3-r3.ebuild 1812 BLAKE2B c6322cc812a3db52f81ad7495ac9753c29be6f2f5287c97112fe1ed0052e5b345c8e9c8290b261def4a63ca4183d1408d5c448d206a3e231142984173c5db55e SHA512 62661ca64ac3dad190af9cc4c5035e9a4b8c39c21d75cdc354000f0f465b093b39b63690b3ee297f623649a516a994830cac5bc51f76a5a623c3e62290a9598b
 EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731
+EBUILD pax-utils-1.2.4.ebuild 1762 BLAKE2B 1655a8b4da729f329499ce9e6b146c79d7569c8f3e24b243c960f1a28671651f1f3cb01439a526d1846a4481b68a7702a6625cfa8dd728acc2dd540f3fde7034 SHA512 7988f3327add3949f38ec4cc4a38864c1c6d39d3e1d5ccd949edf5443274cfb9ce80f0b9ea08c72665b4740f6efe0474b08dd93d4fefe7219e100012ab0b4a11
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.4.ebuild
index f0127f587d24..92c08069a83b 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.4.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=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 1a221a42e675..1666f0d624a2 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -4,5 +4,6 @@ DIST sphinx-2.1.9-release.tar.gz 2443797 BLAKE2B d741d0bc915ece01c3ddcbfacd44f34
 DIST sphinx-2.2.11-release.tar.gz 3061998 BLAKE2B 63abdf3d08046ebafcdfd67d3445325b9b127e4dd66ba9d36b3b7053ba80f1f3308b74fd1e01caae6174850e1db22c743454894584bad4a4bec78d533a002668 SHA512 cf1a262a5b0fbf0bd2827ec6ec629edeaf709ce855a6e7b509b65342baaeb26c02717ca63f1578d32c83d21e2fd6d1e92dceb34660e6351b93cd96fd4e623689
 EBUILD sphinx-2.1.9.ebuild 2376 BLAKE2B 996c4d2a42f92a73a74baa7716abd352b2fa446373dbdeff5f936e9eb7db664df2584ffa17e09f315d2f26558e41f0699691545721bed32ed4ab1c976c8e1265 SHA512 79c16793a6c613234adc6f892ecbf939c8431bdb76f685501872328113618beea8d1d5181eb4ab1a53b91b9e00cb1b9bc681d1c9462894078b5f45aa708e6ab0
 EBUILD sphinx-2.2.11-r1.ebuild 2773 BLAKE2B e9d0bb5f8dade5b9802160be4477b7d514f372357816607fd15ef497d9f9bb82b9b0a44d8a657a9219280113d7abed9fc1599f86027a312f2d2faf8ab8d7646f SHA512 20e0e2819a83b609623dc62887f09d9ea1a6eb93a533370f8f8b21ebcebb1869839171e238b0bedffda722e405d0ffb140dc5d31d22d8bef770a6737840c635f
+EBUILD sphinx-2.2.11-r2.ebuild 2834 BLAKE2B a156eb985d880af6f736c8c7a88641bdde1ff27e8f0d0810415d4ad49e8e2d2a9882ce50f69b13ad8c06eac15ab30ac9b38e5393742c466d6116de8cbba8b4a4 SHA512 14247d5c38bbb6d46aa275d991e53aa3fe834b3e1f2a810e81b380f73b4488c390535c272b6df48a258e8062162a03280772095c37331d6d8ff7156c4a17f170
 EBUILD sphinx-2.2.11.ebuild 2403 BLAKE2B d48c34fd604e6df0c652845bedb1f2c35046c1db6601ed995602fbfbd042a035d7296c1824eb29cd611d35408d821fb2c3cfb75b14ed87c865d416fe8806ac8a SHA512 6be2c83feb3edfa0c4b8fc80311fcf17099215da2006e706df7c5f556b248bcd269fa9f5aa752d0466c5bb6cdf656af0c4562ef9783c40bcbe84207b7a264585
 MISC metadata.xml 495 BLAKE2B 6ce04a8baaefb4f99722a9880c05774fae70dac6af652e31ba3e64f057cf7fe923aa035894673f5570bcfc98df0992e3f9a03ef22b5c5991fdab36eeb54dbaf2 SHA512 40351ff70a81c80367af1f1454fc18a1da6ff3e9f5d921547f40d4c05ab36fc0f13228176e54237956de7ca8ee78c3d14facd15c85171c39c03867eb2288d975
diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
new file mode 100644
index 000000000000..ed278ee1e82d
--- /dev/null
+++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.15
+
+inherit eutils autotools toolchain-funcs
+
+#MY_P=${P/_/-}
+MY_P=${P}-release
+
+DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
+HOMEPAGE="http://www.sphinxsearch.com/"
+SRC_URI="http://sphinxsearch.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug +id64 mariadb mysql odbc postgres re2 stemmer syslog xml"
+
+REQUIRED_USE="mysql? ( !mariadb ) mariadb? ( !mysql )"
+
+RDEPEND="
+	mysql? ( dev-db/mysql-connector-c )
+	mariadb? ( dev-db/mariadb-connector-c )
+	postgres? ( dev-db/postgresql:* )
+	odbc? ( dev-db/unixODBC )
+	re2? ( dev-libs/re2 )
+	stemmer? ( dev-libs/snowball-stemmer )
+	xml? ( dev-libs/expat )
+	virtual/libiconv"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.1_beta-darwin8.patch
+
+	# drop nasty hardcoded search path breaking Prefix
+	# We patch configure directly since otherwise we need to run
+	# eautoreconf twice and that causes problems, bug 425380
+	sed -i -e 's/\/usr\/local\//\/someplace\/nonexisting\//g' configure || die
+
+	if use mariadb ; then
+		sed -i -e 's/mysql_config/mariadb_config/g' configure || die
+	fi
+
+	# Fix QA compilation warnings.
+	sed -i -e '19i#include <string.h>' api/libsphinxclient/test.c || die
+
+	eapply_user
+
+	pushd api/libsphinxclient || die
+	eautoreconf
+	popd || die
+
+	# Drop bundled code to ensure building against system versions. We
+	# cannot remove libstemmer_c since configure updates its Makefile.
+	rm -rf libexpat libre2 || die
+}
+
+src_configure() {
+	# fix libiconv detection
+	use !elibc_glibc && export ac_cv_search_iconv=-liconv
+
+	local mysql_with
+	if use mysql || use mariadb ; then
+		mysql_with="--with-mysql"
+	else
+		mysql_with="--without-mysql"
+	fi
+
+	econf \
+		--sysconfdir="${EPREFIX}/etc/${PN}" \
+		$(use_enable id64) \
+		$(use_with debug) \
+		${mysql_with} \
+		$(use_with odbc unixodbc) \
+		$(use_with postgres pgsql) \
+		$(use_with re2) \
+		--with-re2-libs="${EPREFIX}/usr/$(get_libdir)/libre2.so" \
+		$(use_with stemmer libstemmer) \
+		$(use_with syslog syslog) \
+		$(use_with xml libexpat )
+
+	cd api/libsphinxclient || die
+	econf STRIP=:
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" || die "emake failed"
+
+	emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed"
+}
+
+src_test() {
+	# Tests require a live database and only work from the source
+	# directory.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed"
+
+	dodoc doc/*
+
+	dodir /var/lib/sphinx
+	dodir /var/log/sphinx
+
+	newinitd "${FILESDIR}"/searchd.rc searchd
+}
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index fbdc07675da1..7e4cbb658c14 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -6,4 +6,4 @@ EBUILD trash-cli-0.12.9.14-r2.ebuild 493 BLAKE2B 4be74b3dfab9cfc1e1c7a79ce37c213
 EBUILD trash-cli-0.16.12.29.ebuild 494 BLAKE2B 106963754651c7a7f4a7de148cd7e915a689acb1b098cbd0f61837291ee8a358c6b9ac41a20660f8bde03a8b35828ae27bf551c54939c0e44c6cb4b36a96e469 SHA512 40718d5e6b630a88fa1f98cb4ed9ed5723307e7d9166e0997cd4a68b198f83dffecc0e1a64072c752aa5b9f11e4ad5873052759fde43a2ea709fbeaa425db401
 EBUILD trash-cli-0.17.1.14.ebuild 493 BLAKE2B d476b75c962c9d0ad6d4669d6e33e1cac49c9c0f07bf312056c95904680c8283dff32447b46124373cea281fe5a16705e7f9bdd6633078ff560e3eb4deece57b SHA512 3dadfbdf10c4754158f42f303c71ce8e0e8e42d2067d2f5c1fb6c091dda4a34a5c09fa5a7159541ff15c64050e5b2dd3619b95517ea271047bd70b732e983b00
 EBUILD trash-cli-0.17.1.14_p20170816.ebuild 694 BLAKE2B cf96673d13a79098bc1321e9661e2b2482969cd1d41a6e806c4cf5598ff5a78e91da608c1e279045659fbea41d557673658bec87661081efe5afa18d9178b103 SHA512 cd6eca3bc978c736a76a55d56985d99a539cdd7516eadcfd24e35ce3956a137180052b7421cb9787af804ca7343e3c9953039493fd7915ad44575e26deb5d6a8
-MISC metadata.xml 1055 BLAKE2B c7e57fbc12a894309c39b66e7abab9eea69c884d30aad28d064510c1e50b015482f68cbbcdecbd03fda171966a279e283e5cdcbe7c1c182d3f5b65c6a3d51ba0 SHA512 47b92ad1a6799b37f2e4317f7fdd7ec4d597f07d4d77a4fa67eb5d48791eab30f1ca81da3610602fb5e15d9518deca19886493d8c29ec16ba003ea5af48e304a
+MISC metadata.xml 864 BLAKE2B 9c5096cdaea96ebdb3d23bbb1f44b9f706cef9b58ca6f4107bb2d1c4f11937753df808cf188625ad4ea42293492c0991693d36f9bcb2e2d9f3753de9bdcf463a SHA512 aadcc31272a1c57fbff503ffe14b595ba75096335b64ca9f460fd8c309b32ea283f602a5b89581473a1040dc099bd283e89deabf1ed5cccdfcc36daf5b7e04a2
diff --git a/app-misc/trash-cli/metadata.xml b/app-misc/trash-cli/metadata.xml
index 123a854abc78..8bead1cbbf1e 100644
--- a/app-misc/trash-cli/metadata.xml
+++ b/app-misc/trash-cli/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>sito@andreafrancia.it</email>