gentoo resync : 29.08.2018

8 files changed, 79 insertions, 7 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 16b96929627b..ac909c572c24 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/fam/Manifest b/app-admin/fam/Manifest
index 38779a20a567..5b0b8dca5c66 100644
--- a/app-admin/fam/Manifest
+++ b/app-admin/fam/Manifest
@@ -6,6 +6,6 @@ AUX famd 393 BLAKE2B 5e6fd2f1e7eb9c48fcae90da144a1b6953e2469d0e4f3c7124e5f71440a
 DIST fam-2.7.0.tar.gz 301974 BLAKE2B 9a915e61b2898717cac1b7bbe9b2049aee0701314710906c5c8323aafe0847a9f017d09c4d9345e1fba386ac3c1001ec013325f9841d716e8c91e35bcf1e3962 SHA512 62b6222ee925eb2af1e258097c9bb676191690f38f8504ae16b1883a1019e0ac6dc7116ac2c4c596a956b3b3cfc3ce3ee7b613c319654681afb13e3ad3f284e2
 DIST fam_2.7.0-17.2.diff.gz 28826 BLAKE2B 880f8614304b048a24be03231ec26a02901befd75c8c5d51abf07d5afb42f370f4d3702d0db790f2f651f040372791024d9cbfbea15a1932629fb13a7b6a5ec8 SHA512 295c954fcecb7357a72ecf3c7469bb37c29e8969fc7be3a0e92e40e79911c9578f44c42a0a6f900610c8a9886f1addc62e50f258105aaadb61c718f526608697
 DIST fam_2.7.0-17.diff.gz 28056 BLAKE2B 4db010fdf7a2548f5651e9da876df63d3bd0d1a5f184b26df99f7d4204bbcbadf4c7672d248d9d1af2e7297b0ec17a5ec80e6b57016774877465a957ae3c6ae8 SHA512 76b14e1d17713eb86d52cb804d34012e5369b5f4e8bcbdc73a063d2ad9219e0c4a261cef9e144ee07744a953a2e893bdf2ceeefcf21edc7a2ac5e70a51a8e209
-EBUILD fam-2.7.0-r7.ebuild 1477 BLAKE2B b105c2c3183f1a39a062d7e64ac507af7b1ab4b33f0e974ccf7f4c3d607db7b9284e85f5d570ab2536910f415f2a00b2a346dad6f8a693dda2a63ffcb67dbe81 SHA512 e3ab8591d5bb3cced1c603e1379195f7f0826a019e1cee7902239116d625db383023d9ee3581f0258477f88ea191f353425f817771303e5916dca1234d2a1ac8
+EBUILD fam-2.7.0-r7.ebuild 1446 BLAKE2B 6eea6428f638163f192ee63117726530895e4e11a1dd0186464bf86e60de4b982dd8d8ac6ab6700bb504bf18f7dfaa0851b191566e523b6611569bb2a31ef4ea SHA512 7b527d6950abbcc7ff6e0462c98187163c75fe6f8400fa9bdfe8d46fe3c5b54d62755773e1406587902045151cd11cd3a0953db0d93abf5c8c67af86d7432854
 EBUILD fam-2.7.0_p17_p2.ebuild 1757 BLAKE2B 68b42c2d8f6873231a579f55c954ad39234cdd06c1842996cd5c20dd8ef65f87e4a8b94961249a4a8876af2e0b54eed0c76224616c92f890f490b3c340ff191d SHA512 1c5f7a100ddd09bc1472c8a267075465110d8e6b049907388791b4d0772b0f174f4671cc242d26619e18e1998859c86044f5fc9cf53ea3561ea81d42efd0bb20
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index 9aea258bf7a3..038355dc1ff5 100644
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="static-libs"
 
-DEPEND="|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 )
+DEPEND="net-nds/rpcbind
 	!app-admin/gamin"
 RDEPEND="${DEPEND}"
 
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 45a8ec56f015..b9b8284cb785 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -6,9 +6,11 @@ DIST filebeat-5.6.10.tar.gz 18211551 BLAKE2B 5ed3a3d63fc758757cdb30e999a10bee15c
 DIST filebeat-6.1.1.tar.gz 17061456 BLAKE2B 5a5d23618f8140f3815c499305d99ae3dc4c4caa49535043040387922f924ee49a9494b5139f34a70d74173d97332b92909fc74e2f91a2fc0f288ef5d1493ade SHA512 54e85cfce58ba724f6b2892f115ac9ef5b1bb89ce8dc6f2a977e50ccfc07cf95fc578e46e0cadd96acd90c59f4b01446851b93c519afa094ff6dcdb7e716219a
 DIST filebeat-6.2.4.tar.gz 19466271 BLAKE2B 417f1db19b7fdd9bcf66f2c3dcdf2aaa6be9ba5edff1c97a0b8f4a5d7953ef27bcbd860e097fb40e67b3b42b795b684dabb2995eee572243831f749a7184b625 SHA512 49293e28e4ca769a88f7b889ea888a559ae7e142698714e24bf5519d00c2030237cac591590aa284f17792906a6137333173716ddf5db4496217f8b5a054b19c
 DIST filebeat-6.3.1.tar.gz 20915568 BLAKE2B 048898bc4520c0dc2a0aa5257149ecb75abc0b52d9a8cae63fdfe9fc8c329b3fa30d7277ae0cb916a86477d60e82b63839956cfa7a1985961c5ee5f6622b9f83 SHA512 1c03cc8fd3b968ade678cf2290fd7bd8fed2f9daa64cd550455567296ff51517b502b54e1b2413820c25cf899b7759662c9c18278c78a2568c74a26841f5f525
