gentoo resync : 07.10.2018

21 files changed, 82 insertions, 141 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 372917a03734..92e383be2dc7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index d1b06c22ca3a..99486a420db8 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -6,5 +6,5 @@ DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20170717.3.36.1.ebuild 6242 BLAKE2B 0056524a8dca1fd3f6ea44d331ce35fdb6731dba91d3bd72b22d866455b334e7f10b18b3a586081cd75015423c275b88c532c36dd2a96cf1bb898c854456622b SHA512 c112ebedc32f62230390f58fb56598842000f189d6dc0215523cc621c9424068eaf52a38135767590699aa9cb258e408284769af4cf44ea951d0daf7d84e2b6e
 EBUILD ca-certificates-20180409.3.36.1-r1.ebuild 5729 BLAKE2B 140f0bf955cfe3ccbc87f374c24011b3e877da661aa4ce32cfc4a51b4098016d53e1de468f62d51035c960ac53f9b479deadfcdc1d479afbcf8d2caedf021585 SHA512 c95f25a84db5fc07e7a08a49529cf9c28f3a9153d2c29226b3f95dd457485c265ba84fef558132f63231b9c0c2f2c203902df9c11d1e3a878a19fd0959d10c4c
-EBUILD ca-certificates-20180409.3.37.ebuild 5729 BLAKE2B 140f0bf955cfe3ccbc87f374c24011b3e877da661aa4ce32cfc4a51b4098016d53e1de468f62d51035c960ac53f9b479deadfcdc1d479afbcf8d2caedf021585 SHA512 c95f25a84db5fc07e7a08a49529cf9c28f3a9153d2c29226b3f95dd457485c265ba84fef558132f63231b9c0c2f2c203902df9c11d1e3a878a19fd0959d10c4c
+EBUILD ca-certificates-20180409.3.37.ebuild 5730 BLAKE2B 41dd842c549766695617bc3574a82ae44c48ae2dc334b963c8a3ecc03f2df095674b3b57f0ec6158b953950b745671b73b9c6af4299db37375eb8cd540e3e7b1 SHA512 83bd8c64eab4bfcfaade11aa7d5e066eeee35d10f23a988c382eaa3d8232de4cfb3a930a61ffa45c78612ed6dbac17be97a733f5411048b8bb9bbd454031bf70
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
index fbbb928d022e..95efb82e672b 100644
--- a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # The Debian ca-certificates package merely takes the CA database as it exists
@@ -26,7 +26,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 
 inherit eutils python-any-r1
 
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index 10fb23294b0a..4e6c9ce9ee88 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,4 +1,3 @@
 DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
-EBUILD cdcat-0.3-r1.ebuild 1245 BLAKE2B c45100b1cb46d197421f9964a22edcbb7a5f4d026348d6a8c436c30df1d4463e6ecf353458957f8b9e8f05bf2cccc13a1ae42e91359ce0471e351195d9884e58 SHA512 1fc07b8db7fa5e486171370a4f0577321ce3d7c39766dd1eca9678ac11671c6430416a14490129d32b2928aae619b057f3ac9847fce7e14af15a859568269521
-EBUILD cdcat-0.3.ebuild 1231 BLAKE2B 435ec1d0f9750158055c9ddf2ebc1a31fa0223d51d59b34832fd9bd8cef528244e3a9d645c0d20b9149d0b1b578a4c43ef495d61b31822e07a84336da09a19ce SHA512 a21844dbbc3ba3206407dd59e0af6bc520fb09d83a08fc3454853bcd2c44853e8f68d2ffed1819a034c6e22c6792f0ba7b4b35d91df62f75716429a82f5185fa
+EBUILD cdcat-0.3-r1.ebuild 1239 BLAKE2B ac07365db2ca0d52437ea84268db936669044fa2d97502bcd79b1f86a9cade70b426c788430267609b4e7e28abaa84092e918a2142484ee1b923e4c1e521404c SHA512 c2e0c151bd9b306fdf6a10fa3c760fdbec1be83e83c92f8f54e67d811be0a396b4ed86d6daebf99640374e6d811c3c00744e5fab681f947fa5b085d81f1c4423
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3-r1.ebuild b/app-misc/cdcat/cdcat-0.3-r1.ebuild
index 3649b8e2eacc..8ad49a3e87e9 100644
--- a/app-misc/cdcat/cdcat-0.3-r1.ebuild
+++ b/app-misc/cdcat/cdcat-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ HOMEPAGE="http://cdcatalog.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="virtual/cdrtools
 	!app-backup/cdbkup"
