gentoo resync : 30.04.2018

6 files changed, 2 insertions, 50 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 522e70f39452..2c4a995d4f6d 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/bzr-git/Manifest b/dev-vcs/bzr-git/Manifest
deleted file mode 100644
index 6fa1ff63afaa..000000000000
--- a/dev-vcs/bzr-git/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bzr-git-0.6.8.tar.gz 117453 BLAKE2B c668a9a01f3d4c6d2fbeb82f85b546f79ee349d468cc4e06a3958cfeec58ddf20c93a00695e9cc8ba6402f8390679ee0520cab399793a3f1179e5fe354082212 SHA512 23bd236bdd8bed53a691be03ae0e22bef804e164d4d0ec3760e2ee49d2b83d9cdff64207f33b6e7f088b7d94f7b14249948befb653f3391096210056ebe613cf
-EBUILD bzr-git-0.6.8-r1.ebuild 899 BLAKE2B fc6ab7b2b545666c845ab922ff2f6118ca2eb755df9d5bd3e6238f4fb33ca88749487f119701467282ee4875da5cf14a2ecacacd84398446ae7ef40eba8c54c3 SHA512 7dc294fd82cb8734e799632afd5bcd9a46438d48d1121ee94cd7259c55df0f87bd30f5fb2570cadaf33da9217200d3249db445769db84d4e52664c6170684495
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/dev-vcs/bzr-git/bzr-git-0.6.8-r1.ebuild b/dev-vcs/bzr-git/bzr-git-0.6.8-r1.ebuild
deleted file mode 100644
index f95f7e7aa5b2..000000000000
--- a/dev-vcs/bzr-git/bzr-git-0.6.8-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Support for Git branches in Bazaar"
-HOMEPAGE="http://bazaar-vcs.org/BzrForeignBranches/Git"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit bzr
-	EBZR_REPO_URI="lp:bzr-git"
-	KEYWORDS="amd64 x86"
-else
-	SRC_URI="https://www.samba.org/~jelmer/bzr/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-IUSE=""
-# Test are broken, they want API functions from Dulwich which are not
-# installed in Gentoo
-RESTRICT="test"
-
-# Check info.py for dulwich and bzr version dependency info.
-# The file should be fairly straightforward to understand.
-DEPEND=""
-RDEPEND=">=dev-python/dulwich-0.8.2[${PYTHON_USEDEP}]
-	>=dev-vcs/bzr-2.5.0[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
diff --git a/dev-vcs/bzr-git/metadata.xml b/dev-vcs/bzr-git/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/dev-vcs/bzr-git/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 3976d1a2f8f8..948c0d205ecb 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -7,6 +7,6 @@ DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2
 DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b
-EBUILD subversion-1.10.0.ebuild 15251 BLAKE2B 3138e68713247948d558873409638d8887b940d9e4419f2bc72d4f35c7905cf9fccf17cd9eb1e2edf917aa41b0a2eec119a9e46e5e5d5aa9f214e03a59d967cd SHA512 0fd16dd1a05275a94035d27922a28c51e7cfa767cb82b4293f9cf8e2fd6756cdc4f0f3bd487a32027c9f28a8b1b015c912d12f2b7830e05e3d5b44189a73ce8a
+EBUILD subversion-1.10.0.ebuild 15262 BLAKE2B 92a42536e15078a4464f366519f5c0a42fce4652d63c2c9a0145f7b34b925e57c03b5be32bb36b8ac45b2327f85a29b138cc0ad3d5aa9cb6efb1d6bc5ed2f02a SHA512 243b80ca51facd09d2a05847c53895c1a51677daeedfbc098745ab20b55cea2e1539c990909c097a8a942ca40fe726342c02c0c17bc6c6038c8f7ad08643a2c3
 EBUILD subversion-1.9.7-r1.ebuild 15816 BLAKE2B 29b2a237fe4bb7194a02be3a4926ad076e70cfaeb6240b1039aeadb71a2d6b42bb828f1a84acf623b38445772393f871795d08dc5cca73b3c911a38f747545da SHA512 5ad645eff753a18762b3daae71edd906be7e4a63e969614d4564d64a3a7ee11b78b834e88cd591bfd97ff294ecce52726c5ca21e7cf7f87be586cf0dc8ac8682
 MISC metadata.xml 659 BLAKE2B 645c4601d97faa216c2b75f48c2202f011ba17611ae68f3d572584b4608e1d5b7ef2db5cfdb78d0aafffce51519f65a4945979e3da9c57b03a2c3f08552e74c8 SHA512 2a2f10c5500540ae1bdd49d80d9689c14a79772d93b689db01e0cd1d63a729b86a7b28974492ee08d6433495c61d5a493590c4c60d843afc881c54d574369313
diff --git a/dev-vcs/subversion/subversion-1.10.0.ebuild b/dev-vcs/subversion/subversion-1.10.0.ebuild
index fc541e8c9ebf..ecc74c603f7e 100644
--- a/dev-vcs/subversion/subversion-1.10.0.ebuild
+++ b/dev-vcs/subversion/subversion-1.10.0.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
 
 COMMON_DEPEND="