+DIST filebeat-6.3.2.tar.gz 20923316 BLAKE2B 70ac7e574f94a6141a7c6a1bd0af45ddbda3d01d6ea006c90ea341d2df03cac320d53496833cace3b394b9433251ea68a248dafdc8e28a85a6014314d5a2f3c4 SHA512 3d6ed03c9286bc7784444ad979b1398fcd70d870be184f912202ee5fab7c0ff23df639f445ec14cfcfd4d41ef648f33e88c2959f3c5f966fd3986884a223623a
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
 EBUILD filebeat-5.6.10.ebuild 1496 BLAKE2B cd528a4a68ef61ae3f5fea941e8a71e72002cb5b18814b3d9b3bdfdd86520f42ac87818acaf313807a2b7cdc1eef1f6ffa26d06d5190b9446c3f95b614718158 SHA512 0a7de42d1408d5c3a54836ebea8450e27b57f42824dbb1e2ce3d705123df752d8f68e8c40de2b17a6dae93307856eaa3898925994839e6d5e13e7275a30988f9
 EBUILD filebeat-6.1.1.ebuild 1303 BLAKE2B 9e3c7601566336639171e69171b51d1a7ca33d8636de2cca01709d1c97a65a82fda7b650efd682fd4d4909587a5868a84c4ea4053798b1daa73f11a036951a82 SHA512 fa282f9c87f051c0f33f0344f34d81c8dc9d8beb7d8b8d74ca8490bfb4f727f557145d138f7397452635b96b9be1a0a82e52f6b894a9e0b48cff16a11065491b
 EBUILD filebeat-6.2.4.ebuild 1216 BLAKE2B f3b33fcbe8ac9fae7bffe893254eed1c8daccb095cc04a9b8f07160afe029e6d960910aa0fa4805d61bb1649fb8de9f8f5f0016cba2cc8175651734937ae953c SHA512 4bbed842b8b59e0ddfce1b2ba4118692f03189908e957328f9a6db00e42b5901d32cc7dec8ae449bfdef6bbd8fa1abf06cf428def31070fdb0321ee7d2a55b8a
 EBUILD filebeat-6.3.1.ebuild 1323 BLAKE2B 2a6d030c2254e603df514bad88411f9436b618aa04193bfe007067046bfba03673db0ca4f46cb137d1de7b70d49b5039fec1f9afbc5ae7a801110a53b440b191 SHA512 a8bd4772445873378bdce0aa6ae31e04671b9ea79dee78c7299f718ac6ae11f27f4fb86d4f6ab4276b221af4aa7a4219b58538a61c483726c8538731da058c2e
+EBUILD filebeat-6.3.2.ebuild 1481 BLAKE2B a95db39be261a542f9e1c76b1c1394380e96d5f947255c30bb2fc07993d99deb79e2064016addcc9dc7dce13e6c223e7f97160cae9dcc722955a247a49d51dfa SHA512 6866f69ec58ab0531f7fd594fe0ee8555afdfe0cdccc8215a8317289102f76e4e2833f7ff0977fc309bb444288a01fe665d02a20fad9ee47cd73c771fd8f7874
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
diff --git a/app-admin/filebeat/filebeat-6.3.2.ebuild b/app-admin/filebeat/filebeat-6.3.2.ebuild
new file mode 100644
index 000000000000..739d28056bb7
--- /dev/null
+++ b/app-admin/filebeat/filebeat-6.3.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.10.3"
+RDEPEND="!app-admin/filebeat-bin"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 7dc6ca9609c4..a7b2c6e05d07 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,9 +1,9 @@
 AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
 DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc03ac9f0921afa547d02e61cb04be167891d92aa0db09f007c47e96a5a7e5793772c50de14bf65a7f80a603ca6611 SHA512 f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025
