Removed vulnerable versions

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

6 files changed, 20 insertions, 1499 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 9a516939d50e..6a83961f1289 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.218 2014/12/26 09:29:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.219 2014/12/26 13:50:12 polynomial-c Exp $
+
+  26 Dec 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -subversion-1.7.18.ebuild, -subversion-1.8.10.ebuild,
+  -subversion-1.8.10-r1.ebuild, -files/subversion-1.8.9-po_fixes.patch:
+  Removed vulnerable versions.
 
   26 Dec 2014; Agostino Sarubbo <ago@gentoo.org> subversion-1.7.19.ebuild,
   subversion-1.8.11.ebuild:
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 37ec64e03c8a..67cd7fa4a111 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -9,36 +9,30 @@ AUX subversion-1.6.3-hpux-dso.patch 627 SHA256 0fa69598635ea9630e95e3e8b693cd5f1
 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-1.8.9-po_fixes.patch 865 SHA256 8c11210cc649172b9a229081d7d9e169eebd1dde648774882974bcd68101565d SHA512 71922f67b8d7d8b2c1e5ccb4af240ccd748e42a8c04c7a138f7678431afb97c90517c22aa43dddee72b0025dcdb8751c90075806d5003e888bc8592475271eae WHIRLPOOL 1880d0c00c486512c6c0c81f90428d6693104388d3905290ad1498d7f11656e95bee8368b91ed53f7867dff26e585d48f619d2eaf91e4a81132caee4a6a98d1d
 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.xinetd 332 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae WHIRLPOOL 0c5ed79630859706f18b56fbb910b4b2dc6b480cdf72a929f7d33232f23ee1eb7110b98c4a8e06cd06c620b9f4ff081bfae23edd1f6a65fade2ac5081dbf3962
-DIST subversion-1.7.18.tar.bz2 6096031 SHA256 f67381ce62b69bdb373e4c38ff84576677316904753536a78630603cacc5d91a SHA512 7a73b262701f7df6bc61acec4a38e8f6a04ff923a4b21669dba62d5357eb6ebce9e47d044d246ed9889eeefc6413569b5e4ee0f53cc9e78f8d24edb30e47f1a3 WHIRLPOOL b5bc15b8ae805659abbbc3f00f052f0b25f030a05a2ca5a60ee5e884b8dac6ff800a8c8d73b374c5c4f64df0fe17628a43f81e10047134a2ffef241c9a5ee90f
 DIST subversion-1.7.19.tar.bz2 6094560 SHA256 0059cd376ac6a14c80612ea99c4b0fed9dc2ff0ad05560d108a4c5625323cd5c SHA512 8b7f940e9cf007f9076400ec5bebf628ecb9055577de782ed6d90b96ff08e6d9ac9d8c5924c6bf861250345efd1567500541595563c6e3f03984c13d3c07f3d5 WHIRLPOOL 7ef46a86f381fd65f49634906ca0c291eb30cf17b02953ccedfe3c38210bd586ae29189680329e6858eeba65168025f260169819410959a83c162573d04b4dec
-DIST subversion-1.8.10.tar.bz2 6899384 SHA256 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc SHA512 a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 WHIRLPOOL bff8ce6509263a6de6a19d135c96f50f4bba24c539a3d0a7300b547c8a264ddd6d3ba38b78680a9dceb171306819ca2835f00d1cf4afa7a9001ae104567c4022
 DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247
-EBUILD subversion-1.7.18.ebuild 14612 SHA256 3490b4d8419cc9e453bd9be62eee81e1d4149e39c6b449ad7b1afc247a94d8a0 SHA512 0a63b5fe60d35f440ac73507b1c14f265928c28c11680ba6961d434924198ed77ef34d8a465f1a3766634df29777db1cd3b62b6f01d4fb63ecba5fda8b27c94f WHIRLPOOL 534dc36932a61c0808ad48e09230eb705fe19342d11ec1bf5d8040b8b64540d6cd85b3a3525d6263cb457857f431ec5d7c5aa69623bf9aa17f6a2f926ed5ea7b
 EBUILD subversion-1.7.19.ebuild 14608 SHA256 e8f409c67d9e87dc15b13e7c6acd646c2916c788d522d71690f6faf2c77b9e54 SHA512 6f49ef709fcdc89930e49248fd1e6a45e593b42028045dd62aeb8d1923e17e225b3d56ca06a5cb87c96de309f0b428edd3aea26c3e24ac99a2af5c24e2664467 WHIRLPOOL 2a167bd036e00846b1c8046e9f46d495cb738864363a56c904588e27ce7b98d3bb6b8e557c0035b109a30eb8f7d1ab5c624d01b6db9b214e1d1b1c4a4dfb51ba
