gentoo resync : 02.03.2018

9 files changed, 62 insertions, 36 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index e067568ea5fc..3684cedfd21e 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/gentoo-bashcomp/Manifest b/app-shells/gentoo-bashcomp/Manifest
index 5c00bdd198be..9431452ffbc9 100644
--- a/app-shells/gentoo-bashcomp/Manifest
+++ b/app-shells/gentoo-bashcomp/Manifest
@@ -4,5 +4,6 @@ DIST gentoo-bashcomp-20121024.tar.bz2 28025 BLAKE2B 470f844707d31e2eb6af8ad34695
 DIST gentoo-bashcomp-20140911.tar.bz2 30258 BLAKE2B c41814a51b74b169dc0e92e4af0630a152145f9d8fd81afb29c5c6e28d9c80caf3a57450a02a7f653762a0c91c8e1639f101e7749761b68e75482dad8e303467 SHA512 cacd1c3353bce7e67d00758a714829860111932ab7addd0a84a06cae9218ff18aff4ea562e0682ca4db859408ca15817edd81548d54144223ed5016667549f7f
 EBUILD gentoo-bashcomp-20101217-r1.ebuild 1399 BLAKE2B 064615d291b26ca3f4f518fe2487094dfaacd4513a34034409e26f15797a9bcaa40c0e7ae4abf90f9ea11171273373ccd617bf607dee09ea5f2c82cd3f6056b0 SHA512 709761ab0e2692487215fa4305fd2884e1c36a2d4c7e158e3d73c2cd0ca9ac4570050decb086bb839ea8d862efb8f4edb3e6a422aec2c00ddbd984961d7b3d02
 EBUILD gentoo-bashcomp-20121024.ebuild 1300 BLAKE2B 617ea1b48f83d546d95214a8ce981c6ed804a4e6d1f416392dc1adf0bba70662a1f146b7f328387bc45e6ee176b3446d8add78b96c4c70eeddff3c01ce586f3e SHA512 cfcda78650f8292ac0bcf68a3ec27c957ad5c70b2a62a4b9b5f0fe18ab1dad5c4035e84e1785abff8fa2fe82a48437a1ffc7adb45068e65d57d5e85270551916
+EBUILD gentoo-bashcomp-20140911-r1.ebuild 867 BLAKE2B 2aad70a398381b631162623f63b178ab0a73b07d9aa2689e45acdf3ed3fab6e06b974e20f76c9ee20a5ee3247b6adaf1dd412957d6719149fbe4232ca32ac6e0 SHA512 d3ad74a641ece757a9431aff9d541a7178d53e6b30f79a6325548412eba958e42eea178c413e6eb80d6cecf04fb864dd0ed5622e91b20bb5e602e162ae52341b
 EBUILD gentoo-bashcomp-20140911.ebuild 740 BLAKE2B d08ffed7d83ccb43ff04a21b9e7c72eb04fdebd946d065c9d4b46117c2e7d7110fdc56163f1f18826ab8d35946c8fe075a1b8684b36f05d9da488967e212dded SHA512 7e48b33205887c87bccd740a8d61c03feaa7185148dd659d28bdb543e01f190a0e95c80064fef323209cd9b2f0b2b097e315a155bebac0cf09d264fd69f366eb
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911-r1.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911-r1.ebuild
new file mode 100644
index 000000000000..0827601e2003
--- /dev/null
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+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 ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+src_prepare() {
+	# resolve openrc file collsions for bug 649144
+	rm completions/rc-{service,status,update} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install \
+		completionsdir="$(get_bashcompdir)" \
+		helpersdir="$(get_bashhelpersdir)" \
+		compatdir="${EPREFIX}/etc/bash_completion.d"
+}
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index f57536b65baa..2f7ca4ff9a2c 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1,6 +1,6 @@
-DIST gentoo-zsh-completions-20141115.tar.xz 19672 BLAKE2B 13a121686b051355d80f6c36ef6e9fbd3c691b92df439690f0556260ca9ea7529ce1b3a9254811b1d1c4e632e3cfef0da021bf8a34a559dd076f1ed2fc189a8d SHA512 23debde6227574285ba123ad312db535d40813de686ef4c89f1e4cd9acb3c1ab63f5094194a50e6d272ad9ce3fa1ec6ef0bf4cf93424e2ec7adcb4c74572e420
 DIST gentoo-zsh-completions-20150103.tar.gz 23759 BLAKE2B 9e48cad8b98df4de9479f06ab394e689f2169c6b52e062806b2051f18b86a6f80b660f472fe48b94bb0aff10095d7fcb9e097aa38710d6f3969cb03cfa4aff5c SHA512 4d87edda071d98672df79e3dbb9565757c0738bc50751d31e5dfefab4f17523387fb2342906ecc0600ce86d888ab4a785756bbb1daf37ca56a3ce1af9e5ae173
