summaryrefslogtreecommitdiff
path: root/dev-vcs/subversion
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/subversion')
-rw-r--r--dev-vcs/subversion/Manifest8
-rw-r--r--dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch28
-rw-r--r--dev-vcs/subversion/files/subversion-1.14.5-kf6wallet.patch69
-rw-r--r--dev-vcs/subversion/subversion-1.14.3.ebuild445
-rw-r--r--dev-vcs/subversion/subversion-1.14.5-r1.ebuild7
-rw-r--r--dev-vcs/subversion/subversion-1.14.5-r2.ebuild (renamed from dev-vcs/subversion/subversion-1.14.5.ebuild)17
6 files changed, 87 insertions, 487 deletions
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index dad5feab06ec..011c9864bb8b 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,5 +1,5 @@
AUX 47_mod_dav_svn.conf 422 BLAKE2B 505c5f7f5c2eba9951b1337d452fde8e2b51351d2af0a4e620e86ce95aa2520460b7e353e5465edc15dc284a17b0770806ba97bb91c3d4a8451f3818d49c8469 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d
-AUX subversion-1.14.3-ruby-c99.patch 1023 BLAKE2B ebd735e4ba48f30c34e15e514720dd39da8fe0ceb8fa8b88b5060a7c2ca521926b3f4003601ac7519e99c28bc56a5a5126cb97d5063b3e610792e43618c68529 SHA512 02e7fcb7c7239ba7344d03e86557932f4e03ca7ae71df5c66a72ffc65315d234554bd429edbc1553c1ea847867e6424f1af8e938ae6604338f67416f87717539
+AUX subversion-1.14.5-kf6wallet.patch 2767 BLAKE2B 2bf7a2cf66fe9c284950045cf2aa4cf87d1115de41988e2fd47b19e8769513f1bb7cc62baacc4ed114098fafc3311de0045c27a26dabcbb2ed6c848e58ef7711 SHA512 452ef2cfd5e0b41dd2e2ad70cee9f6eb6fb2b86a40c4cae99cce54c8efe1e5c8620b99ee2aa31c1323ce47382944177e599979e67c531871d2673bf03e0d5296
AUX subversion-1.14.5-no-unaligned.patch 617 BLAKE2B 0cff974d0042bdeca432f786d704f3cf1db3219501a480081584d4eb70cea51e7b73a498d451783bfc187594e09c9daaaaa6939e197b93d67247251500cedaf0 SHA512 e8d805a6f005db6768920d7ae40e2443440710cba3282d7684ece41890d44cd7bd1e42f14bfe43dc1eb6031fb999660d98850035b18cb395700dd74a45e4b340
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
@@ -7,9 +7,7 @@ AUX subversion-1.8.16-javadoc-nolint.patch 688 BLAKE2B 08f59a5f86c3465ab839b2e4d
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.14.3.tar.bz2 8569985 BLAKE2B bc366a611f77d7dc3a5dc6015ea50b8daae0cffc20f8830de04a7f310a26ab9e955db343e7902475079d31d7984cb6b03f7810e71feae9a5374e1cb690933b49 SHA512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41
DIST subversion-1.14.5.tar.bz2 8675355 BLAKE2B d5650c50b345938bb012bc942958a7a23cc6de030f2f005b6caa43afe39f0ba6f3ad4d733b13eb746ab08bf8de491f0a56cc5700dd64e02e6f74f393a5dd293b SHA512 e4800564d0cc68be98f19aa58d89181de83f237f0ccff10824d9237f8c65eb0071f7176ac54e9e8f8ecbf685849bd3e94be48f678f4c23ed6a5fd7fb6edd0321
-EBUILD subversion-1.14.3.ebuild 12723 BLAKE2B 268081fcdaf22e3d3396ee6e0888dddcac5a9a0f014289083af123f59dddba57dde70f454acd6327d7d6177d4b7f6a68313e9d88deb1d3e188f0b28a66cb2591 SHA512 d01afca9083e28210a1300fbbc4b6466c07df24deb05b20a16be67eae7fbe48ee14032464cc79578a23c03971d30b27bbabd3273ad548b860298e3efcf80126b
-EBUILD subversion-1.14.5-r1.ebuild 12752 BLAKE2B 056946c9929549fedecb640c6ac6cc3379d31c7adecf2c667bbe1bc52b98de71a4f1bdafa770673ba549565c0988fb4552b3ea2b622d54543f6b87dedc4602cf SHA512 43597f4b59047a8d4468d396ae842675d9832e3c5d97a173abcaeb9df8cf385257938b4e8cdeebdfe8d8f68e2fee33310be8185645f8c2238d966cc1c9228e42
-EBUILD subversion-1.14.5.ebuild 12705 BLAKE2B a7385063b3ea19bfeb36ca066a2822d712f2056d11092dcfcfc09e741471a3e9ab540be0e69aed223d983f7aad95bb0b88ecde7448a21572d31345a355a6bb7b SHA512 98a64f81871b81740b34f7547f92cf168f8c3c70c536b9cff1f5f9eb948f7cb62871c6f61235eb0ca93fb5eed6732914d817848ced9f94a44d9192a7d2149bca
+EBUILD subversion-1.14.5-r1.ebuild 12803 BLAKE2B 11128b982a2f2b76a805cf4efa2b919c025d0b7d853423c5e7646e4ccc9e04801c8ba361974d4cf67c2597faa1ea2fb49e7d3a8a711749a9fd895063ec07aaa9 SHA512 c2eadb280d53ba4bcbf4356aadb37ab64cff7b4a0e8849b23ae9cd4467f0ff557bdb3b9ec30bf16e9b8e1205f38667abd68491ba6eb847e1a6f5fcfa95662e19
+EBUILD subversion-1.14.5-r2.ebuild 12858 BLAKE2B 8e7c0247c78bef029fcf6f8680406337a27238e5b65ba83bab01651a334cb8bfdd9c971406863cfe15f79a588af99b6c63db0b5c521326f5279ebec066300cc9 SHA512 5a97f20da60af8e5c6b76e7438a3b7e1f2432acec8c6f7389a86eb38f70911dd66277040a1b9a94dd7f78c8ff2320a8ec1ddebb18d4675fcc262da4ab6d6589c
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
deleted file mode 100644
index 161984f978f9..000000000000
--- a/dev-vcs/subversion/files/subversion-1.14.3-ruby-c99.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.14.5-kf6wallet.patch b/dev-vcs/subversion/files/subversion-1.14.5-kf6wallet.patch
new file mode 100644
index 000000000000..8749ba7dac29
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.14.5-kf6wallet.patch
@@ -0,0 +1,69 @@
+From 0ac4a3d1cbae68abef3a66e5f546538836220c6f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 25 Apr 2025 21:52:05 +0200
+Subject: [PATCH 1/2] kwallet.m4: Add Qt6/KF6 option
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ build/ac-macros/kwallet.m4 | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/build/ac-macros/kwallet.m4 b/build/ac-macros/kwallet.m4
+index ee5b5e5..42ece51 100644
+--- a/build/ac-macros/kwallet.m4
++++ b/build/ac-macros/kwallet.m4
+@@ -26,7 +26,7 @@ AC_DEFUN(SVN_LIB_KWALLET,
+ [
+ AC_ARG_WITH(kwallet,
+ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]],
+- [Enable use of KWallet (KDE 5 or 4) for auth credentials.
++ [Enable use of KWallet (KF6, KF5 or KDELibs4) for auth credentials.
+ PATH is the KDE install path, alternatively INCDIR:LIBDIR
+ are the header and library install paths. ])],
+ [svn_lib_kwallet="$withval"],
+@@ -45,7 +45,14 @@ AC_DEFUN(SVN_LIB_KWALLET,
+ if test -n "$PKG_CONFIG"; then
+ if test "$HAVE_DBUS" = "yes"; then
+ AC_MSG_CHECKING([for Qt])
+- if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then
++ if $PKG_CONFIG --exists Qt6Core Qt6DBus Qt6Gui; then
++ AC_MSG_RESULT([yes, Qt6])
++ qt_pkg_config_names="Qt6Core Qt6DBus Qt6Gui"
++ kde_config_name=""
++ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 or higher available])
++ kde_inc_names="KF6/KWallet KF6/KCoreAddons KF6/KI18n"
++ kde_lib_names="-lKF6Wallet -lKF6I18n -lKF6CoreAddons -lQt6Gui -lQt6DBus -lQt6Core"
++ elif $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then
+ AC_MSG_RESULT([yes, Qt5])
+ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui"
+ kde_config_name="kf5-config"
+--
+2.49.0
+
+
+From 0f7d4784e0f09441a2d598dabd4cbcabbcbe5cab Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 25 Apr 2025 22:12:47 +0200
+Subject: [PATCH 2/2] C++17
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ build/ac-macros/compiler.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/ac-macros/compiler.m4 b/build/ac-macros/compiler.m4
+index 53185b7..bd51ffe 100644
+--- a/build/ac-macros/compiler.m4
++++ b/build/ac-macros/compiler.m4
+@@ -102,7 +102,7 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
+ if test "$GXX" = "yes"; then
+ dnl Find flags to force C++98 mode
+ dnl g++ and clang++
+- SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
++ SVN_CXXFLAGS_ADD_IFELSE([-std=c++17])
+ fi
+
+ CXXMODEFLAGS="$CXXFLAGS"
+--
+2.49.0
+
diff --git a/dev-vcs/subversion/subversion-1.14.3.ebuild b/dev-vcs/subversion/subversion-1.14.3.ebuild
deleted file mode 100644
index 0219731aca41..000000000000
--- a/dev-vcs/subversion/subversion-1.14.3.ebuild
+++ /dev/null
@@ -1,445 +0,0 @@
-# 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 ~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
-}
diff --git a/dev-vcs/subversion/subversion-1.14.5-r1.ebuild b/dev-vcs/subversion/subversion-1.14.5-r1.ebuild
index 1f1d9f222638..4bed93f23a48 100644
--- a/dev-vcs/subversion/subversion-1.14.5-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.5-r1.ebuild
@@ -14,13 +14,16 @@ inherit libtool multilib multiprocessing perl-module prefix python-any-r1 ruby-s
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
+SRC_URI="
+ mirror://apache/${PN}/${MY_P}.tar.bz2
+ https://archive.apache.org/dist/${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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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 )"
diff --git a/dev-vcs/subversion/subversion-1.14.5.ebuild b/dev-vcs/subversion/subversion-1.14.5-r2.ebuild
index 8ad930893a53..23287ac835d8 100644
--- a/dev-vcs/subversion/subversion-1.14.5.ebuild
+++ b/dev-vcs/subversion/subversion-1.14.5-r2.ebuild
@@ -14,7 +14,10 @@ inherit libtool multilib multiprocessing perl-module prefix python-any-r1 ruby-s
MY_P="${P/_/-}"
DESCRIPTION="Advanced version control system"
HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
+SRC_URI="
+ mirror://apache/${PN}/${MY_P}.tar.bz2
+ https://archive.apache.org/dist/${PN}/${MY_P}.tar.bz2
+"
S="${WORKDIR}/${MY_P}"
LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
@@ -43,12 +46,10 @@ COMMON_DEPEND="
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
+ dev-qt/qtbase:6[dbus,gui]
+ kde-frameworks/kcoreaddons:6
+ kde-frameworks/ki18n:6
+ kde-frameworks/kwallet:6
sys-apps/dbus
)
perl? ( dev-lang/perl:= )
@@ -88,6 +89,8 @@ 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.5-no-unaligned.patch
+ "${FILESDIR}"/${PN}-1.14.5-kf6wallet.patch # bug 950751; TODO: upstream
)
want_apache
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 16:40:46 +0000