gentoo resync : 30.06.2018

10 files changed, 10 insertions, 156 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 531ef61bfdf7..799f0e20f84e 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git-cola/Manifest b/dev-vcs/git-cola/Manifest
index 2f1681bab38d..0d4967208572 100644
--- a/dev-vcs/git-cola/Manifest
+++ b/dev-vcs/git-cola/Manifest
@@ -2,5 +2,5 @@ AUX README.gentoo 227 BLAKE2B 828266fe46d9eb866250b57921df446055c7835cce3c3d1701
 AUX git-cola-2.10-disable-live-tests.patch 827 BLAKE2B f7778c373b4e7b2c09daeeeab5c15c09870a70f8d490d2bd16d2e1b62f0c96c4bec6517cc99fa8d0a65daeb1551993d4e367f39f60099afdf31597847762ee39 SHA512 86f7410ce711db2dc19d4348047285dbd1a3c078512d13b589ef898dfd870a4f459371319965c697d8654dd4550a358e67e5d6b74c0317820422c3e98b7084a9
 AUX index.html 355 BLAKE2B 24c532f3882744fe3be55fbef8eb35410849124baeffc56659fa6200140ec7059bfee2323443a5ea62481b6b4c43b6fcc1e116acf8f67082ade03b2a8a23aed1 SHA512 a3e66bb220ae05c2f49a75ce413c5aeefb9ced26f7e8b2175b32ade83663153fab94f8601b1d0182d1eeb907edc6c1bef3ad96d84b1e6c00ca4d5a816be79bac
 DIST git-cola-2.11.tar.gz 1179769 BLAKE2B db2926b8137b2bb11cc9698b37156d8b0c8f72068061d7d1598b2e3237e44764c2914923103aaaa704babe26cf7a7c16bbe28a61770d98954f776b8ce955658a SHA512 99b865d7a49dcb041e54811141d242386642b5ed6fc12fa7a03431eb9b905cb88d88c4892dc432dd59e8ae3c85f20cc40f4bfb9b6ff002f4e5a4cfc0bdc4c72c
-EBUILD git-cola-2.11.ebuild 2450 BLAKE2B 7ef4f1959c5fad542c08d80e69a6370666520feb5669c12d0aaf585c7ab6c293673d967d7fa594f53f6b4107f960648124b04db60cca60220b311dab40ee6c44 SHA512 4f591549029883a04e5a706fa77254526e8de1ae58c7a6614d3eb1a948dff79dbfe7a6a243d86ddef9c05deffd99a52c78db84559073aa578a688a884608aafd
+EBUILD git-cola-2.11.ebuild 2446 BLAKE2B 47be464f83286b7f1c341b762abaf7fb05e787fb178dc2b0f565dbb77294a3c564adf1159e1276d05ee99ee0933ca386792828215b5531bb0e4144d053a770e0 SHA512 b73a4b57ec6e843ff2ea2e0cc5a86020653fbc097259fc3058f6c809f6c6986d4b4a77eb97e90de4206c9ae2c53c30b4c3a3198e99c87ab23ada5dfaadb7910a
 MISC metadata.xml 342 BLAKE2B 3c25a34b0009e31ea7a125733b8105d40be8d818106b7051d6b4180a8f4c39e16ce46eada9acef2cb5424d3fdc36965bdddb3f048c07b6920593a57d6ffff001 SHA512 9ef75fe8465b602db4d9645535f9ce228af6afffac7309c5f3e7dbe266fe5c89a08e96bc53c2fb4a364a8c3ec6c3d87579eb076d6ba005499f0f4f07316caecb
diff --git a/dev-vcs/git-cola/git-cola-2.11.ebuild b/dev-vcs/git-cola/git-cola-2.11.ebuild
index 78f74ae2c038..2eb369d1340a 100644
--- a/dev-vcs/git-cola/git-cola-2.11.ebuild
+++ b/dev-vcs/git-cola/git-cola-2.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_SINGLE_IMPL=true
 
 inherit distutils-r1 readme.gentoo-r1 virtualx