-EBUILD gentoo-zsh-completions-20141115.ebuild 832 BLAKE2B 54df648cd3c15acadbe05303b5cda16a8b689f3cc6abfba842e726d9801b8c4c660acd05822700df9123cfce765ed3408f9c66d4871ffa7f97b99a7be9358c02 SHA512 ce9723096846e12f835e9688cbd44f9cabe4672956844a561ec805f32093e8cbbe3b8739d3ad49e208fbdbaad9c4f0ca0cdfb2fd3de62fcb0111c553a8571ddd
+DIST gentoo-zsh-completions-20180228.tar.gz 23246 BLAKE2B a6e4004aa7592cbb097cad55fe9d7286f39bd264d8c463ed22e665ca6a60732b0bc8678a0ac09715e2f34abbadd0e4466d783fdb228ce364bcbe13fb7f097649 SHA512 2b3dcfb910e297eb2f03f4ad9f3749b379ceb60f8b6cbcb7c7d03b7921b79aa21f8d3aa50931c5d4eff52f988a208f1a810c6da7c20720be7a3f2ce4a4564788
 EBUILD gentoo-zsh-completions-20150103.ebuild 771 BLAKE2B c65368b319701900a3df63d3fc927b784776c07678bc040926d6e2629f4d2424028ed0485bac0963e4791ce65febe8043e59d96bc482e506bdf059ce6adebe28 SHA512 f9eb8af6a85e8d5a0ad67ad9c96c26cc9471e484bab7d88ea921a0d49e8d9fccf3edf47c8785a8ad356904808d3724bd37c121158ddce8d32df16a228122cf24