diff --git a/app-misc/cdcat/cdcat-0.3.ebuild b/app-misc/cdcat/cdcat-0.3.ebuild
deleted file mode 100644
index 6f165bb146e3..000000000000
--- a/app-misc/cdcat/cdcat-0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="simple yet effective CD indexing program"
-# original src went away: SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
-SRC_URI="mirror://sourceforge/cdcatalog/${P}.tar.gz"
-HOMEPAGE="http://cdcatalog.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/cdrtools
-	!app-backup/cdbkup"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# workaround install.sh ignoring --man_prefix
-	sed -i 's:^MAN_PREFIX:#:' install.sh
-
-	# fix path to cd index files to be FHS-compliant
-	sed -i 's:/mnt/ext/cd:/var/lib/cdcat:' src/cdcat.pl
-
-	# work around problem with isoinfo -di
-	sed -i 's:isoinfo -di:isoinfo -d -i:' src/cdcat.pl
-}
-
-src_install() {
-	# workaround install.sh ignoring --man_prefix
-	export MAN_PREFIX="${D}/usr/share/man"
-	dodir /usr/share/man/man1
-
-	# create index files path
-	dodir          /var/lib/cdcat
-	chgrp cdrom    "${D}"/var/lib/cdcat
-	chmod g+ws,o+w "${D}"/var/lib/cdcat
-
-	# now use the included install.sh
-	./install.sh --prefix="${D}/usr" \
-		--man_prefix="${D}/usr/share/man" || die "Install script failed."
-
-	insinto /etc
-	doins doc/cdcat.conf || die
-}
diff --git a/app-misc/cpipe/Manifest b/app-misc/cpipe/Manifest
index a89821a1902b..673d0dc61e39 100644
--- a/app-misc/cpipe/Manifest
+++ b/app-misc/cpipe/Manifest
@@ -1,3 +1,3 @@
 DIST cpipe-3.0.3.tar.gz 16392 BLAKE2B 6aadb1b186bbf9aa5d804ca719baaff662116084c1e24c9fac38526e8fd190421189dfb02787f430dd0997b3b1bcba41ba002630a324e508190a0b6bd6b0af91 SHA512 255e3833ddaf27af1768e650a47d0565224ddd22137636ae0fae491a4d03f523b74a76f26b261c71442a7509f42eee64b75fbcf7078641a64b66a2590bb803b3
-EBUILD cpipe-3.0.3.ebuild 649 BLAKE2B 681dbcee08f62a22faf8e5202815d776870923ff5d5e221f034e2ba3c20bdd5e784375ad31f361c5b76322e8809be240b94c39e7893de68dc7e1cf1b3983de2a SHA512 d5664f0b059e092f0e4ca41e8aaf630cbabab2a07c25616b550069355d6570c35737aca7c4211c37943be15a6b968348eed2c43c8b8e71ddcc7a8e481789bd0b
+EBUILD cpipe-3.0.3.ebuild 659 BLAKE2B c79449c6313e63e2ecf9cc00834750bcffe67811fdc1d13dd003ed3fa66f4dfb3b0c564b6eb7616754f60f7c0c9533ad90113b1d09df0a3099d9e8527e8f1ee8 SHA512 73f526e020ce899e19699e5fd6cf6bcbfeba343f37f5b203dfc1488eb711941f492cb5ff16bdd14a974d34dd5893d0f89690928aeaf98e7289fc00d376d5807a
 MISC metadata.xml 330 BLAKE2B ae60f1e0f28436199a2f72cdb7ec2714258a8ba42eca5bee81c54bf3cfdbcaf04f450c737897242d064c611947124b8865d6b2720eea1eaca4e8643a8fd09e9c SHA512 5d888afdae9cd65ef26799a4c311dd11bbe8cbea93d6e8ba4e92086cce3df5708be39ea4c20a1ea0bd76d9e06846dd1f48af120f0812f4be75e9ae1f43e669bb
