gentoo resync : 03.02.2018

8 files changed, 26 insertions, 24 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 93938a3be99e..70b4885c18f9 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 8df24387fba3..436c77cd3069 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -11,11 +11,11 @@ AUX elasticsearch.service.2 1617 BLAKE2B d2b62c9dfa0e2bb6159ce8a06f0d7bc45fc4906
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-1.7.6.tar.gz 28488767 BLAKE2B 0dc4fb10355e2139ee3a7e7e65366e8aa533b9714bf0f00d2bd8f4ef0669ba9f8f10dc5255c8c7a62abc0362e08ab5fda3c8b6b6f2bacfe5cce7255973293162 SHA512 2746f09b66919912e785c8d25c50ae74dbb38a41d99d9c926550786f9c2d7953d1ae1a54a32dae59a7269e5fbfa74dfbc91c3d412e415efd01c391ef7d329ba7
-DIST elasticsearch-5.5.3.tar.gz 33486646 BLAKE2B 4f28d843b2daa73af1160436f9eedd20b9d91ee8d4454a210ad59c736c0ac0bd91384d972583d4de7e7dbc228b3e37546343da68545312333379298042ad8214 SHA512 013e238a3ccdb795b9472a6111ae804b770435776dfb703b379c34498591d3804e45fb27a7c473348917b4d9e6fde367184474680f1f72bbca129bf9644fb527
-DIST elasticsearch-5.6.5.tar.gz 33780822 BLAKE2B 0541e27d7d9d18ec308495ab1cfb65c8f8e79960ef5d110ef5194a4033301b858a676c8c4d61f246e01ebc5679280c3eafe628e22ccfd84de9129f7a4606a041 SHA512 c3f31f561631c3f8df53cb49ac9a86dff3bcaa9e3ea2ac67dd959900ec1ddf676d307c9d8319ac51062072e506994934c61395049f6a6eac67e377d53517103f
+DIST elasticsearch-5.6.6.tar.gz 33780290 BLAKE2B ce4014b8eb74098990d97d7d87a0bd88df06f6719772f310c97cc33e740f44e84ebf74750c1f81b77c713c661a0e2e9ca826b6ab91b3625023fb9a061005d8ef SHA512 582fc3c2d1dcd5c208c229307ce387015ef8b25d9974fcac9ad4b8b3bc1c983a27daa171f0f242d367cc0776c545a82c5a4c07f6340104e739d83831e0d2210c
 DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
+DIST elasticsearch-6.1.2.tar.gz 28455845 BLAKE2B 36215cf3131c8ac24e9b974d6c12892679e1896242119bf88182a229286a8391fc9575b068c6e692b9931022df299920fdc5dbf8f04651bd4bcfd544c1b65b2e SHA512 c72e69700b60faf3b1a542c2317b83189926738affb38033c4b8d7cc0a1b3c21c4f743f441fb10657d4684111746ebb18c9dba2f54845ea6e02e4fb8dc950e5a
 EBUILD elasticsearch-1.7.6.ebuild 1731 BLAKE2B f9f95530464bbb1fe79a3f4ffd0c9421caa4eab078ab3fa1743e7ecaeb7004bcba414fa4d4509ae12b37d8f83f4c96dc0c5d5c179acccaf8c20b15d5b534bbe8 SHA512 8012b00b8e90fb84ed7d75a9fb22ded1a7ca6a0ef820746fc2258fbdc576b73d0cb97d037c8ca5fa08408fc119d9801b73aff6b4785e257d8e4fb658cb5cc730
