gentoo auto-resync : 06:02:2024 - 11:42:15

7 files changed, 604 insertions, 0 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 1b619494055b..3974d18a16c5 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 6836ffaf16c9..ac1deae5b4e2 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,9 +1,15 @@
 AUX 47_mod_dav_svn.conf 422 BLAKE2B 505c5f7f5c2eba9951b1337d452fde8e2b51351d2af0a4e620e86ce95aa2520460b7e353e5465edc15dc284a17b0770806ba97bb91c3d4a8451f3818d49c8469 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d
 AUX subversion-1.14.2-python3.11.patch 464 BLAKE2B 69b2a47c7ac660b8bb5cbe45772d87d2ad326cae3c5f2b36d8fb2ab6f7076d1c29ee61d4224c6e22d8985a2668f6e278bf5ce7c16cace6aaf0457c6d66180f5b SHA512 3e9289e9dec0d52a99642ffa89cc38b5d4d125fb2249696b0e9f7a046dc6efb6087ce410484f6b8031c48bae417f8de9b379246a8dc60393e6475fb3d165e920
+AUX subversion-1.14.3-ruby-c99.patch 1023 BLAKE2B ebd735e4ba48f30c34e15e514720dd39da8fe0ceb8fa8b88b5060a7c2ca521926b3f4003601ac7519e99c28bc56a5a5126cb97d5063b3e610792e43618c68529 SHA512 02e7fcb7c7239ba7344d03e86557932f4e03ca7ae71df5c66a72ffc65315d234554bd429edbc1553c1ea847867e6424f1af8e938ae6604338f67416f87717539
+AUX subversion-1.5.6-aix-dso.patch 734 BLAKE2B b628257f7df660247d2ae34d4f10b701cded2e84826195bb2c73623ea863fcecbf85ca8c92304db6b6f9fb9e092b76e980c3bbe0254e0e653b8a0fa13938c50b SHA512 fdc7f58519ae0b68458600472352fde8dd24cc32c3563ecd74da256fc6ad32dedfda78926aa60aa72a12b68a2a9e5dd43241bc501c707bb1f0b40c9e30d1b992
+AUX subversion-1.8.1-revert_bdb6check.patch 3160 BLAKE2B 5ea5fb779fdd064acf527216884bd72a93dde984f7ae0938bfd5111831dda4901264085de400dd5641fb2703b36443b41508a425900fe3e8cb4fedce33b6c90b SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3
+AUX subversion-1.8.16-javadoc-nolint.patch 688 BLAKE2B 08f59a5f86c3465ab839b2e4d18f2339157b3c644c56909f4fe4fe9efbd08d95999d7ffacfaa0e41ae56cd55cc3596ef0a10be3e89af42bd9aecbf53b556306b SHA512 0c34c6834ddcc7a9b263a84f21792a4e05c3dc71f122e43f0f5b3415fd45517f38df1c32dcae774af3d1e7776ac88241ff2fce0d974101ad3a8499c3798d8ce5
 AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0735b973c0b6c5ff3f7ca0086f9bc852e499b1b9af82f4ee305c8553e114df50e468e9d70fd4655f SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
 DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
 DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
+DIST subversion-1.14.3.tar.bz2 8569985 BLAKE2B bc366a611f77d7dc3a5dc6015ea50b8daae0cffc20f8830de04a7f310a26ab9e955db343e7902475079d31d7984cb6b03f7810e71feae9a5374e1cb690933b49 SHA512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41
 EBUILD subversion-1.14.2-r1.ebuild 12729 BLAKE2B e5a8242cc072dc43b104010a8f9ea89a4e378bb4cbf10cdf8ba0f8b5c22420b878e9501e7a6e9d5c3ac29a3992a56ab52bdc0beaa4a1ab6a93d259df7fcfafce SHA512 e68a15358d92cd4b912d5fe6b3a97bbc99dce2f0fe431f906b18f16d489c621ee03e4c5992c7e51d89910b7d3b341aaa65d2d86a07ee8db911162344b93b8ffa