diff --git a/app-misc/cpipe/cpipe-3.0.3.ebuild b/app-misc/cpipe/cpipe-3.0.3.ebuild
index 1f656dc38a49..e37354a3d76f 100644
--- a/app-misc/cpipe/cpipe-3.0.3.ebuild
+++ b/app-misc/cpipe/cpipe-3.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/HaraldKi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ~amd64-fbsd"
 
 src_prepare()	{
 	default
diff --git a/app-misc/ddate/Manifest b/app-misc/ddate/Manifest
index f829ade5a82c..098f726b64d6 100644
--- a/app-misc/ddate/Manifest
+++ b/app-misc/ddate/Manifest
@@ -1,3 +1,6 @@
+AUX ddate-0.2.2-dont-compress-manpage.patch 646 BLAKE2B 18465cdb8ec25750868455214c4557f42a57448b8b5785a6793df2ff412d089af0e88743a7c361ab4284a9a6d98fda1c6cdccbb227628afa65beb7d5919ff6d9 SHA512 a967a30379e6fb07cd00cf133068409c24dfd660fc84a200fca8feae5664ce90598f23984b73e32e1dae9c4af31f0289f82cb24d6a4b74956c88c266d9c9e485
 DIST ddate-0.2.1.tar.gz 7757 BLAKE2B b2899b325d5cb45b2aa2460fa900740c41c7790823958fcd1cf971713d61283e050737b0cecdd1988c60718e2741ba1d3a0a48442b4013d9727db6a3765da882 SHA512 377ae4be0ddd2386de726603116ec64a524f2f4263cb30d2cd8f10024659f5fee552cf13de45cbaad36c93d2dfd16c0667993d67a37ba2276a96ca052265c714
+DIST ddate-0.2.2.tar.gz 8049 BLAKE2B 7a987595b2dc399a5fc254891b92af84c9f94830f65c756f75db30c1e4db008ad715608ad37d53f3b73f3f5263023c066c546eb7536dc7439ded3650996be001 SHA512 5d148e030bee392eb93c5ae519061af0736f2f75eaae916e3efaf927d9f4de8cc72afc4a5121b6fbc0264b73e9f580330a38b97bb78837d447d0b4c1fc29ec06
 EBUILD ddate-0.2.1.ebuild 665 BLAKE2B 976c1f0c0332d87d64147d0524f46f5971b4ea37477a42a70d4e4a63281c7eb02d4e41b5d66be204c1210372376a0ba8e0a5f415e858ed27cb189e298fe1cd2c SHA512 442a9548fc42ff0aa96f36020da4e6c840cc34dcdcb487d6be2c2efe3d71043fa98bb12f100a5c07dda3eed4ade983f8213e47a445c4bc9303583f0a68b04450
-MISC metadata.xml 219 BLAKE2B 9858286d68d75ce04ccfc658dc2fb021bac4342b211ac0cad2f57e64ee921af88be0fd6edb6c34c2f779207635cabcc390c8e72bad60d3772704714f31351fcc SHA512 6e64ad59ba9b06e33a75001a02ac552d3e5127ddfadeb4a06afa90d334718ec1516c71c6195538cb3fbca9998acff0239ce70a6a9b1d8dc393a1ff02fc24f168
+EBUILD ddate-0.2.2.ebuild 518 BLAKE2B b0c492da6c0326f6430dba598b3037afbd2ac454bd91e1d43b2359ac7c15a0ce1f92c776dc85166f80d09c38d11dab81344ed2230ec12076c4dd5e37255d90d8 SHA512 f01eb4e97a2b5d48ed99579a7c857f8e121f72b183cf112f8e6402730a850c8ef08366939ab1a25f98f12212f2db58e3e783511a4f0d005e3bd192bfc0059994
+MISC metadata.xml 711 BLAKE2B ddfa1311f5fa3c5604c206dc77da1e40c3095ca3f5103b54b9d0d520626b62f49c95ebb077bea726c4f43100f0ebeec47005ac307d77012f8a592f29f61cc507 SHA512 4772c77e33981110fa4f1538414db73cfc67d09c686209bbfcf331e6fcb8c3fbae87b702ef88f672cd55a99a3b0c83996a8005c5f79b1a102b8410825f27a6ff
diff --git a/app-misc/ddate/ddate-0.2.2.ebuild b/app-misc/ddate/ddate-0.2.2.ebuild
new file mode 100644
index 000000000000..ed2ea3d74539
--- /dev/null
+++ b/app-misc/ddate/ddate-0.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+DESCRIPTION="Perpetual date converter from gregorian to poee calendar"
+HOMEPAGE="https://github.com/bo0ts/ddate"
+SRC_URI="https://github.com/bo0ts/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+LICENSE="public-domain"
+SLOT="0"
+
+RDEPEND="!sys-apps/util-linux[ddate]"
+
+DOCS=( "README.org" )
+
+PATCHES=( "${FILESDIR}/${P}-dont-compress-manpage.patch" )
diff --git a/app-misc/ddate/files/ddate-0.2.2-dont-compress-manpage.patch b/app-misc/ddate/files/ddate-0.2.2-dont-compress-manpage.patch
new file mode 100644
index 000000000000..1eacf8ae3a11
--- /dev/null
+++ b/app-misc/ddate/files/ddate-0.2.2-dont-compress-manpage.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2014-06-20 14:56:55.000000000 +0200
++++ b/CMakeLists.txt	2018-10-05 17:03:43.000000000 +0200
+@@ -4,15 +4,9 @@
+ 
+ add_executable(ddate ddate.c)
+ 
+-add_custom_command( OUTPUT ddate.1.gz
+-  COMMAND gzip -c -9 ${CMAKE_SOURCE_DIR}/ddate.1 >> ${CMAKE_CURRENT_BINARY_DIR}/ddate.1.gz
+-  DEPENDS ${CMAKE_SOURCE_DIR}/ddate.1
+-  COMMENT "gzipping manpage"
+-  )
+-
+ add_custom_target( manpage ALL
+-  DEPENDS ddate.1.gz
++  DEPENDS ddate.1
+   )
+ 
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ddate.1.gz DESTINATION share/man/man1)
++install(FILES ${CMAKE_SOURCE_DIR}/ddate.1 DESTINATION share/man/man1)
+ install(TARGETS ddate DESTINATION bin)
diff --git a/app-misc/ddate/metadata.xml b/app-misc/ddate/metadata.xml
index 62bf9ab7eebb..5326117a6b34 100644
--- a/app-misc/ddate/metadata.xml
+++ b/app-misc/ddate/metadata.xml
@@ -1,7 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="github">bo0ts/ddate</remote-id>
-  </upstream>
+	<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>
+		Converts gregorian dates to discordian dates.
+		Sacred document of the frogs (old erisian poem):
+		73 Days hath chaos, discord, confusion, bureaucracy and aftermath.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/bo0ts/ddate/issues</bugs-to>
+		<remote-id type="github">bo0ts/ddate</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index e0ac8a9f5708..c7f2a9934026 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -8,12 +8,12 @@ AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cd
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
-DIST elasticsearch-5.6.11.tar.gz 33864199 BLAKE2B 08884e6367007835ec1d248912d4127ade4d5fff85927df86ee7de4ebf5ee9bc9639940c89b71739cf17fd389d0c47a23cc48ccd1777b94830f1614663fd7487 SHA512 cc0ec89889e23d7aa3e03a2bb76bf6bb40b3084a8a13da99851c4770533048283d36b4c13322b4689480914e5e57c4c998d4abba44d8caa44ffdb21edb207a9c
+DIST elasticsearch-5.6.12.tar.gz 33861038 BLAKE2B 548513d568ffad6373f15671934cce84217d59b8a036847685ad055681f816d3a75fb6ba2c60c7965402e791d6f5b1a11fe8918bca9f4a60fb8e9d43809da0a2 SHA512 bc2436ff34bca652f6a6462920921dce3b085300787e02191c0673d7b3789c0cf81681108573f0ec4dc945e91a2e6ae19898d1b606ca35694bfde6d9cd5762cd
 DIST elasticsearch-6.3.2.tar.gz 91452574 BLAKE2B c422990fabad70e6e77e8f59f6fb9e9bf5a84eb7e6b8b67dfd91f53e474b1b501b3a1d5ea8f54f0793631504f194a116e816eb3558782b67c8dadecbc2711ee5 SHA512 954cd1e16a5f2e0b0efaeb7e6b19c708d1588d30814a31defb09037c3b90f78c5e9dbd1ca9af9c700d517145a4279bacc1d8ce7cc6894fbe7bf71eec9ed3110d
