Sync with portage [Thu Jul 12 07:28:56 MSK 2018].

2018-07-12 07:28:57 +03:00 · 2018-07-12 07:28:57 +03:00 · a2f19e5e1a
commit a2f19e5e1a
parent 59c991f809
1593 changed files with 11317 additions and 8547 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 28802 BLAKE2B 81cfd834e2b71c9a9078363576e968aea75cce4e803bba8dd49407fd3bb00c6dcf7a1d4e8ece5477c07995b391172630f66da4a5bb21d848dda78abb27375fa4 SHA512 ef058796b91b8314d64c89eb5f1ea15b7953580121dd552bc68caec4ea1fc91144a01d6faac2256f455ae3999a66c904f3c9d4d5bd2e27aa131650fa010e286e
-TIMESTAMP 2018-07-10T09:08:35Z
+MANIFEST Manifest.files.gz 28799 BLAKE2B a7d71b593ca2a1b6f520891d854ac70e8e8f6aff31ffadeaf11551ea76cd3e36f6e320e9744007c4c271756446b75d7d10118ad10ed5ff56a9f519b2c3b979ad SHA512 c1807669b2c7e628374bbcbbd451fef96f2a2eac41f77b6d0dd975265a6578200c22e280dc744af28e2924fa0eb4eb55e98e5615d12e1e4280dbfcde7f5b4abe
+TIMESTAMP 2018-07-12T03:38:33Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltEd5NfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAltGzTlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klD2XhAAke5R+V/AdUEVZ9oYf8WX7Uq/nZ6xUE+pqEvUPy41KRZUIy6sF85/qab0
-lDlMiVWGMZjgLqMfm/ozU0Yuq/Xlpx3ye62losLwIEN4mnQzr6mlHNt3zCTCno8H
-Gld6DTb8kCCmCQ4CiPKHkOKO1tSZ4podLWlsoICVkoNJ3fRPF5KdHnckfYMWpoL6
-iUq88p+3mFeB3djabMlQaRQr9k4VpCGEoGVCrq0TdRwV6/hvA2WbNB8zuuYocU4t
-mq1y8b8VkEq31BDnujlbY9mvkEJtA8aVWgqV6SUZoXhbhlpEV8ZJ0DJ+iHw3Dq2H
-e4Gj95xaGMZi4igM2j462DBcZx1kXtN8hojf6Zwnds7Zao5xK+ah4+LUN2kSSTI+
-2rh9gs5mlE+W5G+v4QGUgQWItxMKsDoDtPNyfVLma2eeynTyp7B0ZtCWP5uM5PW0
-mO4hai9gp883arfYOp465u1l8zVE1hJLxZPz6+74toAV7rK88QguBISYXV+VldC2
-f0BylKvbnptWMAQcPfQ6H+AyCRiB9JWg9rHrLyluSgO1RnJdSdQjzfNGfTOqJG6w
-KQ/YrCUjVUf9rNQU8wpkHd8URGZf12ssodhmUq7JPOFJClcycHGWOMeQtg6FExQe
-lrCk4bYmUMfjrMbSX0wcCYlgn/V5Hayenr4/p4M238D9aW5d0oo=
-=TMHB
+klDSmRAAqwRlNNMKNTIr2Kvj/PqZ2X+FKdfHxblMor4IblJtIqPOL+54p9C3Z6dh
+vkvp5mgT3HejEDK7s1IMFtQkRKihGGXkiZvIFLOHXHb3AO3Q7wMco0cuFgL8lnjw
+bomGAUKsKeIaBlxg1ZDVvvMR+Lyngy2FJGt3z/80NgcjnsAI1aZmvWm+EM8/3dVD
+8DgCWTXcG+weurz+8dy+s63qZg6OcVngoaN5w8fqQ9EWE6Kh78PNyLuJTCM1wEDs
+1CJsbfszcE6p/+FnkzNQBzqKV0u5YrwXoHFB03QXnWNZqdqB6Aokt5T8aLiOJRD8
+LObtwOXGFmNk7FqbjfGiQoSNimXvJmBVtImaGVfrg9/77kmTwzdOpmu5H1lXLk5Y
+wHwswPAlHHEsWyePYBxanOezZhDUpEuPMFpvyRU0BWaSkpWRs0cRfDRyYFOf7gY0
+M01jgvC3Rnfal5iWB6DdmH3h3btbcsV3pVn45xBrVcOcc+9TX0BKfNgBHvHksoRn
+fk9rdo4ICmKz72Y6V6Ndu4Ow3D7OX3UdturLHjpfgbQ9hzDGnTTaehnS4f1kJhvZ
+3hrFoK+tQptIqvc5KuO2RwWVfi6jGzFatvqXiZrNRu4WGjloMoXjD4Jj/MTDQ4kK
+l7HkO67456X4/4WwKZyO3Tp8AMM1YDrGb4GOfuuFrKnF1BhQhMY=
+=+wxX
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@ -3,5 +3,7 @@ AUX consul-template.initd 592 BLAKE2B 21d6ff6bee67a82c4305eba3765f8e9c49ee59357a
 AUX consul-template.logrotated 103 BLAKE2B 66f91c1a2cd0c926da67e99ccf0535c6ff5ed1e57c23fb3bb3df4066cfdc1ff70f2eae6a67c7816d8d38d41106f003fe2a98732a9180838c05d04a710d9bef09 SHA512 642b53e43fd7a4da00907600f26e3814893b61856a62083c804b0077043a4f8f6603f0ae4461e901105f8e1fe52c2f34f3e949e752441f5f510e9cc21890ca75
 AUX consul-template.service 398 BLAKE2B 94a30973f6e0ee114dc844bf9b83e423d72a2fc0a3bc0fb6a01668fdc268c7a4f7d550c67f2f6f5e5de3140d6f14aba99eb65702ee8e335e2c3750a8aba6d7ef SHA512 6f0621088475a392c142ff8cc7236850a61f2fdcb10d456a29a68dff1c12cd52f66cdb37ae2d7c84ba7513f430dc8cea6fd5f128a559b4de708c5b517aab75e1
 DIST consul-template-0.18.5.tar.gz 5285939 BLAKE2B 822df39f77d9aebc55e03d74b43ace9d453135c6270aedd3d41a674b5ae325a588af2a76c9236072d6f6dd274ab75c050df6607aa5bfc98b0caf2cd3065b1b04 SHA512 1709c889cd414d2b3510400e8077aec49006c31958618a38f6bce78dad2ba4aac5405410b030bf968b5cf148f4cfbe963ccf95a015cd1e58f2f6d1f09edc13de
+DIST consul-template-0.19.5.tar.gz 6054881 BLAKE2B 48d691f9d09531248310ec50c6c59d3c74db4c8ca5f0236ac8336df92c75da89677e64cb593518032f48f53b9f5aa914a7b6ac0a2dc6bf6d32ae7c1f6d1dc60d SHA512 bdba4e821e353a71f9f6287b8ff352e85a916201314229b998bfbebb066fec17c5d7f12e224bf2920b018a4f5fec9000f122f6c04cb2e455a195b945e35235a5
 EBUILD consul-template-0.18.5-r1.ebuild 1351 BLAKE2B d48a01aabea1abe073bf834c3167d6c15d5ea169ccb164a7daec1643ed4b9f8d1ac34aadd1df655b73b56442a5761df2f1e8b4e72ef4788876d86c422cedd836 SHA512 0ad472d57b8c815ee88d051d18287b13c7839f147bcef5525a92c15cfe099c71dae7a5acb349239fa4158f2fed5fe6363eceb47b1b0861d8235f2a2510882e6e
+EBUILD consul-template-0.19.5.ebuild 1328 BLAKE2B f19e2a8bc8129da1a7ec87b6e7b58cdba797e7ab52f6b401aac40b8e0126f76569166b054a80d343e05cc5df67c77140c1a46afa9e7502fe368ea0985bf69249 SHA512 500a8fdb1dcfa4456a252167bed358b8e14b04ac23c1889672e34eff22d12b88dd09fc40bf00c56252421ff82d213763f69a4327db12f913fef042e17747d944
 MISC metadata.xml 316 BLAKE2B 857b3a0a26e35ac2f52f797b85a42f91c74a10b4d8d6a1f5394465e68f6ad57bd732286650966f99cc516ec68d00f31f0f880931e2041cb596d50e521ac3a599 SHA512 e66cfdeeab0bec39ed4149454fd1876ce963f7bd0012fc659abf92aefbad4e5fba90c9fe84019273d5f837f6bdf438146b433d9ea00cfe1cf4356e112522f1ad
--- a/app-admin/consul-template/consul-template-0.19.5.ebuild
+++ b/app-admin/consul-template/consul-template-0.19.5.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+GIT_COMMIT="f8c8205"
+EGO_PN="github.com/hashicorp/${PN}"
+HOMEPAGE="https://github.com/hashicorp/consul-template"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND="dev-lang/go
+	test? ( app-admin/consul )"
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e "s:git rev-parse --short HEAD:echo ${GIT_COMMIT}:" \
+		-e '/-s \\/d' \
+		-i src/${EGO_PN}/Makefile || die
+}
+
+src_compile() {
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	#XC_ARCH=$(go env GOARCH) \
+	#XC_OS=$(go env GOOS) \
+	emake dev
+}
+
+src_test() {
+	cd src/${EGO_PN} || die
+	emake test
+}
+
+src_install() {
+	dobin bin/${PN}
+	dodoc src/${EGO_PN}/{CHANGELOG.md,README.md}
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+}
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@ -2,11 +2,13 @@ AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3f
 AUX filebeat.initd 1388 BLAKE2B 2a427750a15e6910344dee1d2707773b01961360ae3a7e3337a761b759b2c9fcd9a914385e8ff6292841ad6c07781af3b5cf059f1338a6f2f33bda576bb125cc SHA512 9b08635b9ba6e180881780de0fa9d6c8c1b2e7496fc803c2b38127fee13d13ca5d00792132cdc8bd4073018e3f6e374d4164a86e450a1dbeb68b2694fa0dbb12
 AUX filebeat.initd.1 1388 BLAKE2B 6ca4f3f4d50bba2a036a35b8e74bfa92d5b03ccaf8548df215d3d68ba9a2eaf9e2996374d49011f9e4380bc59f6307e262eee1367801bfb8279eb0b1639b83c4 SHA512 374b466b39feb832b414d0491510190758007079b6c865823878db00d5c17235f657deb0822066f124e3f07616dc4ff3237e87f6f35785e071815ec4e533b1dd
 DIST filebeat-5.5.2.tar.gz 18075191 BLAKE2B 9786cb8f3db003c86e4bc6d56fcac660b615e7e6ad82d0912f70c545f2af3caab605be739481355466438a1769c20b28db576d208af6b0af9620ce6408068215 SHA512 ad92b41a9ceaad6c6e6fc80d0adccd7fe03a7056d121484bcf35c6a46b2061a5ef6d32121dd12d59b51e7678769da5c405b1d549fa130631ae3f1989b78fba48
-DIST filebeat-5.6.9.tar.gz 18209544 BLAKE2B 41891b984240af46fb3d9d7818203d7ef8fd5a089d7683877e3907061259442da4884976cfefcc90666699ebe3adb1ce6c87a026a50b07e218a5de6b642b9472 SHA512 2aa40afbd0f1c987aebf51d22aa03c87048766a4c7d41938ff27ffca841666d34cfbf08ae120d98d222a7d3ff447bbce9f1d65b434aef1c9d73c5019aa1558a1
+DIST filebeat-5.6.10.tar.gz 18211551 BLAKE2B 5ed3a3d63fc758757cdb30e999a10bee15c8a66d7b4b603f755ebdfad712f4b48c2a1b79612dcfe3ce89d29458e672276b26f188ea3509ce4c349e2bff8b7508 SHA512 cca193e0c03ca5451c6158ab8f0669bf24aa0d34d46f2a4808d27f4ce1ff701dca6ea2db7a72275a635ea4e091571aa73e0b51228750b140a5340d27cba0e982
 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
 EBUILD filebeat-5.5.2.ebuild 1646 BLAKE2B 37f6ac540ed27b471021be5666233d00ceacdcbdf6a32954c5987fa85c957223d84536dd5c0e93bf6acd988b01a061008cffff005806d8b2d8cee7f722884f33 SHA512 4b36e36a4f95c893bca863c4510e903f6265e4950fa000cae61896915c558beb4d8c4b10d8aa78d154bef7eb67886628f499153f988ff66e5b1066cb949b2029
-EBUILD filebeat-5.6.9.ebuild 1496 BLAKE2B cd528a4a68ef61ae3f5fea941e8a71e72002cb5b18814b3d9b3bdfdd86520f42ac87818acaf313807a2b7cdc1eef1f6ffa26d06d5190b9446c3f95b614718158 SHA512 0a7de42d1408d5c3a54836ebea8450e27b57f42824dbb1e2ce3d705123df752d8f68e8c40de2b17a6dae93307856eaa3898925994839e6d5e13e7275a30988f9
+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
 MISC metadata.xml 461 BLAKE2B 8bd064daf5ee2d3fe746a73bf36f01926fee1f9796b29499a7fb1db844aface3be7dfd137ed31f606e78834c1d7a135d0119f400244ba33ce3feb81fa792eb6e SHA512 903c43c9cf4b371e34afffd0b425086d5fba6f37af0d761fc0065d114dc843ea0dcdd439682e48749bdf2f9138bfc3dc6cfcc6490503daeb7a71ce5706a779d8
--- a/app-admin/filebeat/filebeat-5.6.10.ebuild
+++ b/app-admin/filebeat/filebeat-5.6.10.ebuild
--- a/app-admin/filebeat/filebeat-6.3.1.ebuild
+++ b/app-admin/filebeat/filebeat-6.3.1.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver
+
+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"
+
+S="${WORKDIR}/src/github.com/elastic/beats"
+
+src_unpack() {
+	mkdir -p "${S%/*}" || die
+	default
+	mv beats-${PV} "${S}" || die
+}
+
+src_prepare() {
+	default
+	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"
+}
--- a/app-admin/graylog2/Manifest
+++ b/app-admin/graylog2/Manifest
@ -1,7 +1,9 @@
 AUX confd 391 BLAKE2B 35b7806d977b6cde07d4b8b9d6b41771110c5bbbe7037003392238850fcd8c36b5e561ef4e8d94dcc063c51b684650a932e3eb9b786f076bc2ba1bbb2c0d9842 SHA512 5adfb7b72488bd25e26fd7ddee90f50a244d2a90b3dff63fc9791fb213cf14da09e0ead75eeb33e540218b343564d7b56552414c090b517e4abdd8bc7cd58f68
 AUX confd-r1 521 BLAKE2B 4fa7105f843a4e2df8d610ece2601caef641c6a29026e89c0e6180dd0a47444fb73f4d17f3b811c624f02749703bed260757999fab2cdf534c75472a70e6fc39 SHA512 a1fc50cbab0960cea36bf77b052284d52ec7bdd23e56d90fcb1712dcee608c4c0555557c4cfaa5fb0ce6165f0cf1a88888e705e9c64104af79a18be525ec9725
+AUX confd-r2 542 BLAKE2B 83a8b2a3bf1fc60a2a9475d823efe39febb961d0aaee12b7b18f1d2752427e401fe2f68c83f777fba1d2f585540f4d9b422befcc959aa082a26eeef2be093b2b SHA512 fde38b6813f40633db5d5cbcb3d93fd17e8705d6f2c5805fdc900858fe2b0cf0c0c219345dc741cc2573b1f80b42fdf5714e71fa31938329355556503492bbb8
 AUX initd 1418 BLAKE2B 5075e527e83fbe50dae812b07f5b80a09936062ce4d51f2c2e287018b89adc392ee8839903e1ee11899176d39d67b7b8d526b26438243d70b9f5a6622361c98a SHA512 69017bc9679e710a100fa71f651d619c485954515883116287135a52c05335fb6f868eeda2bac4ea877ed8464a7cc2ac34df355189986aba172495aecc9a5379
 AUX initd-r1 1580 BLAKE2B 23b234ddc3bb2ab1e0f23795ab79fb82abda2b695c1f6fd2f1977999df51a8e4b998ca8d0e1e954c68d4c057eadec3cbe0b0309ec8b8898d7b005499675a743c SHA512 871085b5b50ca473451c42a39181ba4a626475abfc7160f7308e6fae9fe78b6bcdef397c0f5a44d9949adcbaacdb0c50fe236b54e95e1602896f4339c71c3b10