-EBUILD gentoo-zsh-completions-99999999.ebuild 771 BLAKE2B c65368b319701900a3df63d3fc927b784776c07678bc040926d6e2629f4d2424028ed0485bac0963e4791ce65febe8043e59d96bc482e506bdf059ce6adebe28 SHA512 f9eb8af6a85e8d5a0ad67ad9c96c26cc9471e484bab7d88ea921a0d49e8d9fccf3edf47c8785a8ad356904808d3724bd37c121158ddce8d32df16a228122cf24
+EBUILD gentoo-zsh-completions-20180228.ebuild 780 BLAKE2B 29e5e1a3f80ebf8863be26da8831e4681d7339eca2575196f41e1aad595d9beef708a8fbbc908db1e0479c53a8d0d0a45eb89bdea6a2730baec658562b161244 SHA512 a2b5768576f3e5b58568618fcf7a6aedef113095f7d2156bd927e4fc3ee28c1b41ed3d94114e2c2af64af832170c1d80043424fc8a7f36e8d77b049e77c57668
+EBUILD gentoo-zsh-completions-99999999.ebuild 771 BLAKE2B 7436e2dd771079cc966ec435d850a24086e82c9e33c22dd8a1b0f731ffe8c34701f2ab1718d2699fb1d97bf986901442ecf5bf380f7feba63531831fac9a338a SHA512 51c32e89ab85b75c7415c85dfa06670423a3e1944be0cce715fb416a238196faebc881220c275853a18d69153bf13607638ea127e15727df562e10106f104270
 MISC metadata.xml 350 BLAKE2B c8d3cbed9f1d2cc6511612f05448d7826ca031448c936a2ec18ad2bc8af628c3531a248c63cc2f46f0037c2b9305051df2b3d05808d5d7721c39560c0621bfd9 SHA512 06072032aaba8a33b43231772067bbadedc05abe289933b54108d30e6acd81fab23e621db91dd1269df46a171bb11c3903e8e942a7ce964c1229e44912702d59
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20141115.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20141115.ebuild
deleted file mode 100644
index 687f950f702e..000000000000
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20141115.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
-HOMEPAGE="https://github.com/radhermit/gentoo-zsh-completions"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.xz"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
-
-RDEPEND=">=app-shells/zsh-4.3.5"
-
-src_install() {
-	insinto /usr/share/zsh/site-functions
-	doins _*
-
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	elog
-	elog "If you happen to compile your functions, you may need to delete"
-	elog "~/.zcompdump{,.zwc} and recompile to make the new completions available"
-	elog "to your shell."
-	elog
-}
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
new file mode 100644
index 000000000000..3cc5d5efac76
--- /dev/null
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
@@ -0,0 +1,27 @@
+# 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/gentoo/gentoo-zsh-completions.git"
+else
+	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
+fi
+
+DESCRIPTION="Gentoo specific zsh completion support (includes emerge and ebuild commands)"
+HOMEPAGE="https://github.com/gentoo/gentoo-zsh-completions"
+
+LICENSE="ZSH"
+SLOT="0"
+
+RDEPEND=">=app-shells/zsh-4.3.5"
+
+src_install() {
+	insinto /usr/share/zsh/site-functions
+	doins src/_*
+
+	dodoc AUTHORS
+}
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
index cf137815c472..f25ef6864f7d 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-99999999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index ea4bb08b64fa..b373f3f9d1c9 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -3,5 +3,5 @@ AUX tcsh-6.20.00-debian-dircolors.patch 506 BLAKE2B 584808b9bd488c41a8b375d18b97
 AUX tcsh-6.20.00-use-ncurses-tinfo.patch 382 BLAKE2B 99d794389e3f65607887eae8df4d8af9f9361604f0d70e96a45f3a2b3ec648a6f04f335b2de8fb8b9b6c7441be6009ca38f9f8479ddd9e3e831c4cf0c0b48863 SHA512 d6e2346a0ed093651be7073b04cd31ec1bd587c52fc9a21295405699fed2a63d6ea8415e7c0d29e0f03732288b4a8749e14c9ee85c39a1b4f8e51cfa996166c3
 DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
-EBUILD tcsh-6.20.00.ebuild 2653 BLAKE2B 6f152f390c2b4d22ad1dd09cb8023cb35ad6d5dfea0db7f5e3260fcca3ffbc70229f89c99bb431a581e7daab7897b6627c617bff8eb813dcc0a56314355bf9eb SHA512 7eabfa6dc1bdbda05a7ef5acaa3734e34bba45e7aa7a74957d4c4fc98acd0c223aaefb4c50b242d51f2a768eb50167fb2deb5b7340a4f4d219f77522a38e75e5
+EBUILD tcsh-6.20.00.ebuild 2665 BLAKE2B 80e81d46a51ea4bdf3a3e1302199e4fc329b55dc4b4c19549ed01941b02b7043c1b90bdba0abfb458a207452f1aa6890a0b68e0f49f2fb43c4efddc1835771ef SHA512 ada4659b4e0be73592a3809ad5b0fd26aea90780476ccd9c458660020efb26c40da59d7c881d47980b35fe7628c031ae8f80484e96e73002f416a158332e50b2
 MISC metadata.xml 645 BLAKE2B 6a9d41c4ca043c899c0bfd8c5140958799c4eaf988f301551e8b8302995c81b0968981a2fda9247189965fc28887841eb30e1f3433262a58c843c0f890f857e5 SHA512 0f36e708c427083603b31df4bd4d808147333ff2711addff30936178e72b10f1020534046cb15ef1fecafee656c37d357ad3b5922320980ee15fddda11912f22
diff --git a/app-shells/tcsh/tcsh-6.20.00.ebuild b/app-shells/tcsh/tcsh-6.20.00.ebuild
index f78c18beaf4d..75baa9ba906e 100644
--- a/app-shells/tcsh/tcsh-6.20.00.ebuild
+++ b/app-shells/tcsh/tcsh-6.20.00.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
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls doc"
 RESTRICT="test"