-DIST elasticsearch-6.4.0.tar.gz 97901357 BLAKE2B 60263c3b68a91fba2341d45162cac328e5561cfe046bcc0dfff3eb09d2e487374c5e8481b460a54861df7b2c5774ac2cc6c884fc6b5455fb40f0c89848c0ad0b SHA512 6f465378a51c487f1f6a84a0843ac1038db60170ee8a5d96874a759f6dbbf2de9f7bcbbf55616f49f28f1098c82f2e585c917267d02b8b1f43627a1984b3da66
+DIST elasticsearch-6.4.1.tar.gz 97924081 BLAKE2B 179433ebe9fca80517057a0379d67545bfd42af741ca64fc2e5b307f9071634d20f297c46d43cfbcfa8dcc45f269c5db32b70656bd4c3035a47aacae861875a2 SHA512 a023a6db5554dee6f10718dfa297aa06a735c7857542c2db80fa5c2b86ff4bf405bb8167578c5b60741ad05ed96a64b54bc71d128a0ff955468b0449588b053c
 DIST elasticsearch-oss-6.3.2.tar.gz 29418577 BLAKE2B 152640dc01a10f44ba43f87f68361cc0dd5e1cf54d0ff92377f3acd1a12a247f002ffe2d003cc53760e891278249c10b1d6d4eb978b0bb1c1ebf8879a2cfcb9a SHA512 3c51a860414f7e55900b1d9a350bdbc3e673c8445e316454c2480315b4b9fc08df58090c6281cecc3ae63d12d78d6bd58e228b3371aa325db799ce18758a21f4