+AUX initd-r2 872 BLAKE2B 500a428a0f479dc79b1d8b7d6a1acfafe9a205a65adfacd10aa6f5e89c105c30e095e69799acd8739d9ed2b7dee0ed6d053497a74495a986b6d9b24122c29a75 SHA512 43632bd345bb3772018ce1fe32a97c85a1ad812dca2ae229dccb65302e686597dad4b62ecbc0cc5358c34761f354d51de2c9fe81bd3db71af5fdc0a6cbc0e95e
 DIST graylog-2.1.2.tgz 94284738 BLAKE2B d4971bb6fb073f575d20204b49e7edf24773f42e4c9b84f0e1d2a5834bf8d95120ef1fa6391b22714923fa1f62e623f02a6788c82b1f48fc86f4953d484de36f SHA512 df636143ff90b0aedcb6db78e20125c10da2428b6e474e925d6fc011fdc3a0b88414ec914981a71a0e08c4916cb5cd18a8eeda28e01d9edf3b3ae4a8fb0a90dc
 DIST graylog-2.2.2.tgz 99956086 BLAKE2B 55499d11d9f9a81df8670521f62a45323941f7acac1b87a4df96dfbe0f14a63640cd536ab1c8affa69fe1c774d37b75ca8d0d4bc6194622267a6f5640cf05cc7 SHA512 341548b5d48e3a2008a1264128a604320b566b8f0e8da4d2fca54a69e1412a69839d09698e13d97dd399652611a3e24dd54dc81f56bc4ca00278afbd61ba9c2c
 DIST graylog-2.2.3.tgz 99971278 BLAKE2B 981568151fa22b3b180a451075c9c66c1e9148d737e4683fdbeb505fccb54729619fce554ee3efd423f971081005e73e481f69d9b81676e80f1276b4a982cd6e SHA512 19ad14bdee733b4ceed526af7f446fc74a4ac5bc6a0b4784618edd84a84aa00378c203d4051a3232c17caaf47f3ffe684cb8b17ce88c8d98e7b29bc22c0058e8
@ -9,5 +11,5 @@ DIST graylog-2.4.5.tgz 122974260 BLAKE2B 0f04713fcee112f1018a78bea7c39b456ae167e
 EBUILD graylog2-2.1.2.ebuild 1862 BLAKE2B a029af6558cb63476c97d6eebdc796145bdbc99dcbfbf428396bcb2d53a66cb04c01e890f47f7ee84c2ede0b5b04d77cdfb7cdda8e9f107baa0c6e5695381b99 SHA512 43efdd7b105a59ce897beda8d49c4797ccee133929df87903a47c4d22faea1e5bec8ba2e80519ea5d635afdd2f8933fc35dda022078ddc2c251c6db43f45f157
 EBUILD graylog2-2.2.2.ebuild 2199 BLAKE2B b923e54efdc27566bdb33115e97a924976022eb7c7d15420c599a0f2705cae5079dcaab64f339a6af3ced35a15bc3efe211b66da82a199ad1c067659c3211a49 SHA512 d8fc5fbd3a09adb4dc0904e501103e9e6da18f1ab80a19908190a91cf271fcf997f73fbfdecd6a28acafa763643335c76c653a2759fde581025e1af5ff77255f
 EBUILD graylog2-2.2.3.ebuild 2206 BLAKE2B 5cc4fd2c40d7f0548b47931e013d99650d2fdf33931c95e2132721bba7393f817f7f2ba0d58d1f5f9a752667ea2dcbcb632fa5d1309c3c3113b8d4ca2c75917f SHA512 a7e6ddf34c75c835cc85fc6b5b58aed0005f88b4e0488d35832930db11d57d7c7896ccf495e3b04dad9d9330f4c98da906916c0e0cdab96956b04f3b941a9016
-EBUILD graylog2-2.4.5.ebuild 2117 BLAKE2B 0b90692a5852a5970f8e91658e5aa214fe3a7db7b85b11c85f184fa861c1791efa36783c56c6e1fce34ca3db8efe0b9ac5b58a6817ea54f466fb04c7a3db0147 SHA512 934e417d8bafe1fca2ff5e45bb7f4795af23e4abd1dea8d224e0b206575d5a468f05185ef57fef56cff85e69357d5c854656389287386cbd693f3dde072ccfac
+EBUILD graylog2-2.4.5-r1.ebuild 2289 BLAKE2B c1b21ab668e1c0877b3cfcadf63538de1a3eaf9a85b043b34d56774f73e436454e499f22f8d7cc3f2262a01866d8e55ef9ea3be9195fe48755ebfb015fbb992d SHA512 864b58319a8ff84bd6a94490eea9d89de800dcad678302df1ea4f834f27b5b18a5f8c0ac8ae57bd0c23d3c0904e99a90a0d363abfc39442bef5b55a70783ec1e
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
--- a/app-admin/graylog2/files/confd-r2
+++ b/app-admin/graylog2/files/confd-r2
@ -0,0 +1,12 @@
+GRAYLOG_CONFIG_FILE="/etc/graylog2/graylog.conf"
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_GROUP="graylog"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+GRAYLOG_LOG_DIR="/var/log/graylog2"
+GRAYLOG_OPTIONS=""
+GRAYLOG_USER="graylog"
+
+JAVA_OPTS="-Djava.library.path=$GRAYLOG_INSTALL_DIR/lib/sigar -Xms1g -Xmx1g -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:+UseConcMarkSweepGC -XX:+CMSConcurrentMTEnabled -XX:+CMSClassUnloadingEnabled -XX:+UseParNewGC -XX:-OmitStackTraceInFastThrow"
+
+# Please adjust according to your bind address
+rc_need="net.lo"
--- a/app-admin/graylog2/files/initd-r2
+++ b/app-admin/graylog2/files/initd-r2
@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/java"
+command_args="${JAVA_OPTS} -jar ${GRAYLOG_INSTALL_DIR}/graylog.jar server -f ${GRAYLOG_CONFIG_FILE} --no-pid-file ${GRAYLOG_OPTIONS}"
+command_background="true"
+command_user="${GRAYLOG_USER}:${GRAYLOG_GROUP}"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+output_log="${GRAYLOG_LOG_DIR}/graylog.stdout.log"
+error_log="${GRAYLOG_LOG_DIR}/graylog.stderr.log"
+directory="${GRAYLOG_INSTALL_DIR}"
+required_files="${GRAYLOG_CONFIG_FILE}"
+
+depend() {
+	use dns
+}
+
+start_pre() {
+	local d
+	for d in \
+		"${GRAYLOG_DATA_DIR}" \
+		"${GRAYLOG_DATA_DIR}/data" \
+		"${GRAYLOG_DATA_DIR}/data/contentpacks" \
+		"${GRAYLOG_DATA_DIR}/data/journal" \
+		"${GRAYLOG_LOG_DIR}"; do
+
+		checkpath -d -o "${GRAYLOG_USER}":"${GRAYLOG_GROUP}" -m750 "${d}"
+	done
+}
--- a/app-admin/graylog2/graylog2-2.4.5-r1.ebuild
+++ b/app-admin/graylog2/graylog2-2.4.5-r1.ebuild
@ -12,18 +12,20 @@ SRC_URI="https://packages.graylog2.org/releases/graylog/graylog-${PV}.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-
-MY_PN="graylog"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-INSTALL_DIR="/usr/share/graylog2"
-DATA_DIR="/var/lib/graylog2"
-
-QA_PREBUILT="${INSTALL_DIR}/lib/sigar/libsigar*"
 RESTRICT="strip"

 RDEPEND="virtual/jdk:1.8"

