gentoo resync : 24.12.2018

6 files changed, 18 insertions, 164 deletions

diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index fdf1858cb3a8..445d82e68f28 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,11 +1,9 @@
 AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2bb2d19b5a588d566522e4829896c0f3862fd396d23f731da186e7a9ad369af00a0dbcb7c8b2e3cfbbeb SHA512 180c3390001a6bb49deef4f459d42fd7141a5cf68a7077cfe3b5b1384f7b40911f9e4d871ffce07f51b347deb2c2568c266c5a5d1d113010090cd4f65eebeb6e
-DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
 DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-EBUILD ninja-1.7.2.ebuild 2667 BLAKE2B c0bceb36d03edc78a846331ff9923d2ed6243b807db4a6af66892e25744cf2b09ae3479263b1b71891901a4a82500838600e0f9f72d6a6f6b02a276709d76303 SHA512 579c59e32df4104703b3bc703af7fa44fc8f800c874d2b817dcba646ecc461be5d94576efd6e2979f21e5778e5b2112c75963cf879b7f37180cee0613f1cf224
-EBUILD ninja-1.8.2-r1.ebuild 2776 BLAKE2B 439148c196cb3c673b7bbff703de4174d672f462e1f0b7de46c71efbed40554a7e4cb868352a4c2d6fe033b7a916d4978deda47eba3551faf45460996e4798a3 SHA512 3a63f2600977a2a71939f9163c0d54ffc202510d124239aad2642894febae848648aa96d7de0845406b30a3b9c07e2d73ca7dae32317a0d7379bb3e6c1a78580
-EBUILD ninja-1.8.2-r2.ebuild 2776 BLAKE2B 7ddde720c230e5c04a6f1c054cc98d406f4169935fbdd25beb417ecee2000cae3684b6b6fac47ca05411d54dc76d254b6210a1d178bb7faa05e4bae7485a8e6c SHA512 4422d2fcac6143f37d5ef66da08d22c3b345fa727a36cb832b00116ce3a91490a50bcd29191b12085b1c6fa9711505e9c408d9073b30ba86974b4eba3baaf038
-EBUILD ninja-1.8.2.ebuild 2636 BLAKE2B acfea7108a4a6f83b80f67cd6508a38752fa3e482e78eb248aeb20fb0a7c60bae82baea3357d44a2bfe70c1e6c417289ffc477e274394e70fd9274868b637e30 SHA512 9e132040a4d3c39371c38e7533ec4d4718f013b2894f38162b80038284df72bcc8719571d5403311844736fd521dd38d943880fbf9760ab8d1ac1e3a514c0923
-EBUILD ninja-9999.ebuild 2647 BLAKE2B 578d7226bb914c14ee269d249cfd72432f55190c7f31c260182c0fbafd408d5df2f639a24f84b75e3527747945412597b3d675c7191e7085519dd90461c09ff6 SHA512 9e11adf000ea2d8adca7387117a280d803b43cded0437a2056bba1ff61b8aae2580164f2cbe85d391eee1a8acf8ab697a70d888aa5435d586695d1c60f9439fd
+EBUILD ninja-1.8.2-r1.ebuild 2690 BLAKE2B e38c119b8a865e6e367999600ab69f996e782f0b3e7d21f286944c1c7ab235a9e843b046cfe1696131516e22442e61f35ea37299d5bcb6e750b0b316f5c9c643 SHA512 48177691154c54526ef986a43a2527c2c008f272dca54dbd39bc5b8c8a9b45f3c1b26a96240b0008a5f7336c9db6b3d0f7bbc972d1b1ddd7cd304197bc090f27
+EBUILD ninja-1.8.2-r2.ebuild 2690 BLAKE2B 2eb84e017da16e36b88908d6d8e418d8c624e5a70d92ca1bb39e3615098f1872b63f91d4bef9afac6f8e6b398e699897790d5b36bf1b7b0298f53740cbe0d698 SHA512 734a76d4b7e03d1a23af8785442f0fddfb04fb7073782b73ee5631ddbe931df0bb611fa0c2805db9ebc1d8db90f4ef997977e734825b8d00c5c3ffdcb499f78e
+EBUILD ninja-1.8.2.ebuild 2547 BLAKE2B 8234fa945a4908448d202f7fbea1415771fc810f93afc9a02c2696141e15f47c3f2035a434432d0c50494e6e852741b64dcce80ed56c463dd50e411ce4b50399 SHA512 42811e0c8e250c6eabe2bad9ad98c0d94ad81e42100763348f70da8b2e521ad7b3355d613bccfbb51512ba15fc1c204f86ddaac417dfa8e320fb3e5bd398ed65
+EBUILD ninja-9999.ebuild 2558 BLAKE2B 54b95fb5f5e12d9ed496f04eb9b83cd503554deb2917db3f0b1d1015fc8579f448f7a0512b1827d02bd48f669fbb81f44abb1ebc9433b32e6318ca7c34d7684e SHA512 3161b622c1a7147333954295fa99891245434aac5c0a4079cb0c329efa5c689a383739e0b78ae2142dcba7838e30f554850cb4808432995bdeddfbc4a78e2b17
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.7.2.ebuild b/dev-util/ninja/ninja-1.7.2.ebuild
deleted file mode 100644
index a314bc0103f1..000000000000
--- a/dev-util/ninja/ninja-1.7.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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 bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
-else
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-DESCRIPTION="A small build system similar to make"
-HOMEPAGE="https://ninja-build.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-IUSE="doc emacs test vim-syntax zsh-completion"
-
-DEPEND="
-	${PYTHON_DEPS}
-	dev-util/re2c
-	doc? (
-		app-text/asciidoc
-		app-doc/doxygen
-		dev-libs/libxslt
-	)
-	test? ( dev-cpp/gtest )
-"
-RDEPEND="
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-	zsh-completion? ( app-shells/zsh )
-	!<net-irc/ninja-1.5.9_pre14-r1" #436804
-
-PATCHES=(
-	"${FILESDIR}/${PN}-uclibc.patch"
-)
-
-run_for_build() {
-	if tc-is-cross-compiler; then
-		local -x AR=$(tc-getBUILD_AR)
-		local -x CXX=$(tc-getBUILD_CXX)
-		local -x CFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	"$@"
-}
-
-src_compile() {
-	tc-export AR CXX
-
-	# configure.py uses CFLAGS instead of CXXFLAGS
-	export CFLAGS=${CXXFLAGS}
-
-	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
-
-	if tc-is-cross-compiler; then
-		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
-		./ninja-build -v ninja || die
-	else
-		ln ninja ninja-build || die
-	fi
-
-	if use doc; then
-		./ninja-build -v doxygen manual || die
-	fi
-
-	if use emacs; then
-		elisp-compile misc/ninja-mode.el || die
-	fi
-}
-
-src_test() {
-	if ! tc-is-cross-compiler; then
-		# Bug 485772
-		ulimit -n 2048
-		./ninja-build -v ninja_test || die
-		./ninja_test || die
-	fi
-}
-
-src_install() {
-	dodoc README HACKING.md
-	if use doc; then
-		docinto html
-		dodoc -r doc/doxygen/html/.
-		dodoc doc/manual.html
-	fi
-	dobin ninja
-
-	newbashcomp misc/bash-completion "${PN}"
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
-
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
-
-	if use emacs; then
-		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index 84c7f67ce665..767546f3c055 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -44,7 +44,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -111,10 +110,8 @@ src_install() {
 		doins "${T}/${PN}.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 18d8f1000a72..bc97b85a2b45 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -44,7 +44,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -111,10 +110,8 @@ src_install() {
 		doins "${T}/${PN}.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index f25829f0ec1b..3f5366eac1e6 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.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
@@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -41,7 +41,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -108,10 +107,8 @@ src_install() {
 		doins "${T}/${PN}.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 38f251adba32..0f378c4dd3aa 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.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
@@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -41,7 +41,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -108,10 +107,8 @@ src_install() {
 		doins "${T}/ninja.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die