diff --git a/dev-vcs/git-lfs/Manifest b/dev-vcs/git-lfs/Manifest
index 7d85b34aae40..f486e93c7ac1 100644
--- a/dev-vcs/git-lfs/Manifest
+++ b/dev-vcs/git-lfs/Manifest
@@ -1,10 +1,4 @@
-DIST git-lfs-1.5.6.tar.gz 604139 BLAKE2B a87c3054a5ff354409581f3153b8291646c7a403a5b80f0d7e7c6efd393e93ba728689033b79030ade207c371e5726f4e7920f6ce0016b66e618109c7d8aa9e5 SHA512 f5f2da9ac44647335b25cad3104027cf5476e25ef9763019744123f9e1ef81edadbf5b08a146b8070487b32a18aa202c799f910aee6f2f0144ca411ad6d7cfd2
-DIST git-lfs-2.1.1.tar.gz 649611 BLAKE2B 6a2a499ac446cfbf04977ff56ba0c33ac49f4cfd8d269a4e16e9d15ef7010752fcdc439e09625b76c814ba1b3c3bc086c333ad44ff87da8288da86a31c19cf17 SHA512 9061cb9fdf93a0c119d5762ceebdbc0573491dedb1815512e7eae9da54574087c1e499ea97ba0a87d7356499314beb53d60d1800b5c85983ef835dae37e7dd84
-DIST git-lfs-2.2.1.tar.gz 708806 BLAKE2B f5527c45a9b2415b9c17be8bf8ff04ea1d324cef74fe72ff9c91b5831d3b866d6dd57ab047addc762a4ad84d8f92e1a8dd5a2c21a532c4dffe2f7b3675463217 SHA512 8e1edd588916e6a09c0fe84bdcd80b8773f3874554f941c65819bbb29cdce4846de6408dbb34b33e420d9bc768f6cd07c2dbb0979d243c98f25a32d4fc69dea4
-DIST git-lfs-2.3.4.tar.gz 747313 BLAKE2B c1b2d452894c07974f9857116cab4f2aad547584b6d713824103b2e7f82c8179146a080330ee1154369c22843766a63a09ce1f990c968b55dce9eccc7a306302 SHA512 97174dc9346979777c3951baa86cfc07c85e2df04f13a50114e016facbb3fd5fde08d38825493d4e7ff149a13c87ae44e9e40350cd4950f27fe309ef62b6724a
-EBUILD git-lfs-1.5.6.ebuild 968 BLAKE2B 8064abf9f67f61e1018c5251eb929d39cdb634f9ad35c43d54d4380d5bdf3ec0afbb5f601d942e2a910a6aa9a67f3b5ef36d04f878470738c5b4e621eb498d1f SHA512 030eab94da2e9522b2359261f9b0091c2440672a58ecfb2c67df5aa14cb1c853c6b056702a5594e3a18061e3f9bbfb27b27bb45a0a9d749c57bd943514a0ecf4
-EBUILD git-lfs-2.1.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
-EBUILD git-lfs-2.2.1.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
-EBUILD git-lfs-2.3.4.ebuild 1153 BLAKE2B 73e72eb7d312d717f3b6a91582acea976744afb8c204926485aa421f8a6d2133a068040d2b11c627e478d2667de599bd8fae984dcaf6c48600c6ab4628153195 SHA512 6d3616d85a7bc7457bfd0ee4499366273cf8b60e029b134da7201f2f087fa3945d81ef9b10f7577d7b9db653179a431fc3115f011fbb829cc86d131b014ac56a
+DIST git-lfs-2.4.2.tar.gz 791443 BLAKE2B 6c613ad5b644f609b36a6a5c569c3512713d0f5fc925be759b20a01ca0e57573246557e887e086b52c5703db9db4d8a49fe91761efec48410738724256cac9e9 SHA512 c89a15c36b9d52091eb6e89f8e1db23b03f35333794467432ee49728ba83fc5d25d238f5df49bf736a4a3079778d70a527db01c2299ecd96a7b5f70059616967
+EBUILD git-lfs-2.4.2.ebuild 969 BLAKE2B 4e7349b225cdae63ab30312a30a8c58deec1d89cc238dfecf505986ce1f798607b3fb63dd1b5ad22dc74bc8428d51e0532580cdf6b37628afa730e7b104445f3 SHA512 73e9130ecf33dc94f5067353d183306643167897f5ff450185d057ca8b7089cec2bd173b08e97042df2483b500136654d1f62275d7242b25857bd4ad7f5f2584
 EBUILD git-lfs-9999.ebuild 1153 BLAKE2B 6c67ac1d61b9be2021bea634c5a2a7d4f50b3044d1ddf1ebdcdb21580bc723d5fe8890b098dcb12f5719d415be4fb187ca51414ab2efdbeb54bee72828b2d276 SHA512 317104891a95804da6b28e29b0930aad843597d1d9996518a18e7c71290753ac86405364426693adefc2f103a7b393a97e7d79589dfa05e58a8ed5d6a32a61b1
 MISC metadata.xml 331 BLAKE2B ec49bde06277ccbdacd3b6c50e0e32c5b14464ad015e1a7a57446e905d0ed9b3b0b71650a455a3b77c5e0ac2530874f37327b1fef3c924577b08c1e1c815c201 SHA512 51f68466f5396fe0326aab5f3a5fa70761647d722d02339fd6072d21976dfd27fdafa1ee44680be98dd0c1b80b29801eb7ed1508aa850104bed564c5f1a38011