-DIST elasticsearch-oss-6.4.0.tar.gz 33727061 BLAKE2B dd0ff95bb124103ca340b480c5192c9919ef226d4c3ef1b61accd0df2ee9b60a8215693b3db0fa327a4d6791de66746654144a9172210687e8a2efa9f6f4dde3 SHA512 0197dcf24bdb81cbcfa492d899363528816143962abd1925a5092e8177c25e8ca490afe5868b41057b3cded296f59f38ed11ba0156a820b6c877c69a5888846c
-EBUILD elasticsearch-5.6.11.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
+DIST elasticsearch-oss-6.4.1.tar.gz 33725674 BLAKE2B e24809eab213aa34499dcfb1e9a9a2b37d85346d4647282de51c95b17f0ae693f9b48e1649658d700ed8e3d547fd22b5f2276c3b4a2b78aa6c129b8bd1eb096b SHA512 5036adbb091dff95416f4f4b24f615475d7c8c058fcda733ec49a9867b7dafcb90c430f486c667cdc30958280814e609c3f0bc49c20bdb06c0a22d01504a3873
+EBUILD elasticsearch-5.6.12.ebuild 1686 BLAKE2B 5275864107bfc5c8be3e0725eac78ec21021aff4716f494f8e793e2198223450ff5fa7eaeb63959641af4a4c9e30c3ba865e7871cec6ec903010a97b1cc3c107 SHA512 ef36e2a07bf258cacd735c87b765d72c678a47c2a968e89e9ed11ce2592aa42ec2509dc65fa39dd2a66ff4e681d724c05dc4f7ad93439753beee75aa0dccc744
 EBUILD elasticsearch-6.3.2.ebuild 2603 BLAKE2B 329924c83731282a8054c4c5965f30fa6c2748b4558044fa7b1407ef406dbc02a02735274ec942c20830396e2eec9e614b7406028623e03bab570e42bba522ca SHA512 9435e7af52a42bbe8626330dce0c2b80a827d697a8fae96edceba3a9665472775e71e23cee099b931bf17dc65eddce2fbee68e36823d1796bc7187169153db55