-EBUILD elasticsearch-5.5.3.ebuild 1618 BLAKE2B ce21557cb37e492f54d68284cd4b95c68e8560f3e62ae1c8287bcb4b2c622df7cd14709ff020138be4013cbb5279c25d60de6ee0698d0c48b3c364e5e06193aa SHA512 0018a5cecab2293bfe43581fcc67bd395e669ed2913a1e40676de420763415ab090589a742b127730ca6b8a467f06f10f3f3d1c2bec87db479909cb1a668f62f
-EBUILD elasticsearch-5.6.5.ebuild 1688 BLAKE2B fb88862c69873ae7d27784d54306534bcef0d8e02f87024ac87f22e89bdf9310b655ecd5fdaf6ccac71bd1a52445f2d139963dad1ab426c6dff645050230d2e8 SHA512 9a577ae695f21d63fd537a26837987e7c4c6525e937bc4219635890e9daac31f332adf02968a3e94e4be768c51a830726196b97f0006b49ba3b385a65e5c854d
+EBUILD elasticsearch-5.6.6.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
 EBUILD elasticsearch-6.0.1.ebuild 1690 BLAKE2B 218d513c3bd36d299c362a08541eafb54b3fa20ee41ff117698f221d97e49afe1658705cf091bbef9d92131c0eacf4ebc151e337a1d0d8b9746dcd7e4c25dda3 SHA512 6b4b2fef48924f189089aab2063d7b387135600138889f0d8ce18e236ab9c7aa2cb954ee78e64e7537e8e0ea7de4054903d48f27f4008f4cfb0f7ab1241dcc4b
+EBUILD elasticsearch-6.1.2.ebuild 1691 BLAKE2B 9af52980118337037e21756934db517977a8c9517f52938a83467328d17e67e889eccc4dfe33e14ac22218cb385bd39d3f0caa942c573247dae32d569a35f7b2 SHA512 bd2f35d796476a56fa3e183136b0b3cf556ca73b19243002a392c70da951018526c3c563804b558d4057ec23af497dd0b49afae160f7ac892cbdefdc91db4464
 MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.5.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.6.ebuild
index cd91e97f3079..26cfa98675c0 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.5.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,9 +20,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-
 	default