-DIST keepassxc-2.3.1-src.tar.xz 4085284 BLAKE2B 87ffb8a266056a147e84f97980eb19df64947fc56a6e39733269f4b88287c01dd8508792c22f247b05918f8beb98ea651c3bf91b642f863be2a4742e3e425fd0 SHA512 06c1b42e699b21c0cc2a6e7340649fa8964d8a0c880efad512f3ba16e12ee07a1b2b5ff13e0b3dc8d3f58fdf4f523cee3d1ef477a83ea434d97690dfea0633c9
 DIST keepassxc-2.3.3-src.tar.xz 4113768 BLAKE2B 7c599471b775ff8612968596765d05f2862ae21adc0bb0d595b5366ce55354c156e1df3940549bb955dd9e6609cbebbae3f108ae3eb8ccb0e85c83e9183a60d8 SHA512 155dda3c81ecb3be4638c634fe2dd7f96a54076b371a1f6ab95c33319ff2a50eaf941a1415f42724444749a40d7fbcb3972604199f6a0445df4a22a4bac73c0b
+DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
 EBUILD keepassxc-2.2.4.ebuild 1542 BLAKE2B 63efe9d8d0b4f52d74c8b7d192163d731c338585fd9fc00b51af2aeda9d47b17ec8989b292c6c65add2fe09d5172c9f66a9447a7525d50463ce1128ea8d07119 SHA512 9ffed685b6d159f5db669b199b0984af19e90e4ed7759e67f52865a97983533524f3f800d4611a5e4efdf27e0f3cf1d2a177d8f3c3bbbeab0b71fda7fe168cdf
-EBUILD keepassxc-2.3.1.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
-EBUILD keepassxc-2.3.3.ebuild 1831 BLAKE2B 89dc950d6e3eb89f316180ba7ad79c44f4ad454bc94dd9539d9d0d6ca3d6e094c67742b64345bf22881cfb176fda2cf9be94712d094e01a071aca64c0c930936 SHA512 fa3b20a12bd648c442f6f8c10baa99aeb983732200ac17d6390bfd987e11c52d2fc6b108741793fcdccad3d35947ce6f398c79797fdb43344629af6cc9896fc4
+EBUILD keepassxc-2.3.3.ebuild 1830 BLAKE2B 3e12e26e8df38704a0622368e7d45384907825b1b20352c691d56b85040e3b8cd1949268efbf9fbe6d837c81c6b689da0048c73ace92a511a656ee78776edcbc SHA512 ee275b9129c1705f9d41886559098836bbccf96fa729dea68e3d354db6ce258f9abc9cf5a2c02c9a634eb3f6c50f45f87555faf4f907dd306d3e71c476919384
+EBUILD keepassxc-2.3.4.ebuild 1838 BLAKE2B 1c2865fbb7a6b1a00567f43627d8435abd40ee7a2e79c06b2b9d85b93eba1047f1b3c3172ad6b0f981b25a15c43a5569eee85c1da32c1f9f245ec5e608ac8712 SHA512 78ac08e98a96bfcd7b8487dbe09fef9dcb6825ddf09575f0d9ee8e8b79ce5f4e8aebb5870ca009d49d73debaea50f6b10109595e2fcc12bc8f8d80168b7e5009
 EBUILD keepassxc-9999.ebuild 1749 BLAKE2B f40cfce681a8fddbbdc39b727fc5d36bf45e533a5cd36d0fbca4853928d27e945bac88a9ef84af0b5c2a3bfed1b2603543584c4bdaafedc9cc003da1afa20869 SHA512 1a40422bb5e84a7f6a57ae72ea8dd1252fbd865fcfc8da243b1a87ca5b2d399bf481ed160726ce30a2cad5fa1de5135c0a7feffd48b1bd7e759d857049a23c10
 MISC metadata.xml 937 BLAKE2B 21a284b7ee94184c22cdb740d9a24f8371cfb6f62d97361cb3a2f853409b3044e8ddad30f58f4f8ad27277739533972d22c7009808c7ae9e6a1c4b8e02003d7b SHA512 bd2e47e2ba3911323f0b5bee78e9e394edef7722e934c70a1e7d3509044d566b2e6d46fd77bde2c303d0c97a8ce4f756e0b32b476af253274a3a941b059da3f9
diff --git a/app-admin/keepassxc/keepassxc-2.3.3.ebuild b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
index 3641f74e736c..cd8e14510e6b 100644
--- a/app-admin/keepassxc/keepassxc-2.3.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://keepassxc.org"
 if [[ "${PV}" != 9999 ]] ; then
 	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
diff --git a/app-admin/keepassxc/keepassxc-2.3.1.ebuild b/app-admin/keepassxc/keepassxc-2.3.4.ebuild
index 69a100508278..623e428fb79d 100644
--- a/app-admin/keepassxc/keepassxc-2.3.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.3.4.ebuild
@@ -47,6 +47,10 @@ DEPEND="
 	dev-qt/qtconcurrent:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.3-qt-5.11-edit-entry-widget-includes.patch" #655844
+)
+
 src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die