+DOCS=(
+	COPYING README.markdown UPGRADING.rst
+)
+
+GRAYLOG_DATA_DIR="/var/lib/graylog2"
+GRAYLOG_INSTALL_DIR="/usr/share/graylog2"
+QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
+
+S="${WORKDIR}/graylog-${PV}"
+
 pkg_setup() {
 	enewgroup graylog
 	enewuser graylog -1 -1 -1 graylog
@ -32,9 +34,6 @@ pkg_setup() {
 src_prepare() {
 	default

-	# graylogctl is replaced by our own initd
-	rm -r bin || die
-
 	# Stick to architecture of build host
 	if ! use amd64; then
 		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
@ -57,28 +56,32 @@ src_prepare() {
 		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"

 	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${DATA_DIR}/data/journal@g; \
-		s@#\(content_packs_dir = \).*@\1/${DATA_DIR}/data/contentpacks@g" \
+	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
+		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g; \
+		s@#\(content_packs_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/contentpacks@g" \
 		graylog.conf.example || die
 }

-src_compile() {
-	einfo "Nothing to compile; upstream supplies JAR only"
-}
-
 src_install() {
+	default
+
 	insinto /etc/graylog2
 	doins graylog.conf.example

-	insinto ${DATA_DIR}/data/contentpacks
+	insinto "${GRAYLOG_DATA_DIR}/data/contentpacks"
 	doins data/contentpacks/grok-patterns.json

-	insinto "${INSTALL_DIR}"
-	doins *
-
+	insinto "${GRAYLOG_INSTALL_DIR}"
+	doins graylog.jar
 	doins -r lib plugin

-	newinitd "${FILESDIR}/initd-r1" graylog2
-	newconfd "${FILESDIR}/confd-r1" graylog2
+	newconfd "${FILESDIR}/confd-r2" graylog2
+	newinitd "${FILESDIR}/initd-r2" graylog2
+}
+
+pkg_postinst() {
+	ewarn "Graylog does not depend on need.net any more (#439092)."
+	ewarn
+	ewarn "Please configure rc_need according to your binding address in:"
+	ewarn "/etc/conf.d/graylog2"
 }
--- a/app-admin/lib_users/Manifest
+++ b/app-admin/lib_users/Manifest
@ -1,3 +1,5 @@
 DIST lib_users-0.10.tar.gz 25636 BLAKE2B 6e660b80ef75f71d47f4783dc741e8b0c17f3cfe31296c5624adcfed5836a0b86964f042eafb5b34e259a824c79efb537558d625bc16d07fb388d61ece7c6329 SHA512 dee8203457570f686df69dc91d71614b462845c848a3445fd9b9f94047fdba8171cc2555fa4299bc4c361905d488c1f17cee4ab0e99899f37995377d6011805a
+DIST lib_users-0.11.tar.gz 25660 BLAKE2B 8f5a827840d4074a0e8abd77e43f60eb09f199f58a2bde0c2bce7613d6ba1d9b12dd46adffa528ff351f54933c304f274abef9c35550d7af3519101dcec69d0a SHA512 a54fc8f57cffcd08e77e86eaf50ec6e68e45e1e9458e25e035af90e14be13980a400c4d264f70ef67e141e1d54581b0487b2b70dd084dc5840424221b46f644a
 EBUILD lib_users-0.10.ebuild 1117 BLAKE2B 511c6cc9302552d0f0c70221ed81079f64b8a8fc9bf35541d03130769981f5d96a2243fccaf122b9d2875d5fbc794e094ebbdd3a56a33ccbdf1f8b0ccd844033 SHA512 d5e8f63944f2b7e6cc6bb34b170f59b534cc5c6c8346ade237110a621e27dc2253969ec969321d5567e6d0e70dc9a3d57219321d41cbe27462e109b590c2a605
+EBUILD lib_users-0.11.ebuild 1123 BLAKE2B a598c57cb898438aa386a80b9a9445ecae5372ee8617ef5c2447a3319bb4af87fe78ad361a9a0d2dfb8067811d3fde8f6f28b6de23a6ab9ef55044e19f96d6a2 SHA512 f1f0a4725a1897951f9f61099b810c846419689c00e6dccbac5efaeace57f31cfb03c042f53ccb652f7be75fdcab5308a9106094e04bc3802f4f6de96f145740
 MISC metadata.xml 454 BLAKE2B c545fd1db330988ad139de08b1890cfd9d6aac98947b954fb761515d314d8ebb941829e7767fe4fad6beb41caf3409111505d1a6378c852f15907933678ddd48 SHA512 c897ea5b6bed9fcc8715380a1b2756f376a095925a2c99a78ce6729cc9839683f40ce53f5faf0fb784169db5ef9162f1659ea6f24304bcc7cd47f90d49ec97dd
--- a/app-admin/lib_users/lib_users-0.11.ebuild
+++ b/app-admin/lib_users/lib_users-0.11.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-r1
+
+DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
+HOMEPAGE="https://github.com/klausman/lib_users"
+SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+	)"
+RDEPEND="${PYTHON_DEPS}"
+
+src_test() {
+	python_foreach_impl nosetests --verbosity=2
+}
+
+my_install() {
+	python_newscript lib_users.py lib_users
+	python_newscript fd_users.py fd_users
+	# lib_users_util/ contains a test script we don't want, so do things by hand
+	python_moduleinto lib_users_util
+	python_domodule lib_users_util/common.py
+	python_domodule lib_users_util/__init__.py
+}
+
+src_install() {
+	python_foreach_impl my_install
+	dodoc README.md TODO
+}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@ -1,9 +1,5 @@
-DIST rarlinux-5.5.0_p20170811.tar.gz 546839 BLAKE2B d90bda3092fb636fee1db4f222632cf3d45c99f330298521b2a0957cd7bd4845f4518cf394e03a4e302d45cf73a37f5da5ac0cd7eba08a4859fd221697656c20 SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb
 DIST rarlinux-5.6.0_p20180624.tar.gz 552245 BLAKE2B 9988b67d545df89bb7087c2bbec5a6fc47d99f6fd8a97e3581f135dc829a43e5c044248e95f60f7cd29370a0955a3c4c8a6667bfcead17301dc0f45ddae0057f SHA512 a0baba489c9268bc25c814c94747c117de66599f91da875b0e0b8233c24910f0e831f8b407f7a9bd8d709da6bdea4ef50306ce456ea5089f893619b8ee5b780f
-DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 BLAKE2B be453cab6720abc4b01f5aef6c5874b0ff328656f8452b2a671b1b5305427dbb0de2af4084e25e972c69fe4ca4072b10f21d66f7fee23a3e205b0b4f533c8b7f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66
 DIST rarlinux-x64-5.6.0_p20180624.tar.gz 541604 BLAKE2B 2fd865af38db47c556341bb2482ee9af83857bc196e08f9b47d5a0f8ccae708931c09dcca2115866d37c03b77f7548da87cf2e778f003e9a432634b9ae378aae SHA512 e8427d12016d4298d1e3ca3dc32f367e2b7a407572e48c665eaec796c3538d50349760b5691bc6d58256a5470dc0c6637740fcdc6e8a9bd420193fae16e209eb
-DIST winrar-x64-5.5.0_p20170811.exe 2220872 BLAKE2B a37783f427440a5166021475f024ca6e281b4f0d39926e55c00588e51d371bdd1bd16bd04ed65c363f7aeef6d7e2b0ba796325f7f290e45cfd8c09048ae25489 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66
 DIST winrar-x64-5.6.0_p20180624.exe 3180248 BLAKE2B 3ddbef82e2ecee7960c5d282de905a2d4d279c3ebae9ceb9e5b72a822d352a80d189a76514a414840ea5ad8002d718435757c860a0935134b6eba01b70e0f444 SHA512 61896901b580476d4c12d40d42eef725de270beb0b01526e7d5d4e02847a7b67b0380f0a365e92eafe2a2303d60945146457d43430aace51c9a443a8b1ceef48
-EBUILD rar-5.5.0_p20170811.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
-EBUILD rar-5.6.0_p20180624.ebuild 2279 BLAKE2B ad6b6a2875119d5125fd8b59be5a2c6bb839938542f2cb8c8e7f5544678964e45bd81b9ecf7399a9593e8c3daa54e3f19d6b073bbea3f5ca3ccaef9b5820984f SHA512 393e1805fb47027e6f12b41a435984288816001ec6ef03a71ac482bdf816106bbea89e4dcfe81c529cb3ad17b4db9dc39f14d95e2968c654a15294d14bc337b6
+EBUILD rar-5.6.0_p20180624.ebuild 2277 BLAKE2B 5b0b46e69ad6087789f311667a5168c31ca9eedf5acd889ee5a1b21a91f4932d259af6607ef3a03a871d55066bf6dc5562320f848e2ff344123b9497d3bfc423 SHA512 ef72607d08f840a8f0f4ac72e5a6e22733c49757afc25a4b9fbee049fee25e7fcefa70eae44df5f1a1e9293bfa60c51899bea2ff06892d09cd275878fd18b87a
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
--- a/app-arch/rar/rar-5.5.0_p20170811.ebuild
+++ b/app-arch/rar/rar-5.5.0_p20170811.ebuild
@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="RAR compressor/uncompressor"
-HOMEPAGE="https://rarlab.com/"
-URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
-URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
-URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
-SRC_URI="x86? ( ${URI_x86} )
-	amd64? ( ${URI_amd64} )
-	all_sfx? (
-		${URI_x86}
-		${URI_amd64}
-		${URI_w64}
-	)"
-
-LICENSE="RAR BSD BSD-2"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="all_sfx"
-RESTRICT="mirror bindist"
-
-DEPEND="all_sfx? ( app-arch/unrar )"
-RDEPEND="sys-libs/glibc"
-
-S="${WORKDIR}/${PN}"
-
-QA_FLAGS_IGNORED="opt/rar/default.sfx
-	opt/rar/default-elf32.sfx
-	opt/rar/default-elf64.sfx
-	opt/rar/default-win32.sfx
-	opt/rar/default-win64.sfx
-	opt/rar/WinCon.SFX
-	opt/rar/WinCon64.SFX
-	opt/rar/Zip.SFX
-	opt/rar/Zip64.SFX
-	opt/rar/unrar
-	opt/rar/rar"
-QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
-
-src_unpack() {
-	local _file
-
-	for _file in ${A}; do
-		if [[ "${_file}" == rarli* ]]; then
-			if [[ "${_file}" =~ x64 ]]; then
-				if ! use amd64; then
-					continue
-				fi
-
-				unpack "${_file}"
-			elif [[ ! "${_file}" =~ x64 ]]; then
-				if ! use x86; then
-					continue
-				fi
-
-				unpack "${_file}"
-			else
-				die "Unknown SRC file '${_file}'!"
-			fi
-		fi
-	done
-
-	rm -f "${S}"/license.txt
-
-	if use all_sfx ; then
-		mkdir sfx
-		cd sfx
-		for _file in ${A}; do
-			if [[ "${_file}" == rarli* ]]; then
-				unpack "${_file}"
-				if [[ "${_file}" =~ x64 ]]; then
-					mv rar/default.sfx default-elf64.sfx || die
-				else
-					mv rar/default.sfx default-elf32.sfx || die
-				fi
-			elif [[ "${_file}" == winrar* ]]; then
-				ln -s "${DISTDIR}"/${_file} w64.rar || die
-				unpack ./w64.rar
-				mv Default.SFX default-win32.sfx || die
-				mv Default64.SFX default-win64.sfx || die
-			else
-				die "Unknown SFX file '${_file}'!"
-			fi
-		done
-	fi
-}
-
-src_compile() { :; }
-
-src_install() {
-	exeinto /opt/rar
-	doexe rar unrar || die
-
-	dodir /opt/bin
-	dosym ../rar/rar /opt/bin/rar || die
-	dosym ../rar/unrar /opt/bin/unrar || die
-
-	insinto /opt/rar
-	if use all_sfx ; then
-		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
-	else
-		doins default.sfx || die
-	fi
-	doins rarfiles.lst || die
-	dodoc *.txt
-}
--- a/app-arch/rar/rar-5.6.0_p20180624.ebuild
+++ b/app-arch/rar/rar-5.6.0_p20180624.ebuild
@ -18,7 +18,7 @@ SRC_URI="x86? ( ${URI_x86} )

 LICENSE="RAR BSD BSD-2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="all_sfx"
 RESTRICT="mirror bindist"

--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@ -1,8 +1,6 @@
 AUX fsarchiver-0.8.4-xattr.patch 1875 BLAKE2B 57841c69bbfe68a55f83affb5e0ec2f7583673d1741d780e71bd55817a5659dc34d75b56bea531ad41365ff741b6c17965926456809b61fbdeedfad33c9b0867 SHA512 cc1e632bd7147da8af77d4f45c473617f1d40768dd30f94880384f3cfb3f43df85ab6f3917b48a2299a267a7c8861ba5f3b1bbef1e8a706eebba8a849fda2e50
-DIST fsarchiver-0.8.1.tar.gz 265048 BLAKE2B 2bf36ea0c1370abcce94e7e603ae98112c7da09ec6f9c7c928d78596093a6e478032a2e4ed408ace0a938b909be7317f841a84f2906345f20aec077d9372429e SHA512 17133392b0678b88552ae356bc199a8a5a8a88d3c8878b593b36acdc0f9dc3869f87475cc1a36d0df752e3bc3df8c9c0641954f675aaf60da4f1b0862dec1bc6
-DIST fsarchiver-0.8.2.tar.gz 296486 BLAKE2B 655377c4e99bd45eccf529f13a3bf1f1e944a9fb18f91f57d2c59b46beb3cf7f85b9c1ab617aea7e021009c242a016cc351d6117466768c6ebbacd9be756d783 SHA512 e7b5b5dcd44be57d2d8a2639a54d8ef9c8bf9fde39ed3ca317c7cc124e1735a88db4a2be937b890c582eb4881926c8d50cdf940d13c0f97f9b8276f2b0a9319c
 DIST fsarchiver-0.8.4.tar.gz 298793 BLAKE2B 706b1ed8a3966703ce8e6b0e16a502645317158478422e0fb999ed277185f83ca9a5a607f189c9bbf6b63c6bf1b4d9589d51fcbf3b256d57b6cd056757156ae3 SHA512 15712e5fdb9695148e8fe42791952acf0c7d34611c3467a0cb2e2631c9c5f1c55a4e839098085e6a72c2d8988b05e6f515ef772bcc5766b57a07da65a5209efd
-EBUILD fsarchiver-0.8.1.ebuild 895 BLAKE2B ac38b3dbecb3eec60225f32615fa7d78d4442c9d393eabf35559e5482b7ee641fb07128b3d7310683229a3b1ccf858d0dee4f64fe4f9f750868545904ca3eff0 SHA512 0848bbe0f95cd3ba2f56b42fd17f51982b8476b9b4800967cf2aabf29cb909e5eefd9b69c47aa0c41c02456d327b40a53181d74fa3545171a843bf5a2daa7b1e
-EBUILD fsarchiver-0.8.2.ebuild 903 BLAKE2B f31554f388fc627e16da158ca254ac4de837e6cba368d61fefee9d329b1a5f336a89509a807c61efebcc0d51b311889fb1fcaa8c3f47da0eb8441340d1251164 SHA512 1cae4d5f5ee113820dab9309d1f4c351229eb50439d02ef55dd2d9486e3c2786866234ea619600cb219dc515e5d13c3fe04902aaf2ed35fab7f35b021e8974b6
+DIST fsarchiver-0.8.5.tar.gz 298502 BLAKE2B 434fbc945bb4999243fe2b6a212c6b04118ae37749b4b14b590cf8269e541a5b09954e75a898126c8a55b5b516f458a1cf1842b4a9f4ead2185c7b5e8c99343c SHA512 bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff
 EBUILD fsarchiver-0.8.4.ebuild 1161 BLAKE2B 4efb9c4f957970f0d9a419100014ad9ebb280f1c264d8861e36b75235fc17592651573fed512d42a4075b85c44ba9a9c7208ec4839a4eeec4e370264e20fb439 SHA512 2faf1f1528578db1b5a1abc3e6e525b5e6121021b2a6658ea04546de151f89ac5e94c8481fc4bd8ff0a347e8e7aca40bfe8e3f6f60198be2f10c15a6fbb6c3fd
+EBUILD fsarchiver-0.8.5.ebuild 1140 BLAKE2B 92fc4c9a6bac17acc897d674ac16eccc34621ec2755ddb98fe1c01468772798116e22a3335fe541e62891e0309f84af8a379d8940885a18acbc53c6b8da5d5d6 SHA512 c29a3b4facc93afa1ca6262534d1ce2969efe7007806cd25c93cb0941184cdf892ecc6631dcdcf198b1b4e99c3f87fc1549987a5386762924a7cd15d23563790
 MISC metadata.xml 519 BLAKE2B e4afd2bb8fde74149478f3a4d987fc37ade9fdc874b1e88235a0076e177fe97f03f87d994e44ca0392f3960b0599629d68f7c9a4c6d4b98de66b34d963aa8815 SHA512 c9bcbf8757957ce60ca5ea13e485d0241731052eaf0a73eed75734412429ddc6372244e78c92537f8efd886a3976055f060b67c8fa9a025d5b7dff48fc23c316
--- a/app-backup/fsarchiver/fsarchiver-0.8.1.ebuild
+++ b/app-backup/fsarchiver/fsarchiver-0.8.1.ebuild
@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
-HOMEPAGE="http://www.fsarchiver.org"
-SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug lzma lzo static"
-
-DEPEND="dev-libs/libgcrypt:0=
-	>=sys-fs/e2fsprogs-1.41.4
-	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
-	lzo? ( >=dev-libs/lzo-2.02 )
-	static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
-		|| die "seding failed"
-	eautoreconf
-}
-
-src_configure() {
-	myeconfargs=(
-		$(use_enable lzma)
-		$(use_enable lzo)
-		$(use_enable static)
-		$(use_enable debug devel)
-	)
-	econf "${myeconfargs[@]}"
-}
--- a/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild
+++ b/app-backup/fsarchiver/fsarchiver-0.8.5.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit autotools

@ -12,14 +12,23 @@ SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug lzma lzo static"
+IUSE="debug lz4 lzma lzo static zstd"

-DEPEND="dev-libs/libgcrypt:0=
+CDEPEND="dev-libs/libgcrypt:0=
 	>=sys-fs/e2fsprogs-1.41.4
+	lz4? ( app-arch/lz4 )
 	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
 	lzo? ( >=dev-libs/lzo-2.02 )
-	static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
-RDEPEND="${DEPEND}"
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	static? (
+		lz4? ( app-arch/lz4[static-libs] )
+		lzma? ( app-arch/xz-utils[static-libs] )
+		lzo? ( dev-libs/lzo[static-libs] )
+		zstd? ( app-arch/zstd[static-libs] )
+	)"
+RDEPEND="${DDEPEND}"

 src_prepare() {
 	default
@ -30,10 +39,12 @@ src_prepare() {

 src_configure() {
 	local myeconfargs=(
+		$(use_enable debug devel)
+		$(use_enable lz4)
 		$(use_enable lzma)
 		$(use_enable lzo)
 		$(use_enable static)
-		$(use_enable debug devel)
+		$(use_enable zstd)
 	)
 	econf "${myeconfargs[@]}"
 }
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/geekbench/Manifest
+++ b/app-benchmarks/geekbench/Manifest
@ -1,11 +1,9 @@
 DIST Geekbench-2.4.2-LinuxARM.tar.gz 1921401 BLAKE2B 34d86178e35d586b79182b3320303258a5dcc6f169cee0134f1114927ff52745d5f6c0b5d604698e45a464a157454a249cab8e3114b01dad3f7b693ca45a5b0b SHA512 0acc0ce61aa5d2575976c66aeae6ebb88ba895dd89c07daf55e2c7af344858a620336f3e79ccfc5e7b8829caa9d600f97a35a4d6e4da630d19d723dd887fdafe
 DIST Geekbench-2.4.3-Linux.tar.gz 3337551 BLAKE2B cb660f3c08cc812cb23374032490a148449a36845fe63320788432493581ec6bd5958bf178d83d68b532ffbe5c7ee13e92b0bb00c0aca968bb2e499453f1b7a7 SHA512 d84e13eb5fd28fb232a5f93aa76f4855adcb9ccffbcd90dacc3e2b45231afd82e78d40c63f729391e5d00e95c14653e83757faca4e543c6306dd913c4e0edb87
 DIST Geekbench-3.4.2-Linux.tar.gz 9986039 BLAKE2B 63d7e768d65bc033260a0d99da17df2e518750f19882e63dbc9bbe6ff0b52a8cddb35b9143e85c01838bf5d77a04599578fc0a57a3e6fd89e7aec8c8ffdd4f5b SHA512 a61a5d5481682baefdce64f6054c3373900e8cd585dcbfa2feabbf386032986b40b603619c552102401a83e0b748831d00af5b5b5278e88ef42dee176adf06e9
-DIST Geekbench-4.2.2-Linux.tar.gz 71028908 BLAKE2B 640df8bb207ea1a0a8b5c7fc4725b517406826b5d9045eb2970515c4d175be1e9972582544f7088c113e725c067ec119d390c2cef183108dd592005e60740e8a SHA512 616b8eed266407154a3dcf09af5c4047cf0be8f852d6aae663f26a29d4a9df3bcc2b4c233b21614071ee0be3ca7316c5f09bccd4769b6db78a4e6187e281920c
 DIST Geekbench-4.2.3-Linux.tar.gz 71032570 BLAKE2B 9589c355561acffdfe6b68fcb7a73a7d3c87376db10b70d471d7970491c9ce29cd66e9d5f48968cb2b34fad6440a8667ebf061976e5b838295fb002442de101a SHA512 eaeb1657a1eff0dd8fac4b9a89e5a7d0da22e396e35ba6a1255c2a5c4434ad1a23cda54f28f4271a9a5450e57b3601c344964ddd96dcdef1144f17b7fd20aa4b
-EBUILD geekbench-2.4.2.ebuild 1101 BLAKE2B 93dd1eba6ddae5b402cb07268107eaef71270119c0d83206b9951f7ddc4bf68dabb0e332eee312fd7134c14b0b190f77efe629e5e8a51c92c032c85fc1ec9241 SHA512 522b4330990ef4b965769ee4b72edbf8ab2998bfa7d01be159fa6c95cb811d7af2c99e43497f5576102b7041192dab9ce45a91d39bc5fba0eb640052f7e58c63
-EBUILD geekbench-2.4.3.ebuild 1163 BLAKE2B 1613632c4943e554ba9d01fe4b026f713395eba64d9f373ea631f6d24462dfbf889e269d6fe2f254137f0c2c6eab8b1f963955fbd155d65adf25081d34f74762 SHA512 69f90a561f0201d7209e87842f075e9da17a78655490eb801937b0d82e22a5a3a4d4534e1d9a3504516b9da3063093f22016f3b4609040b7fe6d7832edb90d03
-EBUILD geekbench-3.4.2.ebuild 1163 BLAKE2B 638365642db8db662ae19c3ef439a4076a60c7356b3142d850d2570ac55778d8837d46981be1c0ee4d2ea342ee271d95455fa8691baad99c5a52815f818be02a SHA512 b11dde6666585fa1e7471fdbc14749413468808c228e520d235466f0398d998b4118b8dd26cc30c6bdcd7a1beabbf4e4a2db72247bc67516ac07e488b4043258
-EBUILD geekbench-4.2.2.ebuild 1152 BLAKE2B 6b9bfcb5f3fac533eba78c60ad18b80630d70b4c1f54a91be0f93b08918f707006578a277933adb23de6244de6c9244e3fd796c2c1333d2885013ea805f92b90 SHA512 e7b1e6145ae6a82008d2c3d39729f7f621dfc6a1b9c1805aa24ce658ae3c0e901a370676cd600fe7de2aacdd9ad3588ec8bf053ec2648002074d6b037bdc66e7
-EBUILD geekbench-4.2.3.ebuild 1152 BLAKE2B 6b9bfcb5f3fac533eba78c60ad18b80630d70b4c1f54a91be0f93b08918f707006578a277933adb23de6244de6c9244e3fd796c2c1333d2885013ea805f92b90 SHA512 e7b1e6145ae6a82008d2c3d39729f7f621dfc6a1b9c1805aa24ce658ae3c0e901a370676cd600fe7de2aacdd9ad3588ec8bf053ec2648002074d6b037bdc66e7
+EBUILD geekbench-2.4.2.ebuild 1060 BLAKE2B 4700a2c4c82d5e829bf7b254c1a94a5bf47e1c534e1fad2b37458ddca39ef1f1372ec8d3727c69ecc0c462ec2514abea33a48aedf35c7eee5444dbea8e9ddf96 SHA512 663d11705c70d7a082678b7ee74802651734fe367458a7e10974f33b7c22930d78eddee7a1c56993e11a856da0efeef0412e02696485d7def3e4a6e0464b39f5
+EBUILD geekbench-2.4.3.ebuild 1122 BLAKE2B 70fba3ad954717c01cefd5b2df1ce40294001ad82f25dc82a3b5ba05650fc98bddc5e2c060f6cddd44a9e1028cf2fa8b908a3343491d6fe3b966ddfcad4d6f2f SHA512 3c6b303ea5459f9777bec75ea555a2794d7bbdc4d0da8a5881181e3dc5c8b6796191fb86c9536576c3ad43a7d4613ba22792e9a333cdde4de862a786f53b5e21
+EBUILD geekbench-3.4.2.ebuild 1122 BLAKE2B 8f4d72914a7333869104cac7f97a61c759699405c6f9bde61c95ca38a3804c4538ed8c679665537a380ed2892c685a9e365faa7ef54f1e8e0cae13a659d0cf0e SHA512 caf0856adbd7a3420f89ef5dcbc66629241c891f1129dce540832da224c34ac1d66a9b594503650566ff802683bd6c5f170ae31d95c2ecc147bf8dc64ae79c6e
+EBUILD geekbench-4.2.3.ebuild 1111 BLAKE2B 819573e558d88206121c461935c424e85e85f811e3c00669627daa0434cd5505ea0fc0621ad0b93677ad19023c5a78a9203319d4160952a72f9b1bbf2b9c6f53 SHA512 c51a31b124940476742ba26497652e0cced23f2cab230222246be02ddc2f90359580cb517374f8498b63bcab5e66dc82a8bec0c3b6cc5d0bbaf1d3a182900f5c
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
--- a/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.2.ebuild
@ -11,9 +11,6 @@ KEYWORDS="-* arm"
 LICENSE="geekbench"
 SLOT="2"

-RDEPEND="sys-devel/gcc
-	sys-libs/glibc"
-
 RESTRICT="bindist fetch mirror strip"

 S="${WORKDIR}/dist/Geekbench-${PV}-LinuxARM"
--- a/app-benchmarks/geekbench/geekbench-2.4.3.ebuild
+++ b/app-benchmarks/geekbench/geekbench-2.4.3.ebuild
@ -11,9 +11,6 @@ KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="2"

-RDEPEND="sys-devel/gcc
-	sys-libs/glibc"
-
 RESTRICT="bindist fetch mirror strip"

 S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
--- a/app-benchmarks/geekbench/geekbench-3.4.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-3.4.2.ebuild
@ -11,9 +11,6 @@ KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="3"

-RDEPEND="sys-devel/gcc
-	sys-libs/glibc"
-
 RESTRICT="bindist fetch mirror strip"

 S="${WORKDIR}/dist/Geekbench-${PV}-Linux"
--- a/app-benchmarks/geekbench/geekbench-4.2.2.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.2.2.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Cross-Platform Benchmark for Android, iOS, Linux, MacOS and Windows"
-HOMEPAGE="https://www.geekbench.com"
-SRC_URI="https://cdn.geekbench.com/Geekbench-${PV}-Linux.tar.gz"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="geekbench"
-SLOT="4"
-
-RDEPEND="sys-devel/gcc
-	sys-libs/glibc"
-
-RESTRICT="bindist fetch mirror strip"
-
-S="${WORKDIR}/Geekbench-${PV}-Linux"
-
-QA_PREBUILT="opt/geekbench4/geekbench4 opt/geekbench4/geekbench_x86_32 opt/geekbench4/geekbench_x86_64"
-
-pkg_nofetch() {
-	elog "Please download ${A} from ${HOMEPAGE}/download/linux"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	exeinto "/opt/geekbench4"
-	doexe "geekbench4" "geekbench_x86_32" "geekbench_x86_64"
-
-	insinto "/opt/geekbench4"
-	doins "geekbench.plar"
-
-	dodir "/opt/bin"
-	dosym "../geekbench4/geekbench4" "/opt/bin/geekbench4"
-}
-
-pkg_postinst() {
-	elog "If you have purchased a commercial license, you can enter"
-	elog "your email address and your license key with the following command:"
-	elog "geekbench4 -r <email address> <license key>"
-}
--- a/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
+++ b/app-benchmarks/geekbench/geekbench-4.2.3.ebuild
@ -11,9 +11,6 @@ KEYWORDS="-* amd64 x86"
 LICENSE="geekbench"
 SLOT="4"

-RDEPEND="sys-devel/gcc
-	sys-libs/glibc"
-
 RESTRICT="bindist fetch mirror strip"

 S="${WORKDIR}/Geekbench-${PV}-Linux"
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@ -1,3 +1,3 @@
 DIST xfburn-0.5.5.tar.bz2 819546 BLAKE2B 180f50e9dc8e9bb2372ac7335374b09eade93b6477e557b4282ee65705e55d1f391578343e3473061921cfe296e0da9dae0ddb8823fc5daadc673537331f3085 SHA512 37574aa7dcec65c26a8fd5019c3776196763fa1ebb0f531002f5bcb72a6eb0ec19ed994dd14726988766d890ef257c39c26e64ca3f5944386c03d9b54c26a90a
-EBUILD xfburn-0.5.5.ebuild 1029 BLAKE2B ed264440ee935df959cf7e1ea403c6540877d0494e368402fd45a5fb4145fb0e89038535f30992b4568dee92294ced232d73e70697a4e998f643296a32582803 SHA512 0a5be254ab6ae90de719b9d5df11a18af23f9e9b5f36848104571bd478fdc17d9d1aa2096ce103dc920bad78f90a1cfc162a2c09edbe17083a6eed9f496d5aa3
+EBUILD xfburn-0.5.5.ebuild 1040 BLAKE2B 7705381c01f11fa01a94cb724cb56047aaf641be296478df454b9ee7a479c9ed8033949009832c34650072b20336fe2c7cb8c883ecd6edb4ccb781b0ee8fbe9c SHA512 a1a164b27b32e2ce5bcff29d8507d14088ac7f3501493eb574fe805ba66b3663165d47583f460e4c3d5de5314ab5a8366156e8169edd10c2453bc2f636895832
 MISC metadata.xml 481 BLAKE2B 336b6da9e50fab974d5d320a93ffa10e24cb4621f13835e6a0fa86a95067b28e26fc3c9ca2e17eeecc69f0c842f98bdcebc273bc164cb26baa6b87f39f7c85ca SHA512 1ef204c9fe28b54edffac8132485e3bc326b0452a3014f7be50378be871621e62771f53810b441e4db18b657707e875b67fd2e1231609f62534adbfee2270fc4
--- a/app-cdr/xfburn/xfburn-0.5.5.ebuild
+++ b/app-cdr/xfburn/xfburn-0.5.5.ebuild
@ -7,7 +7,7 @@ inherit gnome2-utils xdg-utils

 DESCRIPTION="GTK+ based CD and DVD burning application"
 HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@ -2,6 +2,6 @@ AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9
 AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
 DIST efitools-1.7.0.tar.bz2 96042 BLAKE2B b0042df906282d878b1400c359c1eece24588f5df7ab753b62f5f0b95e97467cfaa17e04a2ef40a7ec85155c4d13bd438dd94471e0ec98ab23030dd54e7d4214 SHA512 1e839c5565b0a113569cf47bf98d656875f9a127b481287a553e8b1276969021e1a39a730b9ede3852e15d1ac045db7ec64767f5ac71a24567236c0938697ccb
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
-EBUILD efitools-1.7.0.ebuild 786 BLAKE2B 8a842f23c5e7ec1afa535dfd7448503a1313cd026eaab72961a517ca223d04ac521cd6ce7c98c920de079c33549b164aa544b44fdfe73c76bd46e7444da2fb28 SHA512 40132fc48114b2baebb590e1b6ac4a32961c1ab6d7393ecf80223fab6bffb6cccc8da1123c67f967602982a23ecc82a1f106856d39ba73862ce5ddf2162d3e18
-EBUILD efitools-1.8.1.ebuild 1348 BLAKE2B fedfa56aa7e7397104b0ad32484e145a2cf1a1cf9caa7cec8e8d84d6c861a2c4f705d6b43998b27eebbce28de04a47c73c8dfc9dd7653079ea07c58ef02ab51c SHA512 9edd70850f64534bcd8c48d7d87ae5dba074f8bae0b884208ed888055853832e2452550e302963e509c89185f10010b5d22081b07ddd92ca7db73951292e1216
+EBUILD efitools-1.7.0.ebuild 787 BLAKE2B 9c2daade67b20bb4fb7b38413ff174695a40889e509c0828f68fc8d1eb1a0d0c7ed2cdc32d05608cff53317c4ca4db3133ec041cb86ffdac2b1d1287c00c3043 SHA512 66b40139afd0f071db68891152a25c9d6993be948e100817b26eb3fa547d09580bd4e9bfff8916c58a7f2bd38bfe4221edd1452d58a59e251629f5689f88740e
+EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@ -21,7 +21,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-apps/help2man
 	>=sys-boot/gnu-efi-3.0u
-	app-crypt/sbsigntool
+	app-crypt/sbsigntools
 	virtual/pkgconfig
 	dev-perl/File-Slurp"

--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@ -21,7 +21,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	sys-apps/util-linux"

 DEPEND="${RDEPEND}
-	app-crypt/sbsigntool
+	app-crypt/sbsigntools
 	dev-perl/File-Slurp
 	static? ( ${LIB_DEPEND} )
 	sys-apps/help2man
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@ -1,9 +1,9 @@
 AUX 0002-image.c-clear-image-variable.patch 822 BLAKE2B acb775f625ecd081d9b3d7e497b066218e82d2dc13f80c473c25361dc85098ee15e5f14530334e47c33fe7cc9b2349ffb1aaba7abe4fdd33bfdde05ed9191c39 SHA512 004ba118cbe8fe5cc291888966e5994373c0b9d8149bc5c652a72971138fab5e64d721061c69e8b864d6ca5cdb4ffa193520156941b6bd9c998b256f8d72697b
 AUX 0003-Fix-for-multi-sign.patch 1452 BLAKE2B eaa6e39c18d13f3819d5852eda27eb5a8d589241224965392f1b1e067b5cb9ff0ece7fa83697e5fb6f5f8dd0acec15b7bbe57fcd5f761fcb2e8e1fc51193641f SHA512 2aba55a116536e7f41e4aac2fd33eeb92cf89b14bcdd8b93b6e9dc9bdaf2f0162134e56f7d365640445bf801ad8590f6d49f14cdf80b791324647067d52ae435
-AUX sbsigntool-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
+AUX sbsigntools-0.9.1-openssl-1.1.0-compat.patch 4727 BLAKE2B 3b47c8086220cf12778bf5cd6018627a30ea349677eeb2cfcd1eaa1b83a25d39499ab21a1a123181a51f4138624c17e574050216f59c480e38d9774936f8b6f0 SHA512 6946e1d67161345088aee3ab54129b6e904b6008f2b275ab4eb55ed24fb2b866029f7d7ca856c5dfe76c395580f04709ad1be974369a1b4954b9e87cf812fd4b
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntool-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
-EBUILD sbsigntool-0.6-r2.ebuild 1063 BLAKE2B a1df369ad39fd98c81efb0c7b3f6fa43491739a3ccf36d3e5578e3dc017fef6ff8a0ec6067fb4e5f835b96dc4950d40ebeea398340a51e4aefaa9a964f59d0b1 SHA512 e9874cf541046004e0a0f2cffb4159a758eb5b878b7f3a9ecab7f36600c0b3abfa5798b69f223145d4d62df38d98f17b67319170ed6ec4209ee45c1e6c127ce5
-EBUILD sbsigntool-0.9.1-r1.ebuild 1334 BLAKE2B d773ec47da3c841c03673d852c2e32d1cea27c357028656050f3704ec1e0c7e456e712f237f90ef3dd5160a06619a8149ed24f22335e548b9bc3a718f5f5a428 SHA512 e3b42039618e185567e243f8c78756378cf0c75dd417018a658c2142bf8e9ef146f2e4e44235daa9d5d8972c7fc5c4aa1f113151c16d00800df4203f55a32fbc
+DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
+EBUILD sbsigntools-0.6-r2.ebuild 1116 BLAKE2B 1e571c2018b72de8a454a380042897678f2308e8afab91b5e90c99eff266950e7374fc099b28d0d22b1a560bf6784eb6c77345c2b92e302f9ed98c80d4f3c45a SHA512 c11a43f77549f884c3a7c55333a62970239142340bc7ee6b85d029e3a07ee47a0b71265878ad99778bc7e48d7b0cee68c0e358bc8d914a0590796490e98aaba0
+EBUILD sbsigntools-0.9.1-r1.ebuild 1303 BLAKE2B c388a296e1395690072dd579dd762cd55c2f9f30fc31bfc1d54fbd6a2a6233c40a11bbe958f1cf7918637e952b8770618c947303bbd6a98f043c657dd653e63a SHA512 9779ebe157dab6501b6a8c98ed78fac81128394ae485e97c262985ce0ced84e97d5e2095f548aa38158d08cc235a5f81438ded30e6a84808e9a007994b7a964b
 MISC metadata.xml 291 BLAKE2B 0aeb75750176d719f10db508a8924d0bf2fe75e8544b275a7c7e11c44320ce4f7819febb093dd3083a33a998a225f2a3b882407a8ffc03d1a57d03cbfc0a7ff2 SHA512 f7a520fc9a216ff983bd3d361c6ddb3b635eb5dcd94ed042e7c5d0beb0b4e10cdb231e2b4ace599ebb93d4bb46e071a744f1a780ec83f451bb2ee6bad4c2d8cc
--- a/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
+++ b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
--- a/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
+++ b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
--- a/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
+++ b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
--- a/app-crypt/sbsigntools/metadata.xml
+++ b/app-crypt/sbsigntools/metadata.xml
--- a/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
@ -3,11 +3,13 @@

 EAPI="5"

+MY_PN="${PN::-1}"
+
 inherit eutils toolchain-funcs

 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz"

 LICENSE="GPL-3"
 SLOT="0"
@ -23,6 +25,8 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"

+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_prepare() {
 	local iarch
 	case ${ARCH} in
--- a/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
@ -3,12 +3,14 @@

 EAPI="6"

+MY_PN="${PN::-1}"
+
 inherit eutils autotools

 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}s.git/snapshot/${PN}s-${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${PN}-0.8-ccan.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${MY_PN}-0.8-ccan.tar.gz"

 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
@ -24,8 +26,6 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"

-S="${WORKDIR}/${PN}s-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-openssl-1.1.0-compat.patch
 )
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/doxygen/Manifest
+++ b/app-doc/doxygen/Manifest
@ -5,6 +5,6 @@ DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d
 DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
 DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5
 EBUILD doxygen-1.8.13-r1.ebuild 3743 BLAKE2B 27ff1130731c6205ba3332a00a5b2d5175e3f5980ffffdb8dec65ae8ff1ad2893f48dca1ca77d07eb7be1b8d03509e17b752b02b44fce10601705af6b6c93f38 SHA512 aa8d218d2044b769787a82482a0483b219e17c656c3e8ad806fdda2026430bd63654113676caee8572bfeb1bc82aae6f54b55f0dee9e7b0ca723f1fb773352d2
-EBUILD doxygen-1.8.14-r1.ebuild 3067 BLAKE2B f217ee2a681ea54c7dd3e6d952ce488b50dcdfe556af2d894234b1051431423217fad45e771a2dcbfe1cd14af988bb2f4097694a890ade51032859bab4fa97c4 SHA512 b2f07d638370f4a4ddc93c9980b989bd853af4a76aa7e7703f0ac9bbcb7e3bb5a194cb3fa96e1e446ba3d14d1b70f8bdcf4a3ed2fa84e924fecbbd04728a442c
+EBUILD doxygen-1.8.14-r1.ebuild 3066 BLAKE2B 321dcdc108c3e1576972eecc8dbd6a6969102c10dfd4e5234ae775503cfc32be75c5e867353a050b069dace3dfc9db722b7a674a5a4843db3f43fc27df845783 SHA512 5438c64af40abac3dfeb7b278b613e7f8c10708a472382eeba6c2c04adb4faf61d4ab10f9624468e8a4a5ebff6ce1717e3a6ad7fd295f714cad3d46097acef4d
 EBUILD doxygen-9999.ebuild 3097 BLAKE2B 6bd1e6c6fd59342bd060f4b4dcfe19997ade7cd570401d8306c67b49eabc9487af84ddb768682d749d2ac045072cbc33f28ccce3fdffbca8e971f1be733c9c05 SHA512 84a7175f62eac4cc2af66cf24e395e53779c2e0ed776aab3d6a0dcba0efc97ef20f8bb2c7b1c64fc7341f0ab333c0a0d6872a82e52dc5b4ee26b00065eada392
 MISC metadata.xml 891 BLAKE2B 175ca40e223a340b42e5446db6441e7b5a3d273b4457b47a5715911fc0c3ab7ffe24400e472a43182c20fd274404b6d542ba1ac697c7cb8dc0d099c7debba7a6 SHA512 951c1c9ce4096fa8ae4a01959ef4b8d66388d31ad07604e44df2ad5f689fc586d8d915fcedcd89731ba87ece080c4305a2ccf409ef87993017fa285f43196d61
--- a/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.14-r1.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi

 DESCRIPTION="Documentation system for most programming languages"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@ -1,5 +1,5 @@
 DIST mousepad-0.4.0.tar.bz2 578483 BLAKE2B d723ee7dc721703cfc46ad359dbf37c676ba12db4c8f4e874e1578b203a1f35cc077229ccbc9950b82e1784042f191018734cfaa09785b6b602388011db4a7b0 SHA512 5196abd04268d1ace118dc485b72bfcfb7f9175eeaf52bc97c08c1646371d26401403a3bb199d882380bcb998547c65af9bd054f0365afd846c0ad74d3c3b1fe
 DIST mousepad-0.4.1.tar.bz2 644161 BLAKE2B 656245afb38423cff7eb8a038c8247d9023e10eb85f574f25fd4fad50b0316cbe125630ddff330adb91c49eec9ee3ed67ecd0546b9fecb065c832882b3e42145 SHA512 2ffbb4245a3344437bd41f9f28cc066ae45062f6b6d169aa274e933f033c434f0b10845ccf42ab846dcad25ae7cee36ea6619bfb6889e8cd41c994be87b77be8
-EBUILD mousepad-0.4.0-r1.ebuild 1027 BLAKE2B aeb9e173b9c4a08d04d53c5ce54b33e056c20d2f2fdadc61048eea6e51b73d613850affba9f83707cf190541d29f7432bfa514e7d1614c37df6cd4705d0e07e5 SHA512 5e68a193a93757c1450a3e63aa5a97712c91434ffddba4e64d3c82d61b3b5f1d318c4d9b2e73f12728090230220f5be3d85d10afb448c967f391e8c8a63bb1f9
-EBUILD mousepad-0.4.1.ebuild 991 BLAKE2B dc764fd32a8783b80ee5fe37a3ef119dc6dbdfa34e6d2fba9e5adcfcd2763441948142ce5d531d659327aaccd8336bc242648d1f7f3fba4a066c1e3596a1e8c2 SHA512 9d06995a198b9ccc6093c3d198e9d4659884c4ff45a1e33c72d3e75d34e3b4e487aaa729e085663d9141c48e7d32f480b1470990bcd6a041cfdf51754022d555
+EBUILD mousepad-0.4.0-r1.ebuild 1038 BLAKE2B 13e3b71311815f929ce27f769acbbd6125655c377eecf53837f0dc7db4b40c81cb9df26205ebe559a3117b4fe1981f353cd2ee5b84409897c7a1f7e246a36d28 SHA512 72ee6c2efb7add6ce32834423be4ac131b771ca02ed0dd444b6829add27843b7e3205c2d6dbeb8be532e6fffe199e5d20982dabfe0188320354571cdc87e77c5
+EBUILD mousepad-0.4.1.ebuild 1002 BLAKE2B 8e625e065ec75d47cda76adf2bf42b2aac79c816af471c67045992039c3e0e832b651d439d4e85b7576255a1b4599305e47112c26ff0cfdf67dce9b38ae8b751 SHA512 693bad643771bd8a603c119a783dd32aa45c6e2bf9d2623704c5a8c437a7bad26f8826bca21abdc290cfae10c6ac163190180ea6900700321ffb9ed9e6e5da5a
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
--- a/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.0-r1.ebuild
@ -6,7 +6,7 @@ inherit gnome2-utils xdg-utils

 DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
 HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-editors/mousepad/mousepad-0.4.1.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.1.ebuild
@ -6,7 +6,7 @@ inherit gnome2-utils xdg-utils

 DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
 HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@ -3,5 +3,5 @@ DIST chkrootkit-0.51-gentoo.diff.xz 4708 BLAKE2B 0dacba47222319d9e5bb5d39e0eb4b7
 DIST chkrootkit-0.51.tar 174080 BLAKE2B 36acd12801d2ac599b71d0c59165c1489309df0365442aa575bb4c505bbfea5d0daad837fa9b7b40c2aa3841fceda199f37fe5832f0685ad3a0a82ff5e653a3b SHA512 adef6823d069b32305605d0eaa3d3701c6a87900646d9509cebe0fd8a2fec0523595d0dcb4576b32245e7638388d3b43858dbc42be68de9971ac8461fcfdeb34
 DIST chkrootkit-0.52.tar 40031 BLAKE2B 8bd3518edc11a22dbc7e866de622454f55baa9fcd06a4034489596c0a24d867fec16d134dbc0aaf8b936640177d7dee8e061e39813a3ed261ae657d70f54a47d SHA512 45d66227c185c60166c9ea2a1f89f4594fa7c943c280fd6da5b59b5b355d5fe0d36806ef133fb29f9b2cac0bc05e9c10773ed4fae923a7115cc900818a596d42
 EBUILD chkrootkit-0.51.ebuild 1332 BLAKE2B 5d5bdb9a5edcb3bd08944f89592f24446f45f890859a80930adbe99831b26b5860e4f47804c1c27f101895c15a40b0c3d2c796c9dd687fd10bad3a3a25b1c971 SHA512 094c6e7003e1e5588d74e392ca2c6924f4172c42598601066b9858de5b01385abe444a1be9f5d81d55e0ef1125257914e68ba9bc5108c7fe018ee3cdd1a01232
-EBUILD chkrootkit-0.52.ebuild 1353 BLAKE2B a70803c73793221b5e3c27b12226ba387efde5f7c0efb6c3b0f33734659d96f8e7c1e98571c3118757fa7e392da82c8e611a17a7c0a7461d3f4723cda0d369be SHA512 101d3f6d06dc36995ec149616756a3b70b7a1626f98b9ddaa64934e6d3fba8f25b31b402b5c1556a0a59f3b5f601995a699f3ac0e4955861b1510dcdd8716733
+EBUILD chkrootkit-0.52.ebuild 1351 BLAKE2B e1ab3bf2852a398202abd68cd22d94bf7a7da02defaf5d28ac8fe08722c641a633eeff2030c9c3393ac1de38b9225b8e50ce709b05267fef88c6451b75b987ce SHA512 c148e300b84e9e1109e0f320048b671507d83b8bd88068ac25157c975e0d1eb34bdccee95d85774a279ae598c27a1f45e49cce9696aeb8d10a4a334a671168fc
 MISC metadata.xml 254 BLAKE2B 82f42628c121ed27ad00d04687d2f6b52148571b49f1c8f4a81cf47ccf2e857b16c9d0c6a3da2f8bebd6a8803d433a874e8066f48bd18ff960923f53bd15da7b SHA512 f0b5ba232a76e933dd34a7e3e7fa04e627de0201610166f4758c5ccf888f509815b5cc39f5373b87a413496318f507bf28599ec0995d32bde98a7c65287d39bb
--- a/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.52.ebuild
@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz -> ${P}.tar

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="+cron"

 RDEPEND="cron? ( virtual/cron )"
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@ -5,5 +5,5 @@ DIST libewf-20140608.tar.gz 2129518 BLAKE2B aaa8e95f243e887494c5a50c1706864b4613
 DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
 EBUILD libewf-20130416.ebuild 1390 BLAKE2B f86f0370dcabe7fa02fe745ee3864fb9fcb45d47832ab5112219a30c4c13e49fce18e8d7df3be1957bc7ae2c79447c9f8b7659eff35bfac2676c834c35e798fa SHA512 98b8718ec6f1b25f2b33b8a73973906197cff2f505583270d4bcf301223bbfe0aceafe55395e795c7d173c27dd00ed47b2570234d5bff1a07bbd2385151369a7
 EBUILD libewf-20140608-r1.ebuild 1601 BLAKE2B a31475c4f6f3195b90092f5baa0d80d691f8ad07a4ee410fd06070d56366c77ad2bfa947b99aa32e59e8e7c00cad172efadd52efe74a35369da0fa82eb616e7b SHA512 2bf8916b14c71a5685915954d4864ab8b375ee8d09944958b3f47699a78316f45c417d67ffebdf4066e8671f3693dc5563e9246ac9a46134fde85c6c37604d3d
-EBUILD libewf-20171104.ebuild 1360 BLAKE2B acebf82af94b5123abbc07bf3f8f728bf824debc344ba5de5378ceadf51e2f18dc709d7ef08d673332b08cd7c597fb112d5498dd7736ca999db24b3d5322ca50 SHA512 8aa99bb0a6cfb10ac5388f96d349d2b22cb1e9aed3ec2781e175a4c4159eda77cefe89110ae7fa1a853741710acfe7ff80ebe7f2567715715ecf37c975ca06b4
+EBUILD libewf-20171104.ebuild 1359 BLAKE2B ba9144c2f11f67290f92d9d6baa06cbd9bfba80a8331bb04cb3c876bc15f812b6b79c317fc4bfa11c6e25c7a9f24c6c49860a4e42b31868eadec8438dfb71aff SHA512 b93a30e4603c85ab59e28ae1003ed7bfb893290be4becb5d978b5a5a143d22e09c033436da70e13733143be1127027a8e8706840f66b8afb92e08189da11b476
 MISC metadata.xml 637 BLAKE2B c3d42f901c29baa52deae9745e42960cd5d3f8fc0dd01f530c9948806231ec2a8ef6f3fbd8f5fcaaee877167225db542af2ef0b84a6f1bb1a65db7ef617752c6 SHA512 ece6655919f7bd0dc6b2d8189e04f60114428f3ff2bc7ee6859abfa0e73527e5a37dc0816d85b368f2f0a0f139351924b9b800d680115b9a158bce9f665a9ec3
--- a/app-forensics/libewf/libewf-20171104.ebuild
+++ b/app-forensics/libewf/libewf-20171104.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experime

 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~amd64 ~hppa ppc x86"
+KEYWORDS="amd64 ~hppa ppc x86"
 # upstream bug #2597171, pyewf has implicit declarations
 #IUSE="debug python unicode"
 IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@ -1,5 +1,9 @@
+DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
+DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
 DIST ibus-libpinyin-1.9.2.tar.gz 1693247 BLAKE2B a887be2a11406420e86cf1e7f76f8d8c06cbffa62a0ab42d450015965c24accab51164ed18cdc8e24f26edf03676603a691c907e00722efc24e947919345570f SHA512 008390049b0186b7163cfd8857806715dd78235fc1e35a89d4b58a38eb7f292b643d48f502c0c924512a9f5a96d2581f577d6a9ec3b660d05d9a4adcde970430
 DIST ibus-libpinyin-1.9.3.tar.gz 1692251 BLAKE2B 6f23a8838f90c082a43fc2922bcaf13ecf287fdfb898f1ba213739f8e2f65ff9a68bdc57cf8f82e73e2c5e1569f1209b8294b45c30c5c3b7e32287b73394ddc7 SHA512 cad3d8415e0c206cbd2eb606ea04b5861e10c3a5f614d90bbba29b751fcc978e2ce1a8a000ceb8cc98de1afcc145ea62b5ee8e9d34e4184bccc487225b34ab1a
+EBUILD ibus-libpinyin-1.10.0.ebuild 1511 BLAKE2B 87a7b8d544f724a07a1bd45d3fa9c20ccd6ac37ec3200981be1efc33fdba5885389ef71b0cbeabc36eb5dd3f626127ba7bf3cf63901b8615a0f3d899c6184e40 SHA512 f8217da8f687758bd412344689b0fcd5f0827fc07af0067dafca14554acfe32a4517910b58afbcbd59c29b6c170ea8c2e4a3f0600726c3bec3a619574a50cb97
 EBUILD ibus-libpinyin-1.9.2.ebuild 1175 BLAKE2B ae4cdcdf56038f16466c6487673c9cc3e445fe921965a67823b4b6f5766ec15952a116c2c01c75c42496262a5ad964b96f32f95258bb949115c2b17d1903c870 SHA512 d407d821b80e2fb2b114cc746ece7688c3e11643dd422523e2cc557ed1995f6fc11e4ce7381e5a93de678439e62d9bb0af5d9334d6b7480a874225f8c11ddbb3
+EBUILD ibus-libpinyin-1.9.3-r1.ebuild 1414 BLAKE2B 51bed33e4c13ade709bc8c31cefec8c7e85b6ae1d30f01021b228ad454bab98584116217fd807273bcd9ff9c0257d9268a3741100b71e5256427f7b5b550ffe8 SHA512 ae5d7b682dab09fed9cd7fc9a8c222237368c876df342f629828428ca16cdc220104ff48a6a9af0bba66ed75f59a2a090783c10c3eb279b8d338bb87b29fc793
 EBUILD ibus-libpinyin-1.9.3.ebuild 1072 BLAKE2B 154b20cc5d10220b8da08b7bf779591a41a0dcbc55e2187b402377949365acc7d183fd691440f4ca40f743be967e73ae14920f759cd1b55574e7c4ca13f1f8ad SHA512 070878cdf22d10fd5bd5fb0cfc5b973542c40f0456297f125f66935007f0f6c0dc0b54dca32e01d289681c80af25d3aff18f92c16e331dddecd68ee8d1daab3a
 MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools gnome2-utils python-single-r1
+
+BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use boost; then
+		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
+			|| die "copying newer version of boost.m4 file failed"
+	fi
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools python-single-r1
+
+BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
+
+DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-2.1.0:=
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc:= )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	if use boost; then
+		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
+			|| die "copying newer version of boost.m4 file failed"
+	fi
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
--- a/app-i18n/scim-pinyin/Manifest
+++ b/app-i18n/scim-pinyin/Manifest
@ -1,7 +1,4 @@
 AUX scim-pinyin-0.5.91-fixconfigure.patch 1313 BLAKE2B 6ab4742b4c857064d07402411b81041e3a5f8cc998876df7421f1b7bab97905e572fe793fdecb91325a34c0f4e774d8d115dbc3ea23db63aa518e0d84240ebb7 SHA512 9d4dd0c259d8171c8a3b171e68eded4670aacd27902ee8373fe7aff36d088b3cec5570783b9588357ea475321b5267ff635b865a57e7fd3a9b1245e86710decb
-AUX scim-pinyin-0.5.91-gbk.patch 2501 BLAKE2B 5a352313b0a779049e5a74f94fab1ffe23336b2fa979d35961ff0db8e86214d51f4ef3e08a6b65261306fd049fad639dabf767ebc3c5e1d863b8249975b0c819 SHA512 77dc428913f0fdfa8c9c9ac056eaa84d9b60e3b285ce510aa9528be087f5757f3f8055ef0930c4ce1c3776e0ca0e3a3fd725ca5d790ade030a8893e5fc8bca17
-AUX scim-pinyin-0.5.91-gcc43.patch 1737 BLAKE2B 09c72b35e238cb0df6a9d3ca9dc08087257bfdd21dfef3d3a0a1de71984a5f840f8b18207183beae794d8284849adeaba9d3ce122dd65e8290aa4c810febe84b SHA512 3b9d10c2ee4ada9a3d8e6c2c292f745efbe034b8eda30932aeea24c1fbaf54a9ce5e6b9e1dad3c43b33b6b14b009406770a55c23821bbe4d9e421d674d1b34fd
-AUX scim-pinyin-qt335.patch 1122 BLAKE2B 693bfb38d5acf47da482603442c28f5fdd2bb1fb9a9f158fd033321f4d28f092fa049e554bb0281178c47013c8888abc44085b10042702d95a2aea349cf1d450 SHA512 d9cafc0f058f7da5fd2c7b70f7b2eeea249044a1aa886e414d5fad78ceaad168d8cd260e7077c03aad6fe622b637bba5312403b15b61b935157f6258020c1c55
 DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f
 EBUILD scim-pinyin-0.5.92.ebuild 845 BLAKE2B 8b9ea8806e578c7a66ef65001d192233d8c1150508f7de7d027b32082c4955d2945eb81174a361f48c835a8ead8d16fc47dd8b57f9956705fef409602efe16c8 SHA512 d5a80f917eb810b87e31894404170eec5f87788c831cd6c8c80d369e7558ee9b44d4f4b0095c1eb378bb4848fb0288c9b2b138a4949bcabc35b9446cc22c6762
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
--- a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gbk.patch
@ -1,62 +0,0 @@
-diff -Nru scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp
--- scim-pinyin-0.5.91.orig/src/scim_pinyin_imengine.cpp	2005-08-06 23:31:08.000000000 +0800
-+++ scim-pinyin-0.5.91/src/scim_pinyin_imengine.cpp	2009-02-18 00:06:34.000000000 +0800
-@@ -706,8 +706,12 @@
-         m_sys_phrase_lib = m_pinyin_global->get_sys_phrase_lib ();
-         m_user_phrase_lib = m_pinyin_global->get_user_phrase_lib ();
-     }
-
-    if (encoding == "GBK" || encoding == "GB2312") {
-+    
-+    if (encoding == "GBK") {
-+        m_simplified = true;
-+        m_traditional = true;
-+        m_chinese_iconv.set_encoding ("GBK");
-+    } else if (encoding == "GB2312") {
-         m_simplified = true;
-         m_traditional = false;
-         m_chinese_iconv.set_encoding ("GB2312");
-@@ -930,10 +934,39 @@
- 
-     m_iconv.set_encoding (encoding);
- 
-    if (encoding == "GBK" || encoding == "GB2312") {
-        m_simplified = true;
-        m_traditional = false;
-        m_chinese_iconv.set_encoding ("GB2312");
-+    if (encoding == "GBK") {
-+        if (m_simplified == false) {
-+            if(m_traditional == true){
-+                ; //Big5. Big5togbk is not implemented. Set to next available. 
-+                m_simplified = true;
-+                m_chinese_iconv.set_encoding ("GBK");
-+            }else{ // nochinese mode. Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }
-+        }else{
-+            if( m_traditional == false) //GB2312
-+                m_chinese_iconv.set_encoding("GB2312");
-+            else m_chinese_iconv.set_encoding ("GBK"); //ALL
-+        }
-+    } else if (encoding == "GB2312") {
-+        if ( m_simplified == false ) {
-+            if(m_traditional == true) {
-+                ; //partly map big5 to gb2312 is not done. Set to next.
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }else{//Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding("");
-+            }
-+        }else{
-+            if (m_traditional == true) { //Should not happen. 
-+                m_forward = true;
-+                m_chinese_iconv.set_encoding ("");
-+            }else{
-+                m_chinese_iconv.set_encoding ("GB2312");
-+            }
-+        }
-     } else if (encoding == "BIG5" || encoding == "BIG5-HKSCS") {
-         m_simplified = false;
-         m_traditional = true;
--- a/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-0.5.91-gcc43.patch
@ -1,44 +0,0 @@
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_phrase.cpp scim-pinyin-0.5.91/src/scim_phrase.cpp
--- scim-pinyin-0.5.91.orig/src/scim_phrase.cpp	2005-01-06 22:30:58.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_phrase.cpp	2008-06-21 13:16:32.000000000 +0900
-@@ -27,6 +27,7 @@
- 
- #define SCIM_PHRASE_MAX_RELATION 1000
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp scim-pinyin-0.5.91/src/scim_pinyin.cpp
--- scim-pinyin-0.5.91.orig/src/scim_pinyin.cpp	2005-08-08 15:11:16.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_pinyin.cpp	2008-06-21 13:16:30.000000000 +0900
-@@ -28,6 +28,7 @@
- #define Uses_SCIM_CONFIG_PATH
- #define Uses_SCIM_LOOKUP_TABLE
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin.h"
- 
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp
--- scim-pinyin-0.5.91.orig/src/scim_pinyin_phrase.cpp	2005-08-06 21:06:49.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_pinyin_phrase.cpp	2008-06-21 13:21:13.000000000 +0900
-@@ -26,6 +26,7 @@
- #define Uses_SCIM_CONFIG_PATH
- #define Uses_SCIM_LOOKUP_TABLE
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_pinyin_private.h"
- #include "scim_phrase.h"
-diff -Naur scim-pinyin-0.5.91.orig/src/scim_special_table.cpp scim-pinyin-0.5.91/src/scim_special_table.cpp
--- scim-pinyin-0.5.91.orig/src/scim_special_table.cpp	2005-01-06 22:31:02.000000000 +0900
-+++ scim-pinyin-0.5.91/src/scim_special_table.cpp	2008-06-21 13:25:25.000000000 +0900
-@@ -20,6 +20,7 @@
- #define Uses_STL_IOMANIP
- #define Uscs_C_STRING
- 
-+#include <cstring>
- #include <time.h>
- #include <scim.h>
- #include "scim_pinyin_private.h"
--- a/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
+++ b/app-i18n/scim-pinyin/files/scim-pinyin-qt335.patch
@ -1,25 +0,0 @@
-Index: scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
-===================================================================
--- scim-pinyin-0.5.91.orig/skim/setupui/smartpinyinui.ui
-+++ scim-pinyin-0.5.91/skim/setupui/smartpinyinui.ui
-@@ -863,20 +863,4 @@
-     <tabstop>kcfg__IMEngine_Pinyin_DisablePhraseKey</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>skimeditshortcutbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>skimeditshortcutbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>skimeditshortcutbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>skimeditshortcutbutton.h</includehint>
-    <includehint>skimeditshortcutbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>skimeditshortcutbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>skimeditshortcutbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
- </UI>
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
--- a/app-laptop/pbbuttonsd/Manifest
+++ b/app-laptop/pbbuttonsd/Manifest
@ -4,7 +4,6 @@ AUX pbbuttonsd-0.8.1-g++.patch 431 BLAKE2B c63ff011777c4fc35c3c96985727f07967fbd
 AUX pbbuttonsd-0.8.1-laptopmode.sh.patch 827 BLAKE2B c5153225d8c8f0dfdc380ea8a7030fb994f9893a201ee83692ef712d3ab345f4f5eca4057a36e9b45394f49d89a4a400e91fc4dd7ddb425ddbfe8243e6d49b7f SHA512 3ab0e2ce5b3fa050d7cc27c7e9d90fb3e7fdca46ba2de8e34cfd0a6338b5ba27dcb07204827ccaa8b228f37ae5941e5829b3cfe1a9c4aa3cc50754c7fcedc307
 AUX pbbuttonsd-0.8.1-lm.patch 419 BLAKE2B 2f982fb58e97f8a26970dae583c0c90e6b7be03d9fda2081a64db0f4e41e31f44e425403ccb81e4e2e17a236ac6171a7189a77fa7579752bddeaab97abc56598 SHA512 1ce79d85f9119d0d94b789557f8dc41ddcd8ca030c8b03c2399035e21115e2ff3bfb7c4284750450733ac5ad305fa2513041e65feeecd7dca81db4a23ae53e34
 AUX pbbuttonsd-0.8.1-lz.patch 920 BLAKE2B ab9a5cdf4b9ac2b1dd55229ab7dcfcf65bf4ff3b526f52705c366ec364131fcea31222837a910b37f5507600de6ed4e278bcf0f52cc96bfc5aae8a747cf69359 SHA512 17546f9b7e8b488a2ace5cab29da3738ff59c708aeaae1ef58e6240dba0876254f83f5df358d76af271c636d64c512d7d9fa550e377d4e57d92851a720441dea
-AUX pbbuttonsd-0.8.1-pmcs.patch 692 BLAKE2B 79f3fb25cd7bc552afda0c0eeeaa94b89c10e066ab2ab9dabf151d26efac784a52da5deff5d70b3cbfd78f4274aa4d1a6c1c2f42effbe455d3ae72d43f1dfd8b SHA512 ae8e9c695d80fa775c07b64968f13b3092858e14b37b1ce725e10ea06b897304e9f5079339633163b02e565d9dbb96db321d628394fcfefe528c7a1d36c66b31
 AUX pbbuttonsd.rc6 355 BLAKE2B 41e646f547b684930949669760ffd7e09c6ef4591e6183b12d555dba45d100414cc5daa54ef26e2bba491841553961955cb0a29c9c5d6b37d4e13f9a3117a9fb SHA512 93165ce1d1c757e58b407656bf86084bb3fcfe0c55897fbb382f107ff9b3d69559255a11ac3017cf5741eb2923d753f5cc3f1b495e31e16b18b16757accfbdfb
 AUX wireless 235 BLAKE2B 1fdc5401c1bcc927cad521bb7e6d502fd072c6aae119e59d92c19431985cccaecad5ba55a27af888e63881d0305ee732dce9b1e777e4b2322a98efaad13de310 SHA512 58cbfb80ec32ba6868fea500bcf58bf649a0f468a017ec8c200fe0edd0fd7f1fe17efaafca3e67c20df9fc5a6c80b2941237a375f6e73349a83593dcfacf2816
 DIST pbbuttonsd-0.8.1a.tar.gz 589747 BLAKE2B a0410b7f165e8a0f5b6efa8fa86cc32a84e62da08141d285442d48f0e541d4d6d063e61a7e48aa7901135c4fc9640a7968be821619b3741ce30ba1497015aad4 SHA512 4aaf674872982925f7aa8e06a363f50830f13d9491f4a3b850c1852a8a6d4b2c72164f839c482eed059703dd25d900fe3bb774f78e7039ac2464ea7a1837bf99
--- a/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-pmcs.patch
+++ b/app-laptop/pbbuttonsd/files/pbbuttonsd-0.8.1-pmcs.patch
@ -1,21 +0,0 @@
--- a/scripts/pmcs-config
-+++ b/scripts/pmcs-config
-@@ -11,15 +11,15 @@
- 
- # Section for power policy 'performance'
- performance_HDTimeOff=0		# hdsetup - timeout in seconds
-performance_HDOptions="-p"	# hdsetup
-+performance_HDOptions=""	# hdsetup
- performance_LaptopMode="stop"	# bdflush
- 
- # Section for power policy 'custom'
- custom_HDTimeOff=60		# hdsetup - timeout in seconds
-custom_HDOptions="-p"		# hdsetup
-+custom_HDOptions=""		# hdsetup
- custom_LaptopMode="start"	# bdflush
- 
- # Section for power policy 'powersave'
- powersave_HDTimeOff=60		# hdsetup - timeout in seconds
-powersave_HDOptions="-p"	# hdsetup
-+powersave_HDOptions=""		# hdsetup
- powersave_LaptopMode="start"	# bdflush
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@ -3,12 +3,15 @@ AUX elasticsearch.conf.2 2070 BLAKE2B b620bc7bddfb57c0d1c409c8af919c85fd28df79fe
 AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd0209a58c15868531a108175ecdd21ddc18e1daf1e83c0bbd26da7c00b260698b3ef87c938b6d18928df733 SHA512 36a98d788cff404ccfe0fdff7bbe358750df8db9e5a5f419991b90e257e97331ec93c5f9a84bed57099dd239abb572ef450a191582e7145d8d7517c242707e49
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
 AUX elasticsearch.init.3 1873 BLAKE2B 58c1fa6be05b4fc28ee0b65bb5f95522b5dee4fed706f8a207a48279a5be135e841dc7228f851ed0f8318d1717b810eb4a6048de2590336f31d7de6f72193f57 SHA512 8b4738042882fdbab3979a48174aee2e389570e4fcf5c07b2d2ef990fe9f38097f29c424ff9a7a50bc2b9f2fb0612b0b5d160e31901d34f5b33e21d5fff99b0c
+AUX elasticsearch.init.4 2018 BLAKE2B 5cce066d530afb57e4bc55026d68f57ab41419c6967145efa621051159efdeb5f12e5cbf97d50048d7b7266cc3d2c41e2957c212623cc9139d4b8558dda42864 SHA512 648bb8cf6a5223920db6685be68e439a6854a3d7532ecf6f2fcfaabfc95a5cb768982e7168063926b40eabb0e3a8d4e0a3b4a30213b2a8cbe59eafbeae5cb7c6
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.2 1544 BLAKE2B bb66a0e945df66f84937804461ed51216f8bc4585dbdfbd5e834aad0632cc7fbf1005322509183705b62fdfe0f0d105bcc238810056ec066102d8ea84dbb1020 SHA512 33dc3efc736501d6e04ab1aa1b13a4d5f5cb235f7d9ff9674715dd47afdf1e8da8db0a4b82ce46c8c6b71d8258917e8943613eff8a0371a82b5d2e490acefd77
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.9.tar.gz 33794793 BLAKE2B a056443b1f71b3af773b5195147927017456e1c9a6517c549cfe7e4ec70f0ff4ec9363c9ef6376b7b942e82f811cd5927d44eb9f9eb8022a56e54a85b4ba7c46 SHA512 4e61a4c5f79d0439a414f1e9361f855cdb2f79322cf592bad43132605922fb8ded6368b01e05ef6bcbee49911943c2a3b6be5fd6d0900abddfe03c736cca96d6
+DIST elasticsearch-5.6.10.tar.gz 33796721 BLAKE2B 4e9d1d910a70acf32ca63cec811b711f692f3cf32dcec084a07f92d281eed07c067740bb5c5447055a6d0b6126e55a635edcd08c105dc59985db72bcd031a8a5 SHA512 17bd5710cfc3efa455428a79c74e63aacc9b9481d59a0b0df07ad4e4c25ef32dd41b3dbbde464a2801363b6d428a23eb52cc935640ce86bbc4d8a01dca8a1585
 DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
-EBUILD elasticsearch-5.6.9.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
+DIST elasticsearch-oss-6.3.1.tar.gz 29417012 BLAKE2B 356665cde2f12ae5813d95302398f5fced07c53d25e6e1dc7ad41c8dc8ad42cd3d5bd4ffa6cab24af8088c29800f6ec59a483710272b756af2f76b5967d4b932 SHA512 3df0f7f35e150198f7ff660cf4d90fbd1c2ca587287c6340d427f968711b6390123bfafd09a744c9bdf328d57423bcb75f6e4701ce14a7257388611abea62545
+EBUILD elasticsearch-5.6.10.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
 EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
+EBUILD elasticsearch-6.3.1.ebuild 1758 BLAKE2B a4105ef73d07a7f8c5796b8457fdf417ad1dd30f8ff4444eaa064e8a36501c56379eaae07725be98b66776ad9777a66e0844ae625cc1f486d547d49ab13acfbd SHA512 c05e0e1fb1d05178001948a8be071326cac3e7b1e75afdfa22512e498d97603eb6ab6d4b1fcc791388e69170f93bcd493bc41eaf6d8108c50da50f85c371a38c
 MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
--- a/app-misc/elasticsearch/elasticsearch-5.6.10.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.10.ebuild
--- a/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.3.1.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.tar.gz"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="virtual/jre:1.8"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -rv 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
+
+	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.4" ${PN}
+
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${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/elasticsearch into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+}
--- a/app-misc/elasticsearch/files/elasticsearch.init.4
+++ b/app-misc/elasticsearch/files/elasticsearch.init.4
@ -0,0 +1,67 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="--daemonize --pidfile=${pidfile} -Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	# fails to start without keystore
+	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+		"${ES_HOME}/bin/elasticsearch-keystore" create
+	fi
+}
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@ -0,0 +1,5 @@
+AUX fhem.cfg 791 BLAKE2B ba55b71711199794c38720ad724fbc9d5f05d1713c1af0d02662765e8248e845bc3c07ae619b46e450d9b3a96a993a814e0c831a51edce6129d8efe07baee0db SHA512 9ce1c1cc2d7c55a29df2e344ad6600704e68536b734997a7cc1a73a225970c26f924c902c4d4e6f318e22a000b9b4ec2ceb52edd650fe3a8d12488b5293f7ad3
+AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5adc580af2cad57a0c13549b3c9f4b19b6fdad279ebbf8d0b64a36f29690911b342a06c865c7da SHA512 3be01778d970f4b93e551ff3769ed7b0825508dc5216a43ed0bb12f589103350bdb400561cbada9315050d32a99f723f5291e9bf1c6318642b16b8b9dc9e8c61
+DIST fhem-5.8.tar.gz 22139481 BLAKE2B 444b041b591d3c960036a262e6eb3fda026d4b229a21df16d7817c32a1fd57282a7fbe5559164b760bd9cfad314c2977e7d6f611320d35be090cdb9df66fb8fd SHA512 6cfaa14288ce553a2418db4cb47c719f2d5edbccbde9e76f221cd47cf8a175a67125031c4971f9f9972b218fc709a267757c2abefe6a33be47eb4bb45e23be57
+EBUILD fhem-5.8.ebuild 2226 BLAKE2B 1e938078cde599e3a2acde068ff4e9f4be16c3160ca95819d7c51f0ca8e3c32902577c3076cdef2972dc13ac5b0cf31eb5bff9afc476548a3b25b34872724836 SHA512 9e104f7626b17dd8b43bd2ef36d264a1d48219d36fff8345f1b0bde78c289b88c3c4f3ab87a0e60d3683134b486759d5c5d407357367380daeab005a2662e1c6
+MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
--- a/app-misc/fhem/fhem-5.8.ebuild
+++ b/app-misc/fhem/fhem-5.8.ebuild
@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="dev-perl/Crypt-CBC
+	dev-perl/Device-SerialPort
+	dev-perl/Digest-CRC
+	dev-perl/JSON"
+
+DEPEND="media-gfx/pngcrush"
+
+QA_PREBUILT="opt/fhem/contrib/lcd4linux/fritzbox_dpf/lcd4linux
+	opt/fhem/contrib/lcd4linux/rpi_dpf/lcd4linux"
+
+pkg_setup() {
+	enewgroup fhem
+	enewuser fhem -1 -1 /opt/fhem fhem
+}
+
+src_prepare() {
+	default
+
+	# Allow install path to be set by DESTDIR in Makefile
+	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+	# Remove docs in Makefile, as they will be installed manually
+	sed -i -e 's/docs//g' Makefile || die
+	sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+	# Remove manpage in Makefile, as it will be installed manually
+	sed -i -e '/fhem.pl.1/d' Makefile || die
+
+	# Remove log dir, as it will be replaced with a symlink
+	rm -r log || die
+
+	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=(
+		"CHANGED"
+		"HISTORY"
+		"README.SVN"
+		"README_DEMO.txt"
+		"docs"/*.txt
+		"docs"/*.patch
+		"docs"/*.pdf
+		"docs/changelog"
+		"docs/copyright"
+		"docs/dotconfig"
+		"docs/fhem.odg.readme"
+		"docs/LIESMICH.update-thirdparty"
+		"docs"/README*
+		"docs/X10"
+	)
+
+	if use doc; then
+		local DOCS+=( "docs/X10" )
+		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+	fi
+
+	diropts -o fhem -g fhem
+	keepdir "/var/lib/fhem"
+	keepdir "/var/log/fhem"
+
+	dosym ../../var/lib/fhem /opt/fhem/data
+	dosym ../../var/log/fhem /opt/fhem/log
+
+	default
+
+	newinitd "${FILESDIR}"/fhem.initd fhem
+
+	newman docs/fhem.man fhem.pl.1
+
+	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+	doenvd "${T}"/99fhem
+
+	fowners fhem:fhem /opt/fhem/fhem.cfg
+}
--- a/app-misc/fhem/files/fhem.cfg
+++ b/app-misc/fhem/files/fhem.cfg
@ -0,0 +1,27 @@
+attr global logfile ./log/fhem-%Y-%m.log
+attr global pidfilename /run/fhem/fhem.pid 
+attr global modpath .
+attr global statefile ./data/fhem.save
+attr global verbose 3
+attr global updateInBackground
+
+define telnetPort telnet 7072 global
+
+define WEB FHEMWEB 8083 global
+
+define WEBphone FHEMWEB 8084 global
+attr WEBphone stylesheetPrefix smallscreen
+
+define WEBtablet FHEMWEB 8085 global
+attr WEBtablet stylesheetPrefix touchpad
+
+# Fake FileLog entry, to access the fhem log from FHEMWEB 
+define Logfile FileLog ./log/fhem-%Y-%m.log fakelog
+
+define autocreate autocreate
+attr autocreate filelog ./data/%NAME-%Y.log
+
+define eventTypes eventTypes ./data/eventTypes.txt
+
+# Disable this to avoid looking for new USB devices on startup
+define initialUsbCheck notify global:INITIALIZED usb create 
--- a/app-misc/fhem/files/fhem.initd
+++ b/app-misc/fhem/files/fhem.initd
@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+home="/opt/fhem"
+command="${home}/fhem.pl"
+command_args="${home}/fhem.cfg"
+command_group="fhem"
+command_user="fhem"
+name="FHEM"
+pidfile_path="/run/fhem"
+pidfile="${pidfile_path}/fhem.pid"
+start_stop_daemon_args="--chdir ${home}"
+
+start_pre() {
+	checkpath -d  -o "${command_user}:${command_group}" -q "${pidfile_path}"
+}
--- a/app-misc/fhem/metadata.xml
+++ b/app-misc/fhem/metadata.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		FHEM is a GPL'd perl server for house automation.
+		It is used to automate some common tasks in the household like
+		switching lamps, shutters, heating and to log events like
+		temperature, humidity, power consumption.
+		In order to use FHEM you'll need some attached hardware
+		like the CUL-, EnOcean- or Z-Wave-USB-Stick to access the actors and sensors.
+	</longdescription>
+</pkgmetadata>
--- a/app-misc/ondir/Manifest
+++ b/app-misc/ondir/Manifest
@ -1,3 +1,5 @@
 DIST ondir-0.2.2.tar.gz 20138 BLAKE2B 3724b8d356cec16e1f60ec49574e2f688d4f7456f48f1d909402e8436f588d9617c827eda9a74c1b930d2538fe8c9d1372a1d222124d8f7b863bf8e895cfaa25 SHA512 5c2c53532934b25d2a170c619d067c369b6acf2ef3e0a87607619613dcc0bbfc570937fb91cdc5df3f22ae0453b5a5d00edd57cd1b852f7a076c15b96c45d4dd
+DIST ondir-0.2.4.tar.gz 52860 BLAKE2B e9111f9a64d8d7393d9a8e48d5dc66d5814995ae1dbd2f577538a03021c1b1b92af43acbd0ab9cb24ab29ba16c50d5752a9442689effc62bd8c13b6fe11a4785 SHA512 f59a823807f86ce2992aaf5fb174ddea222b02ed18e1289ca450179bd090892f1467072dfcec97ce219e216c055781ea7a1a05bb9402276fb9404a57f42ddb52
 EBUILD ondir-0.2.2-r2.ebuild 983 BLAKE2B 1ad1bf96ffea8060f6a676183d5c200165e928cbf46e5a4ddc2dfdd342e150c53bc9375a8413fae34a2a0af147a34ab1cac6caa19b3858e0ae33e85bbeb4e8b6 SHA512 4da1bcf80437796ea0c427f3be610c406880ff76e2d59c651078ab86917c3a06ad3e1b5b017836d499a7cd3ad1095ea9a5308def391764c78dc042063b1af7fe
+EBUILD ondir-0.2.4.ebuild 936 BLAKE2B eaaf969c2efa62b1f186c2101ea597f22ec5d5a0731500615468238ea21a25ead29baf87e113d022380404c0082da32305eb77c5c36bef30c7e0871cc6eae8d7 SHA512 b76a67250437ff8cf6014502bec594bff0e3aeea9ea14b472e7c09bb02f2a8c2b595cd5e3a870cde4b63f15263a1c3a74b4620ce18402f96993a03cc8b30bc31
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
--- a/app-misc/ondir/ondir-0.2.4.ebuild
+++ b/app-misc/ondir/ondir-0.2.4.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Automatically execute scripts as you traverse directories"
+HOMEPAGE="http://swapoff.org/OnDir"
+SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/sed"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog INSTALL scripts.tcsh scripts.sh )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "s:\(/man/.*$\):/share\1:g" \
+		-e "s:-g:${CFLAGS}:" Makefile || die "sed Makefile failed"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX="${EPREFIX}/usr" \
+		CONF="${EPREFIX}/etc/ondirrc" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	default
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		CONF="${EPREFIX}/etc/ondirrc" \
+		install
+	newdoc ondirrc.eg ondirrc.example
+}
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@ -0,0 +1,5 @@
+AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
+DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
+DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
+EBUILD prog-express-3.7.8.ebuild 1573 BLAKE2B 7ea62d5ac6bdd72135934d7e19c851f0e73e87f7da8a229a6dce05bf965f4be129d3a11ef3e12c7ca44b456430e94b01cbdf4b5275d7ff009bad221db3aea440 SHA512 218576988462e71fb6aa0fb8aedd6894798323b00baf41bf91d21783d3a7a4bf29ceacdf75d7c6bb5adaf547bcbfe48dc28f05f7aec1a6e17df63126c8e5438c
+MISC metadata.xml 523 BLAKE2B ea6df68f08186fa4b039a199b83452e561480ca24836dea6d96723058c74d8657f0c8dac3404492a4aad660d9d3d10a30702dc0cd90e6712c4a74e6803ee85a9 SHA512 d7e5c947e7f15307c97c5b4940765245a0b4198a32ba896b8c4587f2d6ece0e3631b654c50b3d918716e598c213ad33d7ae636b4bf119149c90d2ba5f70b5aa2
--- a/app-misc/prog-express/files/pe.exe.config
+++ b/app-misc/prog-express/files/pe.exe.config
@ -0,0 +1,3 @@
+<configuration>
+	<dllmap os="linux" dll="libusb-1.0.dll" target="libusb-1.0.so.0" />
+</configuration>
--- a/app-misc/prog-express/metadata.xml
+++ b/app-misc/prog-express/metadata.xml
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Prog-Express is the programming device control software,
+		suitable for all USB programming devices of Batronix.
+	</longdescription>
+</pkgmetadata>
--- a/app-misc/prog-express/prog-express-3.7.8.ebuild
+++ b/app-misc/prog-express/prog-express-3.7.8.ebuild
@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop udev unpacker
+
+DESCRIPTION="A modern and intuitive control software for the Batronix USB programming devices"
+HOMEPAGE="https://www.batronix.com"
+SRC_URI="amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.amd64.deb )
+	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="prog-express"
+SLOT="0"
+
+RDEPEND="dev-db/sqlite:3
+	dev-dotnet/gtk-sharp:2
+	dev-dotnet/libgdiplus
+	dev-lang/mono
+	dev-lang/mono-basic
+	virtual/libusb:1
+	virtual/udev"
+
+S="${WORKDIR}"
+
+DOCS=( "usr/share/doc/prog-express/changelog" "usr/share/doc/prog-express/manuals" )
+
+QA_PREBUILT="usr/bin/bxusb
+	usr/bin/bxusb-gui
+	usr/bin/prog-express
+	usr/sbin/bxfxload"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	gunzip usr/share/doc/prog-express/changelog.gz usr/share/man/man1/*.gz || die
+
+	default
+}
+
+src_install() {
+	dobin usr/bin/bxusb usr/bin/bxusb-gui usr/bin/prog-express
+
+	dosbin usr/sbin/bxfxload
+
+	insinto /usr/lib
+	doins -r usr/lib/bxusb usr/lib/prog-express
+
+	insinto /usr/lib/prog-express
+	doins "${FILESDIR}"/pe.exe.config
+
+	udev_dorules lib/udev/rules.d/85-batronix-devices.rules
+
+	domenu usr/share/applications/prog-express.desktop
+
+	doicon usr/share/pixmaps/prog-express.png
+
+	doman usr/share/man/man1/bxfxload.1 usr/share/man/man1/bxusb.1 usr/share/man/man1/bxusb-gui.1 usr/share/man/man1/prog-express.1
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
--- a/app-misc/selecta/Manifest
+++ b/app-misc/selecta/Manifest
@ -0,0 +1,4 @@
+DIST selecta-0.0.7.tar.gz 116987 BLAKE2B dda7f21ad939780a1d631086eb669f4824277c9b9bc4a762fa56e201fca3202ee8fab63ea1328dfabf868f4c430456969be99ec1520afcb8c509518f589a3a6a SHA512 7db8fefa51411c6b9996bd1e19889902e807471bb76309bbcace16dcfae70cdb71bdd7abd2c1a96b99d2fe1f9ecbdb1972e95485a2d06b3e3258303a0fef2018
+EBUILD selecta-0.0.7.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
+EBUILD selecta-9999.ebuild 612 BLAKE2B f5392d93eb8e00563aa659649071c8d4f75caa73276dc177e975e01a49530a5542c03f7dcefa168e12b831a7244e0b96d72bb22f6131eb44177c3287cbb876bc SHA512 882a115d5702e7def5b7139688caea83ce853d044bcd59e4814501e32cf323c3b8259a61a646f6ebf73cd047666493ef9826e7a2204ffc7a3cdc7f5a70390296
+MISC metadata.xml 364 BLAKE2B dd954ec6767c68a6ae792b545fe4a11b15630bb77445e146aef6577f71a05d01cf52a8b6afac6dd304ed0d9429453edb16b3f47008b411f331e786bd33c01efd SHA512 542d4cde25dd2756b2927d22dab88cfd2b086b01fcfeafe93aa9bddcbc7b2878e2e048d379572bd06a59440c2b5b255d43dfb7dc8e1e4ce59a07ae7622948845
--- a/app-misc/selecta/metadata.xml
+++ b/app-misc/selecta/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lucianposton@pm.me</email>
+		<name>Lucian Poston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
--- a/app-misc/selecta/selecta-0.0.7.ebuild
+++ b/app-misc/selecta/selecta-0.0.7.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
+else
+	SRC_URI="https://github.com/garybernhardt/selecta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A fuzzy text selector for files and anything else you need to select"
+HOMEPAGE="https://github.com/garybernhardt/selecta"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-lang/ruby-1.9.3"
+
+src_install() {
+	dobin selecta
+	einstalldocs
+}
--- a/app-misc/selecta/selecta-9999.ebuild
+++ b/app-misc/selecta/selecta-9999.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/garybernhardt/selecta"
+else
+	SRC_URI="https://github.com/garybernhardt/selecta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A fuzzy text selector for files and anything else you need to select"
+HOMEPAGE="https://github.com/garybernhardt/selecta"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=dev-lang/ruby-1.9.3"
+
+src_install() {
+	dobin selecta
+	einstalldocs
+}
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@ -1,4 +1,4 @@
-DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
-EBUILD heimdall-1.4.2.ebuild 1087 BLAKE2B 479ca5811cd315a1a7b77709671f3c70956e2597558a20e622a8eb7820d6880654446a281501da14a82210768e52761a04890b93337661707b6d33a116c8d27f SHA512 410af64dd8b82467fc1eaf4f81450670a9199a57267b8da62f00712cbf48300dba23f780f166b77bcb9f90334fa02e400dac5abd5ed3f4f49812300d9bd6a9c3
-EBUILD heimdall-9999.ebuild 1087 BLAKE2B 479ca5811cd315a1a7b77709671f3c70956e2597558a20e622a8eb7820d6880654446a281501da14a82210768e52761a04890b93337661707b6d33a116c8d27f SHA512 410af64dd8b82467fc1eaf4f81450670a9199a57267b8da62f00712cbf48300dba23f780f166b77bcb9f90334fa02e400dac5abd5ed3f4f49812300d9bd6a9c3
-MISC metadata.xml 350 BLAKE2B bf0c1a7237f44596f61802c67ed46fb2e8b85d4ddf38fc235d625ffb2dce123f245f65497293f9d76daf59f8a327a2e8fc7247d3062001d44d4c8242c08131cf SHA512 bef074ae5251d966c48420c9ed1c61e1cbf36636823e8b237914087b31e300c2436e3c7479da9762d396412e6767ebe3c9453fd85e958e603a0639268c539f77
+DIST heimdall-1.4.2.tar.gz 5486708 BLAKE2B 3846176440f235bc5bb65ac77a2d86b29381dcdf8e999edd38529f02a9f3bd21070bf922ad48fbd8c73c58e1f4834345da4c849549d136dde82df8a68cc4155f SHA512 ed9c5cc7e9377647474ba1af8b7a06d7bbc2371d379d83c2e5cd8463637c52c08c269ab18b6a0a0bec91be8101978748b2d10dd78629ba567bd2c2e452633f63
+EBUILD heimdall-1.4.2.ebuild 1104 BLAKE2B 5c1d639ac2a73ac032a737d3bfdbbf174f07365d090f2ea2d89e8d65e1dbd4403758e68b6220dc50cf6124b1e4c23bdd07e7aac8ea6822c85af2477ebefd7491 SHA512 64f66eb007602f700fe57d78b7eb4fc4af3e23b013708fa2f8232294bedf9bcb91c549126118847bde6dd051e401a15b94e784ad93ab88935b92eedb69f763ea
+EBUILD heimdall-9999.ebuild 1104 BLAKE2B 5c1d639ac2a73ac032a737d3bfdbbf174f07365d090f2ea2d89e8d65e1dbd4403758e68b6220dc50cf6124b1e4c23bdd07e7aac8ea6822c85af2477ebefd7491 SHA512 64f66eb007602f700fe57d78b7eb4fc4af3e23b013708fa2f8232294bedf9bcb91c549126118847bde6dd051e401a15b94e784ad93ab88935b92eedb69f763ea
+MISC metadata.xml 349 BLAKE2B ed767cd626d807128c617828a7b7c8d789644a86d0b88dd6b53806682878714e795461e1abd550e81591ac9c677dd0a906ecffd1de97ccb9e6378bb81590b083 SHA512 c835df6fd37ac66d692a02fbd0b7b2e5b2eed80837be0f15b4b403d25b1588a4343c38021e96733918576f8cce0392abd87d65624264fbd713b4dd9fc2c84b57
--- a/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
+++ b/app-mobilephone/heimdall/heimdall-1.4.2.ebuild
@ -6,12 +6,12 @@ EAPI=6
 inherit cmake-utils udev

 if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/Heimdall-${PV}"
+	S="${WORKDIR}/Heimdall-v${PV}"
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
+	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
 fi

 DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@ -6,12 +6,12 @@ EAPI=6
 inherit cmake-utils udev

 if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/Heimdall-${PV}"
+	S="${WORKDIR}/Heimdall-v${PV}"
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
+	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
 fi

 DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
--- a/app-mobilephone/heimdall/metadata.xml
+++ b/app-mobilephone/heimdall/metadata.xml
@ -6,6 +6,6 @@
    <name>Lars Wendler</name>
  </maintainer>
  <upstream>
-    <remote-id type="github">Benjamin-Dobell/Heimdall</remote-id>
+    <remote-id type="gitlab">BenjaminDobell/Heimdall</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@ -1,3 +1,5 @@
 DIST grisbi-1.0.2.tar.bz2 6956892 BLAKE2B dde75fbae341fc03226083567ff4731457abc7079ace92956c9e8b35ba4140dba32dc67ebe3b2a4826750229dbcd09da0f2eaf1f18c8783238d3fee274c46be9 SHA512 5988d362db8e94f135af34de1acfd7222ceeca11d229ffca533ca75c75c8054dda121bc45979106ee8f4ed2ac0660ba7836dfd053478fdbe4a2984cb94be3cf8
+DIST grisbi-1.0.4.tar.bz2 6965398 BLAKE2B f53b5cd7f2e4b0cdcf14732ba7e03315ec7d419c7f6ab3a290fd30a9dc9f7c0dde69b473dca3873aeb90b793cd90287c516f2fe4b7a50d71368abc3e12ce16f6 SHA512 9761ed94db563c39cab793ee076b6a729470231e3111d7ce57d188a6f1681cbb715174f67c15741320f295d4efdf0784f6e3d4d4d58267759efbad56561c7064
 EBUILD grisbi-1.0.2.ebuild 851 BLAKE2B ed663f8a87f1f917b1854bd0d077562d82559df468efe624972619379038a7fbb53a8eb8dffc69b002599ffbf5d04092f95ec0cb4d286c2232f7f9018ec6474c SHA512 b424233da058418dfc40a4fadef7beba94e4e3caf58441b1ba18215a5f7203ded75bf31f1e4a056350cc2a22fab88ddb111379a59d0b4380ccecaa73cd52e012
+EBUILD grisbi-1.0.4.ebuild 853 BLAKE2B d311fc979e49e45d4d9460abfeda1c11b12646db3d918b6c648cec31a756b89a3f2edfbf1b319669bbdaa857d599e8b2f14d4f9c10ea0c8d73de8aa3785c37e0 SHA512 1346634be750f248aadf7347b9a83546b1aff2452babd389e75291ac42508c79a838942dd5e04dfb659557242f38d71aa434d58516c116256bb1d0dea81996bb
 MISC metadata.xml 635 BLAKE2B df6fdefe6d4474ec7b1a5c1a68572dcd5879ccaa2fd09c217ac28790156f964a0a62e5460e54113389c664437d8f8b3917d1334fec2a78317b9105f31b9fb205 SHA512 c1c5f6e2bbe4a11958cc78c3f61d8045dc89bddd640c15ef93c52de9acdd7cc00f483ad1c06f3dbd36fdda998a45ca0c31d6e188ba17ed4bae72f8a3b2c21766
--- a/app-office/grisbi/grisbi-1.0.4.ebuild
+++ b/app-office/grisbi/grisbi-1.0.4.ebuild
@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Grisbi is a personal accounting application for Linux"
+HOMEPAGE="http://www.grisbi.org"
+SRC_URI="mirror://sourceforge/grisbi/grisbi%20stable/1.0.x/${P}.tar.bz2"
+IUSE="libressl nls ofx ssl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	>=dev-libs/glib-2.18.0:2
+	>=x11-libs/gtk+-2.12.0:2
+	x11-misc/xdg-utils
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( >=dev-libs/openssl-0.9.5:0= ) )
+	ofx? ( >=dev-libs/libofx-0.7.0 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--with-libxml2 \
+		--without-cunit \
+		--disable-static \
+		$(use_with ssl openssl) \
+		$(use_with ofx) \
+		$(use_enable nls)
+}
--- a/app-office/orage/Manifest
+++ b/app-office/orage/Manifest
@ -1,3 +1,3 @@
 DIST orage-4.12.1.tar.bz2 2590788 BLAKE2B 0f00b5704e11923c2ceaac81f0956457402a90f65709c165c98b6942745ea3adee176691555a18548ead258951693187e1b3ce9a718abb3b13c2a1c2a4754e7e SHA512 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
-EBUILD orage-4.12.1-r1.ebuild 1540 BLAKE2B 32e995bf7b5a3518a30f3dddb2a1ccb74f45fd5c249605dcf168ce9bc6e9cac557cae37d927f1754faa6aacf6b04b48c384a491c4ff941a21d8722f5781c6530 SHA512 43a08917b88afe4b324975dd098fa7046353fe42734d1a4ec156955622800397f4154581a4c70fa67b8328077ab926db8a93db866c3e84f6875f526f6a409b2b
+EBUILD orage-4.12.1-r1.ebuild 1551 BLAKE2B 7b68711f09b5263f72248ea59a11616f61c9e188fb3105ca7c3ffa54f6e88abdc5d6e235175cba3f8130d9ae4431d5a2a286da77c90fd574cde7f0b44ddce12a SHA512 83e6b2110405c82c3c72389563f9180e26646c9d91b8d82383cf9fed91acc90ca005658c00be8283bcdc5d2dcd5a4ab93eb31182defda79b82d553e8ef3ea773
 MISC metadata.xml 355 BLAKE2B 4ddbf38a80be81b7e131d7c616dfb88dff1e900952c17c4cc4dd26711e720351177d92d8225825dd57354399ecdb8b7bccd18f883fcd927846e8614dd4ac4a99 SHA512 a5d3f875ac31caa10ca77ce8eb38449b3007094d1b9d7d307bd15ee29644c09530d44ac6a4953e10adfa3bd45b6a3fe44dbbb3b80ab7d0c8572c48523ef287eb
--- a/app-office/orage/orage-4.12.1-r1.ebuild
+++ b/app-office/orage/orage-4.12.1-r1.ebuild
@ -7,7 +7,7 @@ inherit gnome2-utils

 DESCRIPTION="A time managing application (and panel plug-in) for the Xfce desktop environment"
 HOMEPAGE="https://git.xfce.org/apps/orage/"
-SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@ -1,4 +1,4 @@
-AUX implementations.txt 781 BLAKE2B 8bd653731c5a92073a98fe69dc98fefbb1c3c7bfe0bfbf4417b4bcfaa8f93d23b95bb11dcc19b75ff4b3f1cbb597fa65d323df2836e9a610519fdeb528356673 SHA512 f442fbc1a4da5e3ecdb51b3b3a72f5f4f2f8b3777fc514c923d8ad885a89dd725486eae803fe481a7f8d5a32691ba2fba974f887548094599a27cb3b39a0ab89
+AUX implementations.txt 809 BLAKE2B 64d5776621de4f6d522c2e07529f41f154c4253f35fff9f7dc6967ac2970a8911666644401cf657a05d500665680dc0b6cbaf120fc6bacb50fa2e058fcf2901c SHA512 e3b20f8cd0d34da4d506107a38b176a36960f97090d06de1475f12167ae28f95d5dd2d062baf31942f517d0e40b91fde485581736a40eaa9de838b28855bc62a
 DIST gpyutils-0.2.1.tar.bz2 15044 BLAKE2B 44a67a70c42b07523232f3e8d6db0b9155709100c4fede41e1f96c2d3fa396a1d4a67529c7e70fa75c2729c1a8f769cff35936606784a9ddc2a59cb3d163780a SHA512 58b796647bf614e4ad492fe97539bd11f0d5beeecb7fd903a81917bfaac54ced4fb14813f499010093884891eda9c43226bcf2cae7744e7290bf9b16928b6172
 EBUILD gpyutils-0.2.1.ebuild 519 BLAKE2B 1d1f4767c7f3ab0d2e5791ac1e3fa9bba0b6e93f091273a4bfb20260beef1febb5877e4e6b6c21bdd069e421719fe6fa997b93051bdf0fada7d9c796220889b5 SHA512 e19aa3fad32d70354d00b28ef019243cfaeb64cddb6ce7ede3397588b870b9f16bfe5901514a0df3982432432b254a94c5901e79bb73402ebed7bb3d05ffd42e
 EBUILD gpyutils-9999.ebuild 498 BLAKE2B 8dbdf34500e17239e1045d9543a57d6a39471b94352d935c59130142306b32de4078bd3db80bedde5bd9f22209257b6075184740696ab1a71a07656789fca003 SHA512 d7a4e377084238a4eae3698258c33156348986a12f10cdf9a528c4d9697a30502cf628c640326f514ec034806eafb8f18cfd071f12b16ec1c449dc70a9fc6c71
--- a/app-portage/gpyutils/files/implementations.txt
+++ b/app-portage/gpyutils/files/implementations.txt
@ -16,6 +16,7 @@ python3_3	3.3	dead	3.3
 python3_4		current	3.4
 python3_5		supported	3.5
 python3_6		supported	3.6
+python3_7		experimental	3.7

 pypy1_8	2.7-pypy-1.8	dead	p1.8
 pypy1_9	2.7-pypy-1.9	dead	p1.9
--- a/app-portage/kuroo/Manifest
+++ b/app-portage/kuroo/Manifest
@ -2,4 +2,4 @@ AUX kuroo-0.90.5_p20180410-qt-5.11.patch 1178 BLAKE2B 944d08100d9b3a75bddc9fa441
 DIST kuroo-0.90.5_p20180410.tar.xz 241920 BLAKE2B d182df57f0c6628b849f6f6e4d7919281117396ea30360e6eb0993b3c61ba67956a8e0648926f77e23d8222a8337108599f657cb7e49091fd51b98febb6593ce SHA512 f1894c90b8b6df06818cab6cc3fb55a3348f8a9df669b515796dabe9a0df3773d69ba89a4aa3569250b2fb379c1169d8789c82fcd3868ddb9f640f010aee811d
 EBUILD kuroo-0.90.5_p20180410.ebuild 1377 BLAKE2B f024e0cc1e5d5e36ef956a930ad5292e0a8bba33b204a7ff95268d03607a9650fdb3101f2a0118b65038a3066b9e79fe52618b8cc924e20688a5cd5917793eec SHA512 9ed7aaf28ab4321c919f60ca1d6e97b5445882829ecd7bc910ab6b022ad90c9569b9b3a4d7b9fe3c97028bda378693db578d0087827c6ad5d18868b87b0b7d31
 EBUILD kuroo-9999.ebuild 1366 BLAKE2B c7b79fd860a1e181942998e2a876422b0fe83a751db12cd431ad9f22d634bba14b8b02c33a74c0213cbacd75b76a5cbdbb738662bb5f4791d390c5e95eb4e4b2 SHA512 3c3c67e3dccd4e451a27a598c2e95cfcf7c9d6324a73b6020b33d19e6eff79c37a8b61ffbabae4b4e454fd640c3739c4c663524f95d4849b9bdf2ffd62977415
-MISC metadata.xml 848 BLAKE2B 206ea97ff1d664d67c7a7fa532702364ef8d32cf8169cb00133fe38be7170592142deffb6a85ca1ef1cc9e7afa48e8fe72a141cc690a4c9db46d8986336c7a49 SHA512 b474295993a6b05a885bc9873f18f3c880b953417471059d06cd3a367b0b8d482809091126caf5443f5f761776eb96f128138352dbeaa86219ba4554c924f3db
+MISC metadata.xml 757 BLAKE2B 338d2d4cb0c2d198f8d38ccaa33dac9b9b745baaecbd642f6a0cbf4a3471642db421918eb292a1e7ebed9305429decd70c1cb27f98328cea17f3dc87c893fc53 SHA512 86b24f163496aff68fdfe3ad7fb1648100d1f9757dd18194899b512242236b8e3130b70f74576adbdcc7f570ddccea6655714875f39b52fb6bf4c2bc46b55b11
--- a/Show more
+++ b/Show more