-EBUILD subversion-1.8.10-r1.ebuild 15446 SHA256 aab1d6deaa34045d6c003b0af812ca0e2020ee5b71edc073633ff5876f45137e SHA512 edc001f6cd816f7807ba82f41bbac09b3130eabfef67533b1b60f741410d9b6b924c76796c7cb7e0d83865e044ef63579385df3f1c38852abc0724587417502c WHIRLPOOL 33b887264d48c22d2be05ef82a092c70ff7574dd3c760bfead68d49220663fb3edd64e0555094b164692b2f4a9a7951b7ce7d6ad55fedc88ce05d8c2e2e2d6d8
-EBUILD subversion-1.8.10.ebuild 15358 SHA256 c4405957ab20c1c173849d64cdb1d1fce71b48a906bd8c8ccff2ba6ef969d96b SHA512 905154697c85c822e527504685f70f42fef9de220ef0bb72cb217c6b1322ec60f1b8809e6956e768698b8864ad1e2d2a45f6861fcbb8804f14d8ac1ad6c1f0c8 WHIRLPOOL 2a169bc4643bde4c66166ddc8511cc358776b8be45c864bca719c1facaf6775ebbe5e761fa8162486c3ac28508743bf7f70f637e8ead03acddf346c225b98cd3
 EBUILD subversion-1.8.11.ebuild 15388 SHA256 0fd5fe6ba62b30043fc4e89925db97556c0063277fb4eae18a2a80e70343abfa SHA512 29691d1aa705dcbf0a99263fe938b968fbec443843026144c4a587870ba1a7ff3c4758df35f6457d774c5f6794733b0861e02043e2f548e51eb0b873ec25ff82 WHIRLPOOL 1155773af6c2b2f53a8de9c6e069f4d7e7bd1b7d7c1ac853255ec3ef5bef69818bac560adfa1d6f0ddfd5914b5c5aef752556f8615d8db069e179abeb9f87614
-MISC ChangeLog 104278 SHA256 3e80ecbb8b1afc0347f04a05ad2423651ecf2957171235a72f0719a2c925c682 SHA512 98c21cb3d59d665e9d002166ed68ecb4d6d147630effe064495c761ab5c0f1657e898696b21db4b529716141f3c1f649c861af10b994b9bd079edc03b0d9a926 WHIRLPOOL 681a4c0886c15c5c445d46498e8a7b8cfa0b4754d5d7585404478c7ad7e1467bb8a8367bc8da82bc93c4ed66c57fd593ce2ee11a859b1309ab4824c1e2e99aa4
+MISC ChangeLog 104501 SHA256 a2c28f598717b9a8e94dc8b7b652f931d33911bbe26850789130f81f93957cd5 SHA512 da4467ddfeecfc17eab23e7245e7b4a8a8267f145dc0ab65347d1524434e1bb59a4489b8dd074d5652aa9585360f7fc59260090dd8a931554a05065255ab704b WHIRLPOOL 652b82619c26a94171eabed7eec54543dc4a44fb6b3a14d4e89a9c4b6427cbe73e3d2662d96fae826c81dbf7c1b242352617ccc96ba134f68fd8f8d61440eacf
 MISC metadata.xml 845 SHA256 43917d4b57c7ada945f07ca2507f6df3c83581931b8da7f4bef7eaa3bed0dbaf SHA512 8766f082f146c0d9ddb62f78dc0dfab5b480adddb1d7f1e0a07ac7aa11a2e70fd2aec534fe069eabfc86d75f9027162ed17d9463aa491ab87895934997005041 WHIRLPOOL 42bed6ad1d2cf349eab8d4011fc4fcce3c257a387a2c9c101c62c26058c218f195ef752715a5deac80dadbbeffbb088c37ea5d393f69751cdc78bdae2b982078
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnSpiAAoJELp701BxlEWfAjAQAL8L9hA1VGYOK4QpPQpkZHno
-ZhZWtfvDK6Mh65xqNJCArdepDU64xpBEzB4UfdgackANVLcEq3fdWCymXghbih7P
-XQXVPpbq3C/e3jqF1rrwHqFGPjB8u0Q27TA0lpxVkU4RZhYjEG7njpNUM7MDVzck
-/YXnTxFScuDgJrrTCYx/iWIPf8QXyN28/JSc2QDetbv38Sj6fUL0uC4UlIVm8VTd
-nJRmnJur+1Jd9Hb6OHyFRXISRanfqjN0UVMrj5d/gWweIszVR93GuDycaiA+BmDS
-bRzrycoqzEx8wynB+rdf47JKjVdyqTQPJJb/LbL920fn9cYQZSaW5sbdFo5JcnLS
-Uycd0epnpyJ+BrVVuHQwhdroeV+McftsGwkwqyOln3l2cumD93XP4UpvKF0TDmmJ
-fv6Br6IZrb4H5pJSLuy3Z9+wmaZ628cz3Ppqz6mlQbQt6jO9rHK4F6ABa+o0h7Ou
-2c1xb7EMYWRgUKEr5FWTvIKWvR0TgQMr6cTqhVZ/nNgev7g4SJAajLRdupX2t1I6
-GZYdY7arW/XffnA146Nce7XgQ2gYw92Tq0sUxZf9w6hUADQKq/6ZAelvNwMaFtc3
-LE7nYWpP65mf+LVX24hXB7uDCGbLx4LhgpRj9QjrirJ5J/EdKyux3NT8VX8p+Le9
-+678IftFQ0Hu3lDWiBX3
-=R9BL
+iQIcBAEBCAAGBQJUnWeVAAoJEPiazRVxLXTFk68P/0IUhu3n5E1+5SardWhVXpEb
+XpQ/BCARmdqt6MBsTv5JYJHwyApnKHtl0aHnbc8ZJfxpa+aHBjunXD1LGC3SMwfT
+CgnIUW08XGQtCTsr7Dt5xb6NmTw+vgI1Tb+2FyZTFcMYsu/vss/3SCp2ucPhxPvI
+uHYBawloQu2Hq00451Gb+cm6ZhMin5kHyAO0X+v9ZSwCC2GFj76TAq3WqQFkRdDa
+AetVfSElGwvEA3/NfQEvnt2MKnYRS3dWA9yYw3p9mtFLGc5c1MFgZVcKH152tcon
+OwcHXXJ0x2oZnm5dLut8ad4U8IqlaHROOqeUQHVr2LXVs/+bsMeE+IVQdgiSQwGc
+GI1DanNlQXinVcp39UhtXUOG1XH8LwWbOQHryQtqU77Wfh1EpT7xldi6CXxGADfu
+CLaYa7/XWHbdzFD10m5CD8YiF3IizBZo2Go33LPD9BoUE0Q9Pmik/db1Mzvbnm6x
+KOp8s5Hlvrrw3eESu8IMM+qtyl3T5Cp89M1xjm4e0wBtX8W7wH8vO4Mv69egrukZ
+s/MFo6H+YWcZy/9E6HsZxWD+9r4no+OrVj66OsZBbI5IPARRZ1VCfFLYjyQyruVb
+A2Ih80AVH0yCVgowcqmbBliSAnGY49BHAu0vGXepQXQvYaM6fCr6Eyu3rlxJk1Vz
+DEd2KBJp6NNLVFonSHDy
+=yXyI
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/files/subversion-1.8.9-po_fixes.patch b/dev-vcs/subversion/files/subversion-1.8.9-po_fixes.patch
deleted file mode 100644
index aa5a0d48ddc4..000000000000
--- a/dev-vcs/subversion/files/subversion-1.8.9-po_fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- subversion-1.8.9/subversion/po/zh_CN.po
-+++ subversion-1.8.9/subversion/po/zh_CN.po
-@@ -62,7 +62,7 @@
- "PO-Revision-Date: 2013-07-03 16:57+0800\n"
- "Last-Translator: Subversion Developers <dev@subversion.apache.org>\n"
- "Language-Team: Simplified Chinese <dev@subversion.apache.org>\n"
--"Language: \n"
-+"Language: zh_CN\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
---- subversion-1.8.9/subversion/po/zh_TW.po
-+++ subversion-1.8.9/subversion/po/zh_TW.po
-@@ -28,7 +28,7 @@
- "PO-Revision-Date: 2004-09-12 22:05+0800\n"
- "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
- "Language-Team: Traditional Chinese <dev@subversion.tigris.org>\n"
--"Language: \n"
-+"Language: zh_TW\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=UTF-8\n"
- "Content-Transfer-Encoding: 8bit\n"
diff --git a/dev-vcs/subversion/subversion-1.7.18.ebuild b/dev-vcs/subversion/subversion-1.7.18.ebuild
deleted file mode 100644
index 6def8cbcee66..000000000000
--- a/dev-vcs/subversion/subversion-1.7.18.ebuild
+++ /dev/null
@@ -1,473 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.18.ebuild,v 1.11 2014/11/29 18:55:05 dilfridge Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-MY_P="${P/_/-}"
-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
-
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
-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 java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14 )
-	ctypes-python? ( ${PYTHON_DEPS} )
-	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
-	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-1.8.2:1.8
-		dev-ruby/rubygems[ruby_targets_ruby18] )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-libs/neon-0.28 )
-	webdav-serf? ( >=net-libs/serf-0.3.0 )"
-RDEPEND="${COMMON_DEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	test? ( ${PYTHON_DEPS} )
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kde? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	webdav-neon? ( virtual/pkgconfig )"
-
-REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			if [[ -n "${apu_bdb_version}" ]]; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	if ! use webdav-neon && ! use webdav-serf; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling one of the following USE-flags:"
-		ewarn "  webdav-neon webdav-serf"
-		echo -ne "\a"
-	fi
-
-	if use debug; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \
-		"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
-		"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
-		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
-	epatch_user
-
-	fperms +x build/transform_libtool_scripts.sh
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	if use python; then
-		# XXX: make python_copy_sources accept path
-		S=${S}/subversion/bindings/swig/python python_copy_sources
-		rm -r "${S}"/subversion/bindings/swig/python || die
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf+=" --with-swig"
-	else
-		myconf+=" --without-swig"
-	fi
-
-	if use java; then
-		myconf+=" --without-junit"
-	fi
-
-	if use kde || use nls; then
-		myconf+=" --enable-nls"
-	else
-		myconf+=" --disable-nls"
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			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"
-		;;
-		*-mint*)
-			myconf+=" --enable-all-static --disable-local-library-preloading"
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=" --enable-local-library-preloading"
-		;;
-	esac
-
-	#workaround for bug 387057
-	has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
-
-	#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"
-
-	# for build-time scripts
-	if use ctypes-python || use python || use test; then
-		python_export_best
-	fi
-
-	#force ruby-1.8 for bug 399105
-	#allow overriding Python include directory
-	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \
-	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(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_with sasl) \
-		$(use_with webdav-neon neon) \
-		$(use_with webdav-serf serf "${EPREFIX}/usr") \
-		${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-neon-version-check \
-		--disable-static
-}
-
-src_compile() {
-	emake local-all
-
-	if use ctypes-python; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
-	if use perl; then
-		emake swig-pl
-	fi
-
-	if use ruby; then
-		emake swig-rb
-	fi
-
-	if use java; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras; then
-		emake tools
-	fi
-
-	if use doc; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	default
-
-	if use ctypes-python; then
-		python_test() {
-			"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-				|| die "ctypes-python tests fail with ${EPYTHON}"
-		}
-
-		distutils-r1_src_test
-	fi
-
-	if use python; then
-		swig_py_test() {
-			pushd "${BUILD_DIR}" >/dev/null || die
-			"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-			popd >/dev/null || die
-		}
-
-		BUILD_DIR=subversion/bindings/swig/python \
-		python_foreach_impl swig_py_test
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use ctypes-python; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
-	if use perl; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
-	fi
-
-	if use ruby; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	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
-	fi
-
-	# Install Apache module configuration.
-	if use apache2; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion subversion
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd2 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#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
-	use apache2 || sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED}"etc/xinetd.d/svnserve || die
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# 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
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
-
-		find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
-	fi
-
-	if use doc; then
-		dohtml -r doc/doxygen/html/*
-
-		if use java; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
-
-	cd "${ED}"usr/share/locale
-	for i in * ; do
-		[[ $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 [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
-		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-		echo "to finish the configuration."
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.8.10-r1.ebuild b/dev-vcs/subversion/subversion-1.8.10-r1.ebuild
deleted file mode 100644
index 616564f00ad4..000000000000
--- a/dev-vcs/subversion/subversion-1.8.10-r1.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.10-r1.ebuild,v 1.6 2014/12/14 02:52:50 mrueg Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-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
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
-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"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	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/gnome-keyring )
-	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-1.9.3:1.9
-		dev-ruby/rubygems[ruby_targets_ruby19] )
-	sasl? ( dev-libs/cyrus-sasl )
-	http? ( >=net-libs/serf-1.2.1 )"
-RDEPEND="${COMMON_DEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	kde? ( || ( kde-apps/kwalletd:4 kde-base/kwalletd ) )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	test? ( ${PYTHON_DEPS} )
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kde? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	http? ( virtual/pkgconfig )"
-
-REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		!dso
-	)"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	if ! use http ; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling \"http\" USE flag"
-		echo -ne "\a"
-	fi
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-}
-
-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 \
-		"${FILESDIR}"/${PN}-1.8.9-po_fixes.patch
-	epatch_user
-
-	fperms +x build/transform_libtool_scripts.sh
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-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
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf+=" --with-swig"
-	else
-		myconf+=" --without-swig"
-	fi
-
-	if use java ; then
-		myconf+=" --without-junit"
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			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"
-		;;
-		*-mint*)
-			myconf+=" --enable-all-static --disable-local-library-preloading"
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			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"
-
-	# for build-time scripts
-	if use ctypes-python || use python || use test; then
-		python_export_best
-	fi
-
-	if use python && [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_compile="$(tc-getCC)"
-	fi
-
-	# force ruby-1.9
-	# allow overriding Python include directory
-	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \
-	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
-}
-
-src_compile() {
-	emake local-all
-
-	if use ctypes-python ; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-
-		if use ctypes-python ; then
-			python_test() {
-				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-					|| die "ctypes-python tests fail with ${EPYTHON}"
-			}
-
-			distutils-r1_src_test
-		fi
-
-		if use python ; then
-			swig_py_test() {
-				pushd "${BUILD_DIR}" >/dev/null || die
-				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-				popd >/dev/null || die
-			}
-
-			BUILD_DIR=subversion/bindings/swig/python \
-			python_foreach_impl swig_py_test
-		fi
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use ctypes-python ; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	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
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd2 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#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
-	use apache2 || sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED}"etc/xinetd.d/svnserve || die
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# 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
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
-	fi
-
-	if use doc ; then
-		dohtml -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	prune_libtool_files --all
-
-	cd "${ED}"usr/share/locale
-	for i in * ; do
-		[[ $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 [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
-		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-		echo "to finish the configuration."
-	fi
-}
diff --git a/dev-vcs/subversion/subversion-1.8.10.ebuild b/dev-vcs/subversion/subversion-1.8.10.ebuild
deleted file mode 100644
index 3402bb35da9a..000000000000
--- a/dev-vcs/subversion/subversion-1.8.10.ebuild
+++ /dev/null
@@ -1,491 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild,v 1.12 2014/11/29 18:55:05 dilfridge Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-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
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
-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"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.3:1
-	>=dev-libs/apr-util-1.3:1
-	dev-libs/expat
-	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/gnome-keyring )
-	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-1.9.3:1.9
-		dev-ruby/rubygems[ruby_targets_ruby19] )
-	sasl? ( dev-libs/cyrus-sasl )
-	http? ( >=net-libs/serf-1.2.1 )"
-RDEPEND="${COMMON_DEPEND}
-	apache2? ( www-servers/apache[apache2_modules_dav] )
-	java? ( >=virtual/jre-1.5 )
-	kde? ( kde-base/kwalletd )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	test? ( ${PYTHON_DEPS} )
-	!!<sys-apps/sandbox-1.6
-	ctypes-python? ( dev-python/ctypesgen )
-	doc? ( app-doc/doxygen )
-	gnome-keyring? ( virtual/pkgconfig )
-	java? ( >=virtual/jdk-1.5 )
-	kde? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	http? ( virtual/pkgconfig )"
-
-REQUIRED_USE="
-	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? (
-		${PYTHON_REQUIRED_USE}
-		!dso
-	)"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	if ! use http ; then
-		ewarn "WebDAV support is disabled. You need WebDAV to"
-		ewarn "access repositories through the HTTP protocol."
-		ewarn "Consider enabling \"http\" USE flag"
-		echo -ne "\a"
-	fi
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-}
-
-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 \
-		"${FILESDIR}"/${PN}-1.8.9-po_fixes.patch
-	epatch_user
-
-	fperms +x build/transform_libtool_scripts.sh
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-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
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if use python || use perl || use ruby; then
-		myconf+=" --with-swig"
-	else
-		myconf+=" --without-swig"
-	fi
-
-	if use java ; then
-		myconf+=" --without-junit"
-	fi
-
-	case ${CHOST} in
-		*-aix*)
-			# avoid recording immediate path to sharedlibs into executables
-			append-ldflags -Wl,-bnoipath
-		;;
-		*-interix*)
-			# loader crashes on the LD_PRELOADs...
-			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"
-		;;
-		*-mint*)
-			myconf+=" --enable-all-static --disable-local-library-preloading"
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			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"
-
-	# for build-time scripts
-	if use ctypes-python || use python || use test; then
-		python_export_best
-	fi
-
-	if use python && [[ ${CHOST} == *-darwin* ]] ; then
-		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
-		export ac_cv_python_compile="$(tc-getCC)"
-	fi
-
-	# force ruby-1.9
-	# allow overriding Python include directory
-	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \
-	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
-}
-
-src_compile() {
-	emake local-all
-
-	if use ctypes-python ; then
-		# pre-generate .py files
-		use ctypes-python && emake ctypes-python
-
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_compile() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			python_export PYTHON_INCLUDEDIR
-			emake swig-py \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn"
-		}
-
-		# this will give us proper BUILD_DIR for symlinking
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_compile
-	fi
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		default
-
-		if use ctypes-python ; then
-			python_test() {
-				"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
-					|| die "ctypes-python tests fail with ${EPYTHON}"
-			}
-
-			distutils-r1_src_test
-		fi
-
-		if use python ; then
-			swig_py_test() {
-				pushd "${BUILD_DIR}" >/dev/null || die
-				"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
-				popd >/dev/null || die
-			}
-
-			BUILD_DIR=subversion/bindings/swig/python \
-			python_foreach_impl swig_py_test
-		fi
-	else
-		ewarn "The test suite shows errors when there is an older version of"
-		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-		ewarn "before running the test suite."
-		ewarn "Test suite skipped."
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use ctypes-python ; then
-		pushd subversion/bindings/ctypes-python >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	if use python ; then
-		swig_py_install() {
-			local p=subversion/bindings/swig/python
-			rm -f ${p} || die
-			ln -s "${BUILD_DIR}" ${p} || die
-
-			emake \
-				DESTDIR="${D}" \
-				swig_pydir="$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="$(python_get_sitedir)/svn" \
-				install-swig-py
-		}
-
-		BUILD_DIR=python \
-		python_foreach_impl swig_py_install
-	fi
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	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
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion subversion
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd2 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#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
-	use apache2 || sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED}"etc/xinetd.d/svnserve || die
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# 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
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-
-		insinto /usr/share/${PN}
-		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
-		doins -r tools
-	fi
-
-	if use doc ; then
-		dohtml -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	prune_libtool_files --all
-
-	cd "${ED}"usr/share/locale
-	for i in * ; do
-		[[ $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 [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
-		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
-		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
-		echo "to finish the configuration."
-	fi
-}