-EBUILD elasticsearch-6.4.0.ebuild 2582 BLAKE2B dd354462830a8d19a87b031fa9930a2e88472370a69f95333e0b5fbbc363075e5e26c1c231640126e4b60e90c3cc08f48af15f1fddffe1fc00cdf907c1435333 SHA512 370f137aeb73744e42d6b6a5e2554a9e4fbf1fbb218e4f45d8b39050d0bbc231ef2f27dcc0295db2ab7c10f0a394a88f263e5f8bd630023664f3be4f245aec77
+EBUILD elasticsearch-6.4.1.ebuild 2579 BLAKE2B c397625f021c0dfccede2c57e24cd0584def56204ec33ea7fecd36e901fce6a8cd9d449b03dd19cc3c7ec66be5e700f25454e0cc2e18e5dd924791349b66f7cf SHA512 b89368ddc71306ab1345257ee899e2b0be87276587e5157d714616ca7548175ec7be80fc646ded6ac86635fae785def9b63401a642b805470b7abf54e0038d8e
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.11.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.12.ebuild
index 26cfa98675c0..32370ac9f8a8 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.11.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild b/app-misc/elasticsearch/elasticsearch-6.4.1.ebuild
index 2a715bac374a..52da0c6d6359 100644
--- a/app-misc/elasticsearch/elasticsearch-6.4.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index 26623ae02d28..26988bad08de 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,5 +1,4 @@
 DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
 EBUILD irtrans-irclient-6.01.05-r1.ebuild 1331 BLAKE2B 9709f86529fe6fece10be99747e312d0a2467588e32cef7391f70cfef0bfe892db88b12b0d4cdaf07853fe30c160658f5ef31a7c85d17b55ed75734ba7765ff1 SHA512 3754845152408964332914b5e4ade4a3f38d3eec9534c2f12a1e863f77ec26f5cf539f0e6aec3cd6e434e3cc65e74e5c05956a357159a317208433c16959f5f3
-EBUILD irtrans-irclient-6.01.05.ebuild 1647 BLAKE2B 15d5c9cd56c80697b178798212130e406ca19dcdf3e81c4251b885cffcff37eabe2295390997a916a5d663830bc100d242a57f05597d0cf970600340f7337c00 SHA512 a454497e39e36731065ec6d4d2b78fedfbae575357fefedcd21439267964bc2ae483048c80e59c7e7663e7510a9fd8e70e9ad857ee2525fa2d31212656efb447
 MISC metadata.xml 460 BLAKE2B 8911eaf34bbdd8c9978c5d89582d1f0765ade9101da2102b02ab55f2f2c93384198c2fe79fcddb3ae8319bb32d0c8c973e69297a7830d7afafc454a7600dc145 SHA512 6067b6d98528ce0e9b0811ae31d949362173c43471d935197d2da5eeee5b4391cbd43b1bfbed8468c187d71c341f1eee247df0bfd3faf963104a67223501f75c
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
deleted file mode 100644
index dc6bd63ff3ff..000000000000
--- a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-RESTRICT="strip"
-
-DESCRIPTION="IRTrans Server"
-HOMEPAGE="http://www.irtrans.de"
-SRC_URI="http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-src-${PV}.tar.gz
-	http://ftp.disconnected-by-peer.at/irtrans/${PN}-5.11.04-ip_assign-1.patch.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${RDEPND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${WORKDIR}/${PN}"-5.11.04-ip_assign-1.patch
-}
-
-src_compile() {
-
-	append-flags -DLINUX
-
-	# Set sane defaults (arm target has no -D flags added)
-	irbuild=irclient_arm
-	irclient=irclient
-	ipbuild=ip_assign_arm
-	ip_assign=ip_assign
-
-	# change variable by need
-	if use x86 ; then
-		irbuild=irclient
-		ipbuild=ip_assign
-	elif use amd64 ; then
-		irbuild=irclient64
-		irclient=irclient64
-		ipbuild=ip_assign64
-		ip_assign=ip_assign64
-	fi
-
-	# Some output for bugreport
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "Build client Target=\"${irbuild}\""
-	einfo "Build client Binary=\"${irclient}\""
-	einfo "Build ip_assign Target=\"${ipbuild}\""
-	einfo "Build ip_assign Binary=\"${ip_assign}\""
-
-	# Build
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${irbuild}" || die "emake irclient failed"
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" "${ipbuild}" || die "emake ip_assign failed"
-}
-
-src_install() {
-
-	newbin "${WORKDIR}/${irclient}" irclient
-	newbin "${WORKDIR}/${ip_assign}" ip_assign
-}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 627742fba480..9bf36cda9f21 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -5,7 +5,7 @@ DIST tmux-2.8.tar.gz 637609 BLAKE2B d95fbdbc79c2c512908f82778816aa8540bf2fe26509
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
 EBUILD tmux-2.6.ebuild 2140 BLAKE2B eaf576a0984fee2d9ef0eee0d823d28e5e4949e5a80003e539cb936e74fe1acf07ed883b71936dc3fd3c681806e766108a20cc574eb36a165f9abe584df2bd2c SHA512 cc02589f7cba6668bfe99193e910e4816cb9ef5e0adf6660bd6d4d2a281e3821e2ed383c50c905a95f97ec3c10d9b0c22a4f1fd552d05d7e869731deefc985ca