diff --git a/dev-vcs/git-lfs/git-lfs-2.1.1.ebuild b/dev-vcs/git-lfs/git-lfs-2.1.1.ebuild
deleted file mode 100644
index 7a32ca36cc92..000000000000
--- a/dev-vcs/git-lfs/git-lfs-2.1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/git-lfs/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="command line extension and specification for managing large files with Git"
-HOMEPAGE="https://git-lfs.github.com/"
-
-LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0"
-SLOT="0"
-IUSE="+doc"
-
-# since version 2.0.2 git-lfs uses time.Until that was introduced in golang >=1.8
-# https://github.com/golang/go/commit/67ea710792eabdae1182e2bf4845f512136cccce
-DEPEND=">=dev-lang/go-1.8.1:=
-	doc? ( app-text/ronn )"
-
-RDEPEND="dev-vcs/git"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	# can't use golang-build_src_compile for go generate
-	# and others steps executed by build.go
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-	go run script/*.go -cmd build || die "build failed"
-
-	if use doc; then
-		ronn docs/man/*.ronn || die "man building failed"
-	fi
-}
-
-src_install() {
-	dobin bin/git-lfs
-
-	use doc && doman docs/man/*.1
-}
diff --git a/dev-vcs/git-lfs/git-lfs-2.2.1.ebuild b/dev-vcs/git-lfs/git-lfs-2.2.1.ebuild
deleted file mode 100644
index 7a32ca36cc92..000000000000
--- a/dev-vcs/git-lfs/git-lfs-2.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/git-lfs/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="command line extension and specification for managing large files with Git"
-HOMEPAGE="https://git-lfs.github.com/"
-
-LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0"
-SLOT="0"
-IUSE="+doc"
-
-# since version 2.0.2 git-lfs uses time.Until that was introduced in golang >=1.8
-# https://github.com/golang/go/commit/67ea710792eabdae1182e2bf4845f512136cccce
-DEPEND=">=dev-lang/go-1.8.1:=
-	doc? ( app-text/ronn )"
-
-RDEPEND="dev-vcs/git"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	# can't use golang-build_src_compile for go generate
-	# and others steps executed by build.go
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-	go run script/*.go -cmd build || die "build failed"
-
-	if use doc; then
-		ronn docs/man/*.ronn || die "man building failed"
-	fi
-}
-
-src_install() {
-	dobin bin/git-lfs
-
-	use doc && doman docs/man/*.1
-}
diff --git a/dev-vcs/git-lfs/git-lfs-2.3.4.ebuild b/dev-vcs/git-lfs/git-lfs-2.3.4.ebuild
deleted file mode 100644
index 91e0bbf77511..000000000000
--- a/dev-vcs/git-lfs/git-lfs-2.3.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/git-lfs/${PN}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit golang-vcs
-else
-	SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	inherit golang-vcs-snapshot
-fi
-
-DESCRIPTION="command line extension and specification for managing large files with Git"
-HOMEPAGE="https://git-lfs.github.com/"
-
-LICENSE="MIT BSD BSD-2 BSD-4 Apache-2.0"
-SLOT="0"
-IUSE="+doc"
-
-# since version 2.0.2 git-lfs uses time.Until that was introduced in golang >=1.8
-# https://github.com/golang/go/commit/67ea710792eabdae1182e2bf4845f512136cccce
-DEPEND=">=dev-lang/go-1.8.1:=
-	doc? ( app-text/ronn )"
-
-RDEPEND="dev-vcs/git"
-
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-src_compile() {
-	# can't use golang-build_src_compile for go generate
-	# and others steps executed by build.go
-	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
-	go run script/*.go -cmd build || die "build failed"
-
-	if use doc; then
-		ronn docs/man/*.ronn || die "man building failed"
-	fi
-}
-
-src_install() {
-	dobin bin/git-lfs
-
-	use doc && doman docs/man/*.1
-}
diff --git a/dev-vcs/git-lfs/git-lfs-1.5.6.ebuild b/dev-vcs/git-lfs/git-lfs-2.4.2.ebuild
index 59acb2d839a7..a3aad04e586d 100644
--- a/dev-vcs/git-lfs/git-lfs-1.5.6.ebuild
+++ b/dev-vcs/git-lfs/git-lfs-2.4.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
@@ -21,6 +21,7 @@ SLOT="0"
 IUSE="+doc"
 
 DEPEND="doc? ( app-text/ronn )"
+
 RDEPEND="dev-vcs/git"
 
 S="${WORKDIR}/${P}/src/${EGO_PN}"
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index 5de6ffff0af7..9614ef40f788 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,6 +1,6 @@
 DIST hgsubversion-1.8.5.tar.gz 179639 BLAKE2B 3fa5dd690e404837ccca7efeef7d873c579f717aaad274bed594aef751338450b347d8e82d3a139d00206e12a6c3979d18355be6c2c3a7ae23d01f51c3be09e8 SHA512 1d3f0824c3b83a2e00485ef3f412767bdb378a5a545f2fcf533eafebb20cbd40becf54cf9a29705200d221d6d6c0eb284fae0692354b1795feb391de2a02ca0c
 DIST hgsubversion-1.8.6.tar.gz 180720 BLAKE2B fc3cb8b3b4298a11eab4e7374615b80c7653449efd39f7ac48663a211988654bf173dce7016d8c40efbb60d55ed8884680a2139461fea1537c459cdcd807c176 SHA512 8431e995a9f2c150936af004527fea6d562a34c653af6d51e69afdb10397528bbe7f230d92b18c3d04e2315c7b0078ecfc1bd619be4c2540bb564d50092566c4
 EBUILD hgsubversion-1.8.5.ebuild 971 BLAKE2B 998c16b40e54cceb14093685f1d4bf19ff743ff686294cc206619735509c15e37d88306cd33317d4f8606bdf336d6ba02c6b5be050697e69c4d2bf387b91a803 SHA512 d6d0e5ca08ad8a16a6491be4eae2efa1a058d66716b7b5c9cc04f0a91df91c0ca680ce29a63262c7cf7bcce5fef984246f836e0f7874c25f29c411d22a0fcd52
-EBUILD hgsubversion-1.8.6.ebuild 973 BLAKE2B e87a9b35165449197ddcb202e847ef00bbe93bf37c89e977ead5ee16ab5b4296d5b77115743fd29906f7ef5cc6efb05189cf88fd710a3d24055b1acf600f80f7 SHA512 1a5d27f78ffa5ad95a9bbfe953ececa4f576fd23a959a7b3aa8f50e010cf794805b74a91dda272084b9e7aeeda6f3125f1345868d105d995cf3054ab0746008d
+EBUILD hgsubversion-1.8.6.ebuild 971 BLAKE2B 6b2f602f4a6972fada4acadb04488edc2bfaa3951bb84d65a645a5dfcebfd3baf4931bcea716657b1c3c2691872832aed8827b8906d8c0b13dd525b1073503ef SHA512 1c3dcd2b6f6ea852a0b3ed4ff81f1968551a355270809c139522b90b16e9bd93877b9cd70fd4501399af90155f607f3403e3b44f76e4738b3148adc357416351
 EBUILD hgsubversion-9999.ebuild 747 BLAKE2B cea962df0ed0feaa4ae4515df5d44215223f65ae1f679656fe36a49ebb0470f0d3965343c33828d0a9caddde2036c414df2344b9f1c2c4e8a8d0e4fbb96e9fa4 SHA512 cacbb889c5853dc8a9aa17905bd58f5c339bfff94f75f97b9d2d6a90d82f308fd184e95eafaa3fda9cfc822a746d5b3194ee4374e9cc88a054d8fc3645d387f1
 MISC metadata.xml 305 BLAKE2B ae280ffce2435476e46877db066a5967861112aef4cbde989981b8d01919e32706a758691ba0f085015eb681c2a55b2a601313bd9d9d9319497037e689d55bb8 SHA512 a5d7eb8c02ff08bf50591a24a4b0b76a76e799fe5903a27c8a648e1ab839f28135f6f16eac2ba557006936dabadfb08543c203fe0fcb3ff8f89f62e63fdb300f
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
index 8f32560f359f..e4bc74e2fc34 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="test"
 
 # although any ref absent in the source, tests fail badly with >=mercurial-2.8.1