+
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
 }
 
 src_install() {
@@ -30,11 +30,11 @@ src_install() {
 	keepdir /etc/${PN}/scripts
 
 	insinto /etc/${PN}
-	doins config/*
+	doins -r config/.
 	rm -rv config || die
 
 	insinto /usr/share/${PN}
-	doins -r ./*
+	doins -r .
 
 	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
diff --git a/app-misc/elasticsearch/elasticsearch-5.5.3.ebuild b/app-misc/elasticsearch/elasticsearch-6.1.2.ebuild
index b2ac22fbd6cd..4a1d5418c70c 100644
--- a/app-misc/elasticsearch/elasticsearch-5.5.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,9 +20,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-
 	default
+
+	rm -v bin/*.{bat,exe} LICENSE.txt || die
 }
 
 src_install() {
@@ -30,11 +30,11 @@ src_install() {
 	keepdir /etc/${PN}/scripts
 
 	insinto /etc/${PN}
-	doins config/*
+	doins -r config/.
 	rm -rv config || die
 
 	insinto /usr/share/${PN}
-	doins -r ./*
+	doins -r .
 
 	exeinto /usr/share/${PN}/bin
 	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
@@ -42,16 +42,18 @@ src_install() {
 	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
 
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" "${PN}.conf"
-
 	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" "${PN}.conf"
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
 
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	newconfd "${FILESDIR}/${PN}.conf" "${PN}"
-	systemd_newunit "${FILESDIR}"/${PN}.service "${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
 }
 
 pkg_postinst() {
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index cab78010e08a..22f14d444fff 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -4,6 +4,6 @@ AUX jail-1.9-multiuser-rsa.patch 856 BLAKE2B 4974cf19df37b5a9f5c75fdb31c65e3556a
 AUX jail-1.9-wrongshell.patch 330 BLAKE2B 5d707238febc3fa77daabdd39f74644873fbd7971d8e609b2112fe5b319dbd133bd6f75e291c92cb683f6552b06605249232f675f2217b5d42564d13b78e8a8d SHA512 ee92dbfb9e147d94d2ebfaaf597ad381d93bd1e5fc65e85a20ee37c9066dbe7560a3385977cd3d30b87f5cdb2d90c19827a7adac69f667ea61a4920ec0b02cbd
 AUX jail-2.0-sysmacros.patch 418 BLAKE2B d3c5b77e8b474b9822225e913e181dc754a2b54a273fb82da6589ae54221a703f216e583207a75e3ebe5aaf0a9121d1833fd60bf1639e2d14736ad1ac40df6f0 SHA512 26da017e6c1852938799ca5a1b768dde881a29b2160a57b69a741250717c408901b95c253c0e29c8b81e94bfa303cf42cf9edb9cfd7c43166035bf846ed89f1e
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r1.ebuild 1992 BLAKE2B 4bae96840d998f734badf0863b45147700ada371407a0979fcfec83b0e914cf09095b74e5aff97b6f421af2cbba7077dd4b13474872dd5b9e23bfa107dcbc9e9 SHA512 1deb6fcf897c252d64a1eb66bbb4ec6ad2c5b075c5500dbcd72c907b9e420dcbec982d95b8ab55170264be6f6c0bace364487552f3373e0e1786c138d5ecde02
+EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f
 EBUILD jail-2.0.ebuild 1940 BLAKE2B 6a8220fc07cd18556f0145bdb4af069ba4749dcb886e4b0439d9d05bba8c13a439338e6cd3b89b93ff6804300af2d59267af73c03cbf103631ecf44bfd12a42b SHA512 a8df73039d7c93d4952c9c010f465131e91f15dd4cc2a806a3d90a9a4896d744d40ce50dbd36e651646846bff3e2d93c0537748d1ac8351dd0e93f9f9e683555
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild
index c2955ebc11e5..60664a83e8e8 100644
--- a/app-misc/jail/jail-2.0-r1.ebuild
+++ b/app-misc/jail/jail-2.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 1e8e02018f98..4e433fef2fe8 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -9,7 +9,7 @@ DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3
 EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c2009e149136ecda8b03cd1d9433ea8dcd1a3194e61e5380c81b905072f7c3e1688920e4dc57ceb3c270d41f SHA512 906e1842f664cff03939a0fed27aaa447abf92553916bedcdbe7c23aa65f704c2538ca5be666086dbe2ce3204bbdfc87854346f3894293ccef8ef5d8a2ae6e7f
 EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
 EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
-EBUILD mc-4.8.20-r1.ebuild 2484 BLAKE2B c21567591935cf0c88af5956661a8b5c7b47d053459b0c73b4927271319bd8cd48a7584c809d09088a6e6d29a4cfa35a4867f2239bfaf3584e753fb7b52e9952 SHA512 1e689261679bde58dce2e4818fb1ff3b413e9d952474d4fa36662c4900deb0526e13abed14979d558db98181471db3a982815215603d1f633ef8b04c650f6f84
+EBUILD mc-4.8.20-r1.ebuild 2483 BLAKE2B 60f7938ee946a42775c9e0f6df69d49cde1db7bf388e69251a9cb8b97cf861c1855689892f05d57bde9e9b2a69911704713ea35dd88c08be2813812710b6d16b SHA512 c99861a541227ac63a96603564e8bb26489bf4b4cde94d6a1264a53015c578c8a749972d05da30819827730aa6a4790e8303b3df8cfc448d7a4912e28f917d61
 EBUILD mc-4.8.20-r2.ebuild 2616 BLAKE2B 47f90ba86acc15004703a6c56839bc5127ec773c37cca21994cfccf8940eefdd4cedfc936b1b090af8dbb3514beb51fa3b2b2ad3d61582367d9538746836f8de SHA512 f74f0f000974f99e2afb21a50732c437fbe19414d8f824ab8aa09fac763834023555f66901e307f8f89f3da9056b7d990c374be20a5d48a0605e61282dc78f23
 EBUILD mc-9999.ebuild 2710 BLAKE2B acbcdaf95260df5b4f34ac03e19b2b674f65d3c95083e79eaf916cd62f99ea0d9008c94bb2c0e030bcd8face202c00a646eca1521461058ae009da1f17a4499e SHA512 0388200a8134818d797d79849bc618a222377c33fb1802dcbf2fdafcbc22d85888171fee546ff5a484aeb4d97074afa1fea23ea5ee2078182bf72277658b65bb
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
index aca26bd2379f..b7eaa5b7c241 100644
--- a/app-misc/mc/mc-4.8.20-r1.ebuild
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
 
 REQUIRED_USE="spell? ( edit )"