-EBUILD tmux-2.7.ebuild 2147 BLAKE2B 9cec5002c19ec5774c6cc14d83879b210e466f3d6ed0870cbae27d168ec91b60d681a1937347427eb32d44ac84663362a4ef2e3701a1e77443423ce6a7dc2e1b SHA512 0d8e0e837e06df8646b17c889b31e2479c6d74f0c81c144eff344cc66f557e6292a74764e8ad0124fc82970aff27b67ee54c3c751b554cf40dc7da51f02fd7d6
+EBUILD tmux-2.7.ebuild 2141 BLAKE2B 52286b25466be1d8108ef3370ba50c3628447cc8aa10756bb0ac10ba56a5b64d933b14b2fc246a6d207b8293ca3885461dbd97ac6431a919037817be71269295 SHA512 4a8dacdf74989e9fadb1dd159d938cd3b90b0ddca00ac102eea82fd267fc1e257491e62ccff4084141cb444b7f72863b6df18a530d721e83df7077d6169a43b5
 EBUILD tmux-2.8.ebuild 2117 BLAKE2B 3edfccc8b61961b65e7d866ae3797b437283e37c29b2da28d71ff7246a7146e01bd091ed4854a8df864ea242de3bea82eb2c52f0169ef16a2dabe3a744a7fd60 SHA512 8884a5ca026a5f84bffbc76f794a8460e31f50997790ef4cf7f6cd306d1108ccf33d18fcc203a15428d57ba5bcdb4589d6a746bce64033ce2f1e64b929a2e730
 EBUILD tmux-9999.ebuild 2350 BLAKE2B a2fea8d287803a5779740ce34ed42ecf8f889f9b10020921aaf1e48d2fb65b12a43773caf04c088b5ac963d5b5f879746c789d4d24a839a1fcc040b370e109b4 SHA512 db22402a7bfa146ea6f4553f7f8d1291456466aa1c2938a747671fbd8123a7ab8cfba9a5ed4405d2c8faefdac93307e99ea55ddf3c5e60f0d5667603fe7d26f4
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.7.ebuild b/app-misc/tmux/tmux-2.7.ebuild
index 82aab0c941d3..bfe4e67a390c 100644
--- a/app-misc/tmux/tmux-2.7.ebuild
+++ b/app-misc/tmux/tmux-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 LICENSE="ISC"
 SLOT="0"
-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"
+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"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index d7f2c4c19bbe..8d61f3a432b8 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,4 +1,4 @@
 AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
 DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
-EBUILD workrave-1.10.20.ebuild 2747 BLAKE2B cc96842b44fc276753dc4eef8ba6fc1d9cdf1e56e3c0173711eeead52b9883d6e92d4b17e8f273a9744242a0da36c47c710eca75f2dadfcfd70345118fdeb78c SHA512 d09af88807d0b98abcbba41d9943595ca947a217c3d17e106550c94e451e754c8b009dc0014a94134a607185e250879a7548fddd60aaf092ce0bd2ec98ce7202
+EBUILD workrave-1.10.20.ebuild 2765 BLAKE2B 6ec931d380d74aa444a0919cf87659e222735ba717256cec88523174071077e0f3e51cd042a7e59365a1e24bd1b31df048417f631d90cfe32097e0bcb80b0856 SHA512 d60084718539d24e71d705ce0fbad9eee7eb3355b694b670b2ebdefa42db06336b88fb3ee84821c8bf1899fcaa716ce86b549f6e7849d2e5ed13333a3455ec22
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index 84cbc53fece7..3b1fa627e946 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,6 +53,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	dev-python/cheetah
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40.0
 	sys-devel/autoconf-archive
 	x11-base/xorg-proto