diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/Manifest
index 85505929a9..4c9f0298f2 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/Manifest
@@ -1,33 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX 47_mod_dav_svn.conf 422 SHA256 bdb10203ae3154da723655b07118f630ef1e83ec38a79e31a53e436e0c071d27 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d WHIRLPOOL 05f1048e41c9c59718fc794ae53de532565447186a2cef45a222bee3d45071976037cc2aa3d90b27df1c02c01ce262c7b8030c4ad021cd597f277b8b48c7d976
-AUX 70svn-gentoo.el 443 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be SHA512 ab105533569ec81631491da4cd29488e77ae5713b5a2190afe1576e6434202a0c36fce7674cdf17a3e1e58650efba8915fb7e31c686def3701ef82803ecf8bea WHIRLPOOL 4f699ca38a1659ac2129f36de37ddd830d026520c1bf34562181ceb4763a38362cc3df516c3077ddbd66f36973d0c82f2d51d3a4657ba0af3722e61b29b4a53f
-AUX subversion-1.5.4-interix.patch 4375 SHA256 1cb7dec795921a89e90f792d0176c52239aa3d87064bafbd5af9ded4df981dbe SHA512 e63c49ae3935be14437702136175d38fac1a820ccc641eb9d94e51d89986847a408b49995c01dcfa4d45c3bf04c94134def117ff27802b3eb02a6268d6032b75 WHIRLPOOL 77d60f127f2132c6e5a8a00f4f6603dfeec8708b36dbbac8d806dc0bedcfd36426661adff6c49895c73dfb16883e18e0cdbc81f3a43d3f1ecace744a25a394a7
-AUX subversion-1.5.6-aix-dso.patch 787 SHA256 2790b21e035ea77358d33c14e7e7c3c8977e1b3f5d4150768912eea719e2cf6c SHA512 8cf3495c8239f47193d0f67084b88cd2a601586a0d933512a6326522f5c87310a636ab7928c1c13e4adf1cbaf756eca77f025be9af947dcff3f1661f0f2e9347 WHIRLPOOL 40c3397dcc9371ae9d6badd7aeb56b01d6de1729fd84dc4c17e27c0f723869354b04cb4b21749890af5f9366f504789d1c2f63287a15e6bad566760a36e24625
-AUX subversion-1.6.3-hpux-dso.patch 627 SHA256 0fa69598635ea9630e95e3e8b693cd5f1b853784900e34d58ffe9e03d8c65b36 SHA512 4ca24738d527c8f845e0d255950f0121a445ec1357bea03e2c3cd0c1ca077f8aefd6769eb4dc4bc3787c593c9542f3a64ad283ae5154201a7fcf2392e7ea076b WHIRLPOOL d90944d8cb30db9e8f88606f5054cc54af0a2f496125f6462237b964b2f4faefdde94b26c9a80e9273d19fffbce71cbf89dba961300c3a764de4c21782499533
-AUX subversion-1.8.0-hpux-dso.patch 615 SHA256 1ef3e8ae4d881ae9eec6c6e40ddff2e326357e39069c53b84e51b138f05d409a SHA512 02286f248caccc7ed2b834d8b648b9229fbbaabb69535f2d63b64f6e8711e96420f368917ada5d46f8882c085d68be5acf1ddadf6b7033c9fab70ade1348b2b1 WHIRLPOOL d9050799234d2af014d054ab4a9e13e3f6cd24981e1a4ae6f3313216cc744450e6bfe5aa0bb95ef777e7253b2c1f2609cb678a32a0d3e9ada77b20569b6f5a6c
-AUX subversion-1.8.1-revert_bdb6check.patch 3160 SHA256 4b42624c83c87a19c9e1f60fb08b1875e2de696bc6b92835e1404d689d078954 SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3 WHIRLPOOL 168f53408a1d9ab6f60dd1b5413b2187da832bec960a52d68757edf3ffd187e44672f15b08ac26fb6f966b91ea888da7525020d6d1a6148736f15e713efd3f62
-AUX subversion-1.8.5-swig-python-no-gnome-keyring.patch 39439 SHA256 0e0e8364ef4ba9835968a68329020f0ae1047c9d06c440a4bca21fa0f5effe19 SHA512 ecb8a11ae3fe8904d2381b85f841eedaf4d1f303baf079aab9a83a70c4b34212c7399f86276fb3e5b34557b2dde911f7abb246fe14cbc0a6b8c5fa15357d01a0 WHIRLPOOL e95ffc62e915814e359e9f603c8c2688395d45ef7a04aab107df46ed001c6741c0a74b8c02091af8eb84b294bd74b73f1adbb202965827d6647926e2292d3e50
-AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 SHA256 c7a9fe0f095de7e49e219af5cabdff28751ee39aa42e712c4b8b3bc0ed64d50c SHA512 c24cf217e3d5c8e31b28c38d63e994ef131b410a7a6ab00b31772a0863f216d9d3482810928ab2cf7025baf632a415435653fd3fd2fd3780013b70a53ccf5cad WHIRLPOOL e7bb2c833d2393f82f769007d5df35e97ed8766cea5f9f5c64e41ed6369950a6aa8c73e44e9803656ec2ac21706e69cc3cf05f45a5dd1abe85fdb2cb9d0894bf
-AUX svnserve.confd 322 SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289 WHIRLPOOL c91f8454f4a6d7fc9823bfbded1432993da14574693cfb4ffd6902fce136b2a14dc23616b523cf89e06493f96317ed0520a586af022d2cb1bea025ec99e53ed8
-AUX svnserve.initd2 828 SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713 SHA512 48729e3befc9fb9f26bbb58f3e3694cecec491df65eb7251af85bec1aa16f6d1b406f2ef072c93c9136e261d8ce64aa658bf41f812c1a555c7014521c2ff775f WHIRLPOOL bbff4d5010a0f6ceb0e9e2f76984c9935f610b18163e7e5c426059a48f84451e5cbeae86582d6dd22d9a59dc47f71b253b19cce9ed6761a29013877a32cb5d81
-AUX svnserve.initd3 695 SHA256 b5bd2a3b09c5e84d385e5d873ad9e3061a6e05dcf59276d6a38a5b86f180eb77 SHA512 7d18a9942608162fa6244dead7d0ca072a257debbb4dd401b73e5cbc94fe1c87d2814698aba7450af3695b8b8434341d4d023ee963c3def0b1eecfececcfe00c WHIRLPOOL 9b7c192d35edf733ebce70753aa1e14cea49d556283a076e642276a525c6d9403a31823c9db76116ce9ef6761770ccec4cb2e72da568d57808563c93774274c4
-AUX svnserve.xinetd 332 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae WHIRLPOOL 0c5ed79630859706f18b56fbb910b4b2dc6b480cdf72a929f7d33232f23ee1eb7110b98c4a8e06cd06c620b9f4ff081bfae23edd1f6a65fade2ac5081dbf3962
-DIST subversion-1.7.20.tar.bz2 6014383 SHA256 0d16f62d2ed1a152e26f8194ac3eb889ef9f1a1716959a43115266e8baa50068 SHA512 ea7cdfa0ac489cf62a9c5a05a651d541f383b6487beabe0fb0d972b86888812b25831ac54dda18c4fc37e80168f0c3bc9a5441ed6e94f59691b35dd33ed2631f WHIRLPOOL 7de4efff69ac2f63257d444e92d4f432ac61a6a2be9feb2969fd1b5fd69189dde5566067742d70883a7d40283d131886879e8ebc13c9faf352d1942b4f1d17e9
-DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4
-EBUILD subversion-1.7.20.ebuild 14607 SHA256 4f20fa11a4b7b33f2a4b705f77305ff959ec7061171d8f7f3b6ba7734b48058b SHA512 dc22cd8549452bdec56c923b7d6029a0c2877cb7fffe07b1b0d906c66b57387808c684b1434a6893d0dcff16daa1d764ed685169db50d2ad391d4fa3363c7ee6 WHIRLPOOL 23cc0bf7f1d95a12ca3082723a9b8928495397177bf53c9bdfe85d65eea75d601e18a8ff7cba61570435e4422d1a74fa6ebe6bab09fa68e8c820fc12a3240dec
-EBUILD subversion-1.8.13-r1.ebuild 15421 SHA256 8c93ef2249c59bd57b4f1b99c19c2016f6225ab7a775b787cff428a8b2acf33a SHA512 7246ac98c6e95c1f2942a0d52d024b26a879068e16d49bf7109459c5f1a6bf5d67c7d78643c74ff7a2e7bc862386dfa3729d62d3190d6aeb0acf1cdd0489a948 WHIRLPOOL 7cc95539f7c8f2e7b2c2d772834bcef2d4313e8c78a3cf0d1d0e65dca4b361f2c5fc0d803c54814f319bf5b8ecbc07bbb0c7df092289cfd1803623791ced5145
-EBUILD subversion-1.8.13-r2.ebuild 15436 SHA256 c6e067bd9d6a7ececf4eb093a150638ddcdee4a0ddf3addc914d4af253585acb SHA512 52f43d8463eaea0651fabaaafd975a55121388e4c086e9c6128aea465b1d49d2eb8d089689dba2040d859859047e6abbcaf8d3b291b9bc4a5d8b112a77720da7 WHIRLPOOL 1d036eaa57e76094ff1503736332993d5d8387808e31b0ee118af0a7a1b09282bdf7719146065f283dce41ffe6819ef7f145607d3f1d739d2439356ddb3c02e7
-MISC ChangeLog 3717 SHA256 a9bed5f15abe04e09cc833558337875d717f5d1e78d03cf9acdeb58f952380c3 SHA512 afbfa87a44a56b6f61c8627c5cac19e45a8800c7b28c00649866db79dd0a22eaee1d6ab45e5170f363dcd817ad33f54a2d5e30d5eb4370b2db029d431c6558dc WHIRLPOOL f0fd410dc3a584f95ec992aef4a053eb6f0bc5304e1ad560ed70538481bf76bdaa172e087dc5746625cb67c52379dc5606d232d1c8631039f5b2e75275e0da61
-MISC ChangeLog-2014 104501 SHA256 896e4b8534542aeb582ae3a2e1fcbabd0dacf246fb1f5090161d690164d4ee05 SHA512 6e188d0437e11b908983a6093afa19d17e4c7dce7763fb26ea9a94a70c520ab31ad78829f03443347db0d199c3d30d5a92d73d1e32827e82a1e58535b1808644 WHIRLPOOL 6ecb4ed382b6466e6fa2143b8e9133fce01fcbd57485533637b4cc13663a216c853dbd3c2b3af0d5fcfce0dd1aece589b5c5d9f3275caf89fd0200e64fcad947
-MISC metadata.xml 845 SHA256 43917d4b57c7ada945f07ca2507f6df3c83581931b8da7f4bef7eaa3bed0dbaf SHA512 8766f082f146c0d9ddb62f78dc0dfab5b480adddb1d7f1e0a07ac7aa11a2e70fd2aec534fe069eabfc86d75f9027162ed17d9463aa491ab87895934997005041 WHIRLPOOL 42bed6ad1d2cf349eab8d4011fc4fcce3c257a387a2c9c101c62c26058c218f195ef752715a5deac80dadbbeffbb088c37ea5d393f69751cdc78bdae2b982078
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iJwEAQEIAAYFAlWWsYQACgkQG7kqcTWJkGfCmgQAum2k+MeK7qjjj6CxOvoDDJG7
-mZSUzIObPkEyoB4W7DPfGxRqwVKEAvSKKqPSL1Yn8+DG2JvrOT+KKfxTTdGdyDzU
-sFi7Gok7JKj75AEvjMCddoZSrbBSGqWKz7N8SRxQoVKz9ZYy8BeQAUe60xruC1fY
-NyaxZwHVS3CX1fKuc5c=
-=RHTq
------END PGP SIGNATURE-----
+DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/47_mod_dav_svn.conf b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/47_mod_dav_svn.conf
new file mode 100644
index 0000000000..52d08b7ab5
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/47_mod_dav_svn.conf
@@ -0,0 +1,16 @@
+
+LoadModule dav_svn_module modules/mod_dav_svn.so
+
+LoadModule authz_svn_module modules/mod_authz_svn.so
+
+
+# Example configuration:
+#
+# DAV svn
+# SVNPath ${SVN_REPOS_LOC}/repos
+# AuthType Basic
+# AuthName "Subversion repository"
+# AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
+# Require valid-user
+#
+
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
index 49c6162d12..69a4355f17 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
@@ -3,8 +3,8 @@ http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html
Once there is an agreement on that, this patch eventually is for upstream too.
---- subversion/libsvn_ra/ra_loader.c.orig 2009-04-28 14:53:35 +0200
-+++ subversion/libsvn_ra/ra_loader.c 2009-04-28 14:55:37 +0200
+--- a/subversion/libsvn_ra/ra_loader.c
++++ b/subversion/libsvn_ra/ra_loader.c
@@ -164,6 +164,13 @@
/* find/load the specified library */
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
new file mode 100644
index 0000000000..8b07d22ca3
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
@@ -0,0 +1,19 @@
+With newer versions of javadoc (since JDK-1.8), "make doc-javahl"
+reports many errors, causing build failures. Add "-Xdoclint:none"
+option to restore old, sloppy behavior.
+
+Patch created for subversion-1.8.16, should work for other other
+versions, too.
+See
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -650,7 +650,7 @@
+
+ # Generate API documentation for the JavaHL package.
+ doc-javahl:
+- $(JAVADOC) -d $(abs_builddir)/doc/javadoc \
++ $(JAVADOC) -Xdoclint:none -d $(abs_builddir)/doc/javadoc \
+ -sourcepath $(top_srcdir)/subversion/bindings/javahl/src \
+ -link http://java.sun.com/javase/6/docs/api/ \
+ org.tigris.subversion.javahl \
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch
index 4fab19a66b..bffb43117b 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/subversion-fix-parallel-build-support-for-perl-bindings.patch
@@ -1,5 +1,5 @@
---- Makefile.in 2011-07-16 13:50:53.000000000 +0200
-+++ Makefile.in.new 2012-03-11 12:13:57.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
@@ -732,7 +732,7 @@
extraclean-swig-headers: clean-swig-headers
$(EXTRACLEAN_SWIG_HEADERS)
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd3 b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd3
index 2a4fd4b0a6..a28ce0b478 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd3
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/files/svnserve.initd3
@@ -1,7 +1,6 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd3,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $
description="svn server"
pidfile="/var/run/svnserve.pid"
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/metadata.xml
index 88aaac09a3..a8dc2a284c 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/metadata.xml
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/metadata.xml
@@ -1,11 +1,7 @@
-
- tommy@gentoo.org
- Thomas Sachau
-
-
+
polynomial-c@gentoo.org
Lars Wendler
@@ -14,7 +10,6 @@
Enable runtime module search
Install extra scripts (examples, tools, hooks)
Enable http support using net-libs/serf
- Enable WebDAV support using net-libs/neon
- Enable WebDAV support using net-libs/serf
+ Enable encrypted storage of passwords with kde-frameworks/kwallet
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild
similarity index 76%
rename from sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r3.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild
index 8896235d29..93644b31be 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.8.13-r3.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-vcs/subversion/subversion-1.9.7.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13-r2.ebuild,v 1.2 2015/06/04 19:02:30 kensington Exp $
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby23 ruby22 ruby21"
DISTUTILS_OPTIONAL=1
WANT_AUTOMAKE="none"
GENTOO_DEPEND_ON_PERL="no"
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
@@ -18,30 +18,30 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kde nls perl python ruby sasl test vim-syntax"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
-COMMON_DEPEND=">=dev-db/sqlite-3.7.12
+COMMON_DEPEND="
+ app-arch/bzip2
+ >=dev-db/sqlite-3.7.12
>=dev-libs/apr-1.3:1
>=dev-libs/apr-util-1.3:1
dev-libs/expat
sys-apps/file
sys-libs/zlib
- app-arch/bzip2
berkdb? ( >=sys-libs/db-4.0.14:= )
ctypes-python? ( ${PYTHON_DEPS} )
gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring )
- kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
+ http? ( >=net-libs/serf-1.3.4 )
+ kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 )
perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
- ruby? ( >=dev-lang/ruby-2.1:2.1
- dev-ruby/rubygems[ruby_targets_ruby21] )
- sasl? ( dev-libs/cyrus-sasl )
- http? ( >=net-libs/serf-1.2.1 )"
+ ruby? ( ${RUBY_DEPS} )
+ sasl? ( dev-libs/cyrus-sasl )"
RDEPEND="${COMMON_DEPEND}
apache2? ( www-servers/apache[apache2_modules_dav] )
java? ( >=virtual/jre-1.5 )
- kde? ( kde-apps/kwalletd:4 )
+ kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
nls? ( virtual/libintl )
perl? ( dev-perl/URI )"
# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
@@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
gnome-keyring? ( virtual/pkgconfig )
http? ( virtual/pkgconfig )
java? ( >=virtual/jdk-1.5 )
- kde? ( virtual/pkgconfig )
+ kwallet? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
test? ( ${PYTHON_DEPS} )"
@@ -64,6 +64,15 @@ REQUIRED_USE="
!dso
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.4-interix.patch
+ "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch
+ "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch
+ "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
+ "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+ "${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
+)
+
want_apache
pkg_setup() {
@@ -113,15 +122,22 @@ pkg_setup() {
# Allow for custom repository locations.
SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+
+ if use ruby ; then
+ local rbslot
+ RB_VER=""
+ for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+ if has_version dev-lang/ruby:${rbslot} ; then
+ RB_VER="${rbslot/.}"
+ break
+ fi
+ done
+ [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
+ fi
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \
- "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
- "${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch \
- "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
- "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
- epatch_user
+ default
fperms +x build/transform_libtool_scripts.sh
@@ -147,13 +163,6 @@ src_prepare() {
-i build-outputs.mk || die "sed failed"
if use python ; then
- if [[ ${CHOST} == *-darwin* ]] ; then
- # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E
- # in short, we don't have gnome-keyring stuff here, patch
- # borrowed from MacPorts
- epatch "${FILESDIR}"/${PN}-1.8.5-swig-python-no-gnome-keyring.patch
- fi
-
# XXX: make python_copy_sources accept path
S=${S}/subversion/bindings/swig/python python_copy_sources
rm -r "${S}"/subversion/bindings/swig/python || die
@@ -161,16 +170,36 @@ src_prepare() {
}
src_configure() {
- local myconf
+ local myconf=(
+ --libdir="${EPREFIX%/}/usr/$(get_libdir)"
+ $(use_with apache2 apache-libexecdir)
+ $(use_with apache2 apxs "${APXS}")
+ $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+ $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
+ $(use_enable dso runtime-module-search)
+ $(use_with gnome-keyring)
+ $(use_enable java javahl)
+ $(use_with java jdk "${JAVA_HOME}")
+ $(use_with kwallet)
+ $(use_enable nls)
+ $(use_with sasl)
+ $(use_with http serf)
+ --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
+ --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
+ --disable-experimental-libtool
+ --without-jikes
+ --disable-mod-activation
+ --disable-static
+ )
if use python || use perl || use ruby; then
- myconf+=" --with-swig"
+ myconf+=( --with-swig )
else
- myconf+=" --without-swig"
+ myconf+=( --without-swig )
fi
if use java ; then
- myconf+=" --without-junit"
+ myconf+=( --without-junit )
fi
case ${CHOST} in
@@ -178,33 +207,37 @@ src_configure() {
# avoid recording immediate path to sharedlibs into executables
append-ldflags -Wl,-bnoipath
;;
+ *-cygwin*)
+ # no LD_PRELOAD support, no undefined symbols
+ myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
+ ;;
*-interix*)
# loader crashes on the LD_PRELOADs...
- myconf+=" --disable-local-library-preloading"
+ myconf+=( --disable-local-library-preloading )
;;
*-solaris*)
# need -lintl to link
use nls && append-libs intl
# this breaks installation, on x64 echo replacement is 32-bits
- myconf+=" --disable-local-library-preloading"
+ myconf+=( --disable-local-library-preloading )
;;
*-mint*)
- myconf+=" --enable-all-static --disable-local-library-preloading"
+ myconf+=( --enable-all-static --disable-local-library-preloading )
;;
*)
# inject LD_PRELOAD entries for easy in-tree development
- myconf+=" --enable-local-library-preloading"
+ myconf+=( --enable-local-library-preloading )
;;
esac
#version 1.7.7 again tries to link against the older installed version and fails, when trying to
#compile for x86 on amd64, so workaround this issue again
#check newer versions, if this is still/again needed
- myconf+=" --disable-disallowing-of-undefined-references"
+ myconf+=( --disable-disallowing-of-undefined-references )
# for build-time scripts
if use ctypes-python || use python || use test; then
- python_export_best
+ python_setup
fi
if use python && [[ ${CHOST} == *-darwin* ]] ; then
@@ -213,31 +246,11 @@ src_configure() {
export ac_cv_python_compile="$(tc-getCC)"
fi
- # force ruby-2.1
# allow overriding Python include directory
- ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \
- ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "none") \
+ ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
+ ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
- econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use_with apache2 apache-libexecdir) \
- $(use_with apache2 apxs "${APXS}") \
- $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
- $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \
- $(use_enable dso runtime-module-search) \
- $(use_with gnome-keyring) \
- $(use_enable java javahl) \
- $(use_with java jdk "${JAVA_HOME}") \
- $(use_with kde kwallet) \
- $(use_enable nls) \
- $(use_with sasl) \
- $(use_with http serf) \
- ${myconf} \
- --with-apr="${EPREFIX}/usr/bin/apr-1-config" \
- --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
- --disable-experimental-libtool \
- --without-jikes \
- --disable-mod-activation \
- --disable-static
+ econf "${myconf[@]}"
}
src_compile() {
@@ -363,9 +376,9 @@ src_install() {
if use java ; then
emake DESTDIR="${D}" install-javahl
- java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
- java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
- rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
+ java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
+ java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+ rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
fi
# Install Apache module configuration.
@@ -393,10 +406,10 @@ src_install() {
#adjust default user and group with disabled apache2 USE flag, bug 381385
use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
-e "s\GROUP:-apache\GROUP:-svnusers\g" \
- -i "${ED}"etc/init.d/svnserve || die
+ -i "${ED%/}"/etc/init.d/svnserve || die
use apache2 || sed -e "0,/apache/s//svn/" \
-e "s:apache:svnusers:" \
- -i "${ED}"etc/xinetd.d/svnserve || die
+ -i "${ED%/}"/etc/xinetd.d/svnserve || die
# Install documentation.
dodoc CHANGES COMMITTERS README
@@ -405,10 +418,10 @@ src_install() {
# Install extra files.
if use extras ; then
- cat << EOF > 80subversion-extras
-PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-EOF
+ cat <<- EOF > 80subversion-extras
+ PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+ ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
+ EOF
doenvd 80subversion-extras
emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
@@ -424,7 +437,8 @@ EOF
fi
if use doc ; then
- dohtml -r doc/doxygen/html/*
+ docinto html
+ dodoc -r doc/doxygen/html/*
if use java ; then
java-pkg_dojavadoc doc/javadoc
@@ -433,17 +447,17 @@ EOF
prune_libtool_files --all
- cd "${ED}"usr/share/locale
+ cd "${ED%/}"/usr/share/locale
for i in * ; do
- [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; }
+ [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; }
done
}
pkg_preinst() {
# Compare versions of Berkeley DB, bug 122877.
- if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then
- OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+ if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then
+ OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+ NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
CHANGED_BDB_VERSION="1"
fi
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
index 196d268519..aecddf555b 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
@@ -9,6 +9,7 @@
=dev-cpp/glog-0.3.1 **
=dev-lang/perl-5.24.1-r2 ~arm64
=dev-libs/apr-util-1.5.4-r1 ~arm64
+=dev-libs/elfutils-0.169-r1 ~arm64
=dev-libs/libevent-2.1.8 ~arm64
=dev-libs/liblinear-210-r1 ~arm64
=dev-libs/libnl-3.2.27 ~arm64
@@ -26,6 +27,7 @@
=net-libs/libnftnl-1.0.6 **
=net-libs/serf-1.3.8-r1 ~arm64
=net-misc/bridge-utils-1.5 ~arm64
+=net-misc/curl-7.55.1 ~arm64
=net-misc/iperf-3.1.3 **
=net-nds/openldap-2.4.44 ~arm64
=perl-core/File-Path-2.130.0 ~arm64
@@ -38,10 +40,12 @@
=sys-apps/util-linux-2.28.2 ~arm64
=sys-block/parted-3.2-r1 ~arm64
=sys-cluster/ipvsadm-1.27-r1 **
+=sys-devel/binutils-2.28.1 ~arm64
=sys-fs/btrfs-progs-4.10.2 ~arm64
=sys-fs/cryptsetup-1.7.4 **
=sys-fs/lsscsi-0.28 ~arm64
=sys-fs/mdadm-3.4 **
=sys-fs/quota-4.02 **
+=sys-libs/binutils-libs-2.28.1 ~arm64
=sys-libs/libcap-ng-0.7.8 ~arm64
=virtual/perl-File-Path-2.130.0 ~arm64
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
index 12d8a4d80a..34e5955ab9 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@@ -34,9 +34,6 @@ dev-util/checkbashisms
# https://bugs.gentoo.org/show_bug.cgi?id=548158
=sys-apps/gentoo-functions-0.10
-# Avoid cross compile error with amd64 stable (elfutils-0.158).
-=dev-libs/elfutils-0.161 ~amd64
-
=dev-python/pyusb-1.0.0 ~amd64
# Older versions of sssd fail to build
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
index 48186d813c..cc561c4b09 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords
@@ -6,3 +6,6 @@ dev-python/botocore ~amd64
# Accept unstable host Rust compilers
dev-lang/rust ~amd64
dev-util/cargo ~amd64
+
+# Match binutils versions with the host
+=cross-aarch64-cros-linux-gnu/binutils-2.28.1 ~arm64