+EBUILD subversion-1.14.3.ebuild 12736 BLAKE2B af8be3153bd41725e59e2deaeac29ccdbfd178a38618ae2d5bd05999e3abc10a3ee66718a8fe75b026743a1cb46eea2d1e92e409135a7b427bc36d69c70e9cdc SHA512 f51c58a99756d67ba5eb70df4561d83011ed7a2147aff8c05301f5cec1ccf017dd8b6f67530b1edc75813b9ab4c6a066409601fd3c0a1dc53162a4d99228d7b5
 MISC metadata.xml 819 BLAKE2B 1c4a8bd42cc1030719952aac2c72c40f175a22bd6eaf7e4d40638833d7a2d4c39f9da8a04bb57e1a6bcf99ade22fe7208e218f8f50d75501d835092d5ef4c105 SHA512 830789bd4225a2c5565466d8857c0cc184071962572e466bd8918ecd12b986d0017c2d6016d7d70d9a6dbbe15abce8497a2a31a5dd5e3feea5695533c417b11e
diff --git a/dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch b/dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch
new file mode 100644
index 000000000000..161984f978f9
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/919090
+https://src.fedoraproject.org/rpms/subversion/blob/rawhide/f/subversion-ruby-c99.patch
+
+The Ruby bindings apply the Ruby NIL_P macro to an apr_hash_t * value,
+which some compilers flag as a type error.
+
+Submitted upstream: <https://issues.apache.org/jira/browse/SVN-4915>
+
+--- a/subversion/bindings/swig/include/svn_containers.swg
++++ b/subversion/bindings/swig/include/svn_containers.swg
+@@ -299,7 +299,7 @@
+   $1 = svn_swig_rb_hash_to_apr_hash_svn_string($input, _global_pool);
+   _global_pool = NULL;
+   if (!NIL_P(rb_pool)) {
+-    if (NIL_P($1)) {
++    if ($1 == NULL) {
+       svn_swig_rb_destroy_pool(rb_pool);
+     } else {
+       svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);
+@@ -373,7 +373,7 @@
+     svn_swig_rb_hash_to_apr_hash_string($input, _global_pool);
+   _global_pool = NULL;
+   if (!NIL_P(rb_pool)) {
+-    if (NIL_P($1)) {
++    if ($1 == NULL) {
+       svn_swig_rb_destroy_pool(rb_pool);
+     } else {
+       svn_swig_rb_set_pool_for_no_swig_type($input, rb_pool);
diff --git a/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch b/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
new file mode 100644
index 000000000000..69a4355f17af
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.5.6-aix-dso.patch
@@ -0,0 +1,21 @@
+On AIX, load shared libraries even when created with full aix-soname support:
+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.
+
+--- a/subversion/libsvn_ra/ra_loader.c
++++ b/subversion/libsvn_ra/ra_loader.c
+@@ -164,6 +164,13 @@
+ 
+     /* find/load the specified library */
+     SVN_ERR(svn_dso_load(&dso, libname));
++#ifdef _AIX
++    if (! dso) {
++        libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0(shr.o)",
++                           ra_name, SVN_VER_MAJOR);
++        SVN_ERR(svn_dso_load(&dso, libname));
++    }
++#endif
+     if (! dso)
+       return SVN_NO_ERROR;
+ 
diff --git a/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch b/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch
new file mode 100644
index 000000000000..158c08233165
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.8.1-revert_bdb6check.patch
@@ -0,0 +1,85 @@
+--- subversion-1.8.1/build/ac-macros/berkeley-db.m4
++++ subversion-1.8.1/build/ac-macros/berkeley-db.m4
+@@ -48,7 +48,7 @@
+   AC_ARG_WITH(berkeley-db, [AS_HELP_STRING(
+                                            [[--with-berkeley-db[=HEADER:INCLUDES:LIB_SEARCH_DIRS:LIBS]]], [
+                           The Subversion Berkeley DB based filesystem library 
+-                          requires Berkeley DB $db_version or $db_alt_version.  If you
++                          requires Berkeley DB $db_version or newer.  If you
+                           specify `--without-berkeley-db', that library will
+                           not be built.  If you omit the argument of this option
+                           completely, the configure script will use Berkeley DB
+@@ -126,35 +126,22 @@
+     svn_lib_berkeley_db=no
+   else
+     AC_MSG_CHECKING([for availability of Berkeley DB])
+-    AC_ARG_ENABLE(bdb6,
+-      AS_HELP_STRING([--enable-bdb6],
+-                     [Allow building against BDB 6+.
+-                      See --with-berkeley-db for specifying the location of
+-                      the Berkeley DB installation.  Using BDB 6 will fail if
+-                      this option is not used.]),
+-      [enable_bdb6=$enableval],[enable_bdb6=unspecified])
+-
+-    SVN_LIB_BERKELEY_DB_TRY($1, $2, $3, $enable_bdb6)
++    SVN_LIB_BERKELEY_DB_TRY($1, $2, $3)
+     if test "$svn_have_berkeley_db" = "yes"; then
+       AC_MSG_RESULT([yes])
+       svn_lib_berkeley_db=yes
+     else
+-      if test "$svn_have_berkeley_db" = "no6"; then
+-        AC_MSG_RESULT([no (found version 6, but --enable-bdb6 not specified)])
+-        # A warning will be printed at the end of configure.ac.
+-      else
+-        AC_MSG_RESULT([no])
+-      fi
++      AC_MSG_RESULT([no])
+       svn_lib_berkeley_db=no
+       if test "$bdb_status" = "required"; then
+-        AC_MSG_ERROR([Berkeley DB $db_version or $db_alt_version wasn't found.])
++        AC_MSG_ERROR([Berkeley DB $db_version or newer't found.])
+       fi
+     fi
+   fi
+ ])
+ 
+ 
+-dnl   SVN_LIB_BERKELEY_DB_TRY(major, minor, patch, enable_bdb6)
++dnl   SVN_LIB_BERKELEY_DB_TRY(major, minor, patch)
+ dnl
+ dnl   A subroutine of SVN_LIB_BERKELEY_DB.
+ dnl
+@@ -187,7 +174,6 @@
+     svn_check_berkeley_db_major=$1
+     svn_check_berkeley_db_minor=$2
+     svn_check_berkeley_db_patch=$3
+-    enable_bdb6=$4
+ 
+    if test -z "$SVN_DB_LIBS"; then
+       # We pass --dbm-libs here since Debian has modified apu-config not
+@@ -245,12 +231,6 @@
+       || patch != DB_VERSION_PATCH)
+     exit (1);
+ 
+-  /* Block Berkeley DB 6, because (a) we haven't tested with it, (b) 6.0.20
+-     and newer are under the AGPL, and we want use of AGPL dependencies to be
+-     opt-in. */
+-  if (major >= 6 && strcmp("$enable_bdb6", "yes"))
+-    exit(2);
+-
+   /* Run-time check:  ensure the library claims to be the correct version. */
+ 
+   if (major < $svn_check_berkeley_db_major)
+@@ -270,11 +250,7 @@
+ }
+       ]])],
+       [svn_have_berkeley_db=yes],
+-      [rc=$?
+-       svn_have_berkeley_db=no
+-       if test $rc = 2; then
+-         svn_have_berkeley_db=no6
+-       fi],
++      [svn_have_berkeley_db=no],
+       [svn_have_berkeley_db=yes]
+     )
+ 
diff --git a/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch b/dev-vcs/subversion/files/subversion-1.8.16-javadoc-nolint.patch
new file mode 100644
index 000000000000..8b07d22ca3f4
--- /dev/null
+++ b/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 <https://bugs.gentoo.org/show_bug.cgi?id=551094>
+
+--- 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/dev-vcs/subversion/subversion-1.14.3.ebuild b/dev-vcs/subversion/subversion-1.14.3.ebuild
new file mode 100644
index 000000000000..fa840de5908c
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.14.3.ebuild
@@ -0,0 +1,445 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
+# no py3.12 yet as many tests have invalid escape sequence warnings
+PYTHON_COMPAT=( python3_{10..11} )
+USE_RUBY="ruby31 ruby32"
+
+inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2
+inherit libtool multilib multiprocessing perl-module prefix python-any-r1 ruby-single xdg-utils
+
+MY_P="${P/_/-}"
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="https://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+IUSE="apache2 berkdb debug doc extras keyring java kwallet nls perl plaintext-password-storage ruby sasl test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/lz4
+	>=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.5:1
+	>=dev-libs/apr-util-1.5:1
+	dev-libs/expat
+	>=dev-libs/libutf8proc-2.5.0:=
+	>=net-libs/serf-1.3.4
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	keyring? (
+		dev-libs/glib:2
+		app-crypt/libsecret
+		sys-apps/dbus
+	)
+	kwallet? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/kwallet:5
+		sys-apps/dbus
+	)
+	perl? ( dev-lang/perl:= )
+	ruby? ( ${RUBY_DEPS} )
+	sasl? ( dev-libs/cyrus-sasl )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apache2? (
+		acct-group/apache
+		acct-user/apache
+		www-servers/apache[apache2_modules_dav]
+	)
+	!apache2? (
+		acct-group/svnusers
+		acct-user/svn
+	)
+	java? ( >=virtual/jre-1.8:* )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )
+"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )
+	nls? ( sys-devel/gettext )
+	perl? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch
+	"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+	"${FILESDIR}"/${PN}-1.8.16-javadoc-nolint.patch
+	"${FILESDIR}"/${PN}-1.14.3-ruby-c99.patch
+)
+
+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
+
+	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
+	append-cppflags -P
+
+	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}"
+
+	if use ruby ; then
+		local rbslot
+		RB_VER=""
+		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
+			# No break here as we want to pick the best (latest)
+			if has_version "dev-lang/ruby:${rbslot}" && has_version "virtual/rubygems[ruby_targets_ruby${rbslot/.}(-)]" ; then
+				RB_VER="${rbslot/.}"
+			fi
+		done
+		[[ -z "${RB_VER}" ]] && die "No usable ruby version found"
+	fi
+}
+
+src_prepare() {
+	default
+
+	chmod +x build/transform_libtool_scripts.sh || die
+
+	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!"
+
+	hprefixify build/ac-macros/svn-macros.m4
+
+	eautoconf
+	elibtoolize
+
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		$(use_with apache2 apache-libexecdir)
+		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
+		--without-ctypesgen
+		--disable-runtime-module-search
+		$(use_with keyring gnome-keyring)
+		$(use_enable java javahl)
+		$(use_with java jdk "${JAVA_HOME}")
+		$(use_enable nls)
+		$(use_enable plaintext-password-storage)
+		$(use_with sasl)
+		--with-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
+		--enable-svnxx
+		--without-swig-python
+	)
+
+	if use kwallet ; then
+		myconf+=( "--with-kwallet=/usr/include/:/usr/$(get_libdir)/" )
+	else
+		myconf+=( --without-kwallet )
+	fi
+
+	if use perl; then
+		myconf+=( --with-swig-perl )
+	else
+		myconf+=( --without-swig-perl )
+	fi
+
+	if use ruby; then
+		myconf+=( --with-swig-ruby="${EPREFIX}/usr/bin/ruby${RB_VER}" )
+	else
+		myconf+=( --without-swig-ruby )
+	fi
+
+	if use java ; then
+		myconf+=( --without-junit )
+	fi
+
+	case ${CHOST} in
+		*-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 )
+		;;
+		*)
+			# 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 test; then
+		python_setup
+	fi
+
+	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") \
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake local-all
+
+	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() {
+	# TODO: Maybe run swig tests for each language?
+	#if has_version ~${CATEGORY}/${P} ; then
+		emake -Onone PARALLEL="$(makeopts_jobs)" check
+	#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
+
+	if [[ -f "${S}/fails.log" ]] ; then
+		echo "====== contents of fails.log follow ======"
+		cat "${S}/fails.log" || die
+		echo "====== contents of fails.log end    ======"
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use perl ; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
+		perl_delete_localpod
+		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
+	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 || die
+
+	# Install hot backup script, bug #54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup || die
+
+	# Install svnserve init-script and xinet.d snippet, bug #43245.
+	newinitd "${FILESDIR}"/svnserve.initd3 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
+	if ! use apache2 ; then
+		sed -e "s\USER:-apache\USER:-svn\g" \
+			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
+			-i "${ED}"/etc/init.d/svnserve || die
+		sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED}"/etc/xinetd.d/svnserve || die
+	fi
+
+	# 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}
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/doxygen/html/*
+
+		if use java ; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	cd "${ED}"/usr/share/locale
+	for i in * ; do
+		if [[ ${i} != *${LINGUAS}* ]] ; then
+			rm -r ${i} || die
+		fi
+	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"
+		chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos"
+	fi
+}