diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index 62599f39b..0c2aca8a0 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,3 +1,3 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 -DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92 DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d +DIST subversion-1.12.0.tar.bz2 8504473 BLAKE2B 21664158bf48ff1231b8ae25fd70971ee90ded5306bbf29a1e4a105fca9f15c4d8bfa4d7ab33fc5d10f86aa191120a1921d049b1fac6346cc643391a28d84997 SHA512 87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 diff --git a/dev-vcs/subversion-java/subversion-java-1.11.0.ebuild b/dev-vcs/subversion-java/subversion-java-1.12.0.ebuild similarity index 93% rename from dev-vcs/subversion-java/subversion-java-1.11.0.ebuild rename to dev-vcs/subversion-java/subversion-java-1.12.0.ebuild index a73d80bbf..a6c187309 100644 --- a/dev-vcs/subversion-java/subversion-java-1.11.0.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -42,6 +42,9 @@ DEPEND="${COMMON_DEPEND} pkg_setup() { java-pkg-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 @@ -51,6 +54,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${MY_SVN_PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh @@ -93,6 +97,7 @@ src_configure() { --without-jikes --disable-mod-activation --disable-static + --enable-svnxx ) myconf+=( --without-swig ) @@ -129,7 +134,7 @@ src_configure() { #version 1.7.7 again tries to link against the older installed version and fails, when trying to #compile for x86 on amd64, so workaround this issue again #check newer versions, if this is still/again needed - myconf+=( --disable-disallowing-of-undefined-references ) + #myconf+=( --disable-disallowing-of-undefined-references ) econf "${myconf[@]}" } diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 62599f39b..0c2aca8a0 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,3 +1,3 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 -DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92 DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d +DIST subversion-1.12.0.tar.bz2 8504473 BLAKE2B 21664158bf48ff1231b8ae25fd70971ee90ded5306bbf29a1e4a105fca9f15c4d8bfa4d7ab33fc5d10f86aa191120a1921d049b1fac6346cc643391a28d84997 SHA512 87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 diff --git a/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch new file mode 100644 index 000000000..a0da4a593 --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.11.1-allow-apr-1.7.0+.patch @@ -0,0 +1,18 @@ +--- a/build/ac-macros/swig.m4 ++++ b/build/ac-macros/swig.m4 +@@ -137,13 +137,13 @@ + AC_CACHE_CHECK([for apr_int64_t Python/C API format string], + [svn_cv_pycfmt_apr_int64_t], [ + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], ++ AC_EGREP_CPP([MaTcHtHiS +\"ll(\" *\")?d\" +EnDeNd], + [#include + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="L"]) + fi + if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then +- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r ++ AC_EGREP_CPP([MaTcHtHiS +\"l(\" *\")?d\" +EnDeNd],r + [#include + MaTcHtHiS APR_INT64_T_FMT EnDeNd], + [svn_cv_pycfmt_apr_int64_t="l"]) diff --git a/dev-vcs/subversion/subversion-1.11.0.ebuild b/dev-vcs/subversion/subversion-1.12.0.ebuild similarity index 97% rename from dev-vcs/subversion/subversion-1.11.0.ebuild rename to dev-vcs/subversion/subversion-1.12.0.ebuild index 1986f765a..ffabb2c63 100644 --- a/dev-vcs/subversion/subversion-1.11.0.ebuild +++ b/dev-vcs/subversion/subversion-1.12.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby25 ruby24 ruby23" +USE_RUBY="ruby26 ruby25 ruby24" DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" @@ -123,6 +123,9 @@ pkg_setup() { echo -ne "\a" fi + # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739 + append-cppflags -P + if use debug ; then append-cppflags -DSVN_DEBUG -DAP_DEBUG fi @@ -148,6 +151,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh @@ -179,7 +183,7 @@ src_configure() { local myconf=( --libdir="${EPREFIX%/}/usr/$(get_libdir)" $(use_with apache2 apache-libexecdir) - $(use_with apache2 apxs "${APXS}") + $(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}") $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") $(use_enable dso runtime-module-search) @@ -196,6 +200,7 @@ src_configure() { --without-jikes --disable-mod-activation --disable-static + --enable-svnxx ) if use python || use perl || use ruby; then @@ -235,7 +240,7 @@ src_configure() { #version 1.7.7 again tries to link against the older installed version and fails, when trying to #compile for x86 on amd64, so workaround this issue again #check newer versions, if this is still/again needed - myconf+=( --disable-disallowing-of-undefined-references ) + #myconf+=( --disable-disallowing-of-undefined-references ) # for build-time scripts if use ctypes-python || use python || use test; then diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest index 62599f39b..0c2aca8a0 100644 --- a/www-apache/mod_dav_svn/Manifest +++ b/www-apache/mod_dav_svn/Manifest @@ -1,3 +1,3 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 -DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92 DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d +DIST subversion-1.12.0.tar.bz2 8504473 BLAKE2B 21664158bf48ff1231b8ae25fd70971ee90ded5306bbf29a1e4a105fca9f15c4d8bfa4d7ab33fc5d10f86aa191120a1921d049b1fac6346cc643391a28d84997 SHA512 87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13 diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.11.0.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.12.0.ebuild similarity index 97% rename from www-apache/mod_dav_svn/mod_dav_svn-1.11.0.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.12.0.ebuild index cc41cc6f4..7dfa794ef 100644 --- a/www-apache/mod_dav_svn/mod_dav_svn-1.11.0.ebuild +++ b/www-apache/mod_dav_svn/mod_dav_svn-1.12.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -98,6 +98,9 @@ pkg_setup() { # depend.apache_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 @@ -111,6 +114,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${MY_SVN_PN}-1.11.1-allow-apr-1.7.0+.patch eapply_user fperms +x build/transform_libtool_scripts.sh @@ -136,7 +140,7 @@ src_configure() { local myconf=( --libdir="${EPREFIX%/}/usr/$(get_libdir)" --with-apache-libexecdir - --with-apxs="${APXS}" + --with-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 $(use_enable dso runtime-module-search) @@ -153,6 +157,7 @@ src_configure() { --without-jikes --disable-mod-activation --disable-static + --enable-svnxx ) #use python || use perl || use ruby @@ -195,7 +200,7 @@ src_configure() { #version 1.7.7 again tries to link against the older installed version and fails, when trying to #compile for x86 on amd64, so workaround this issue again #check newer versions, if this is still/again needed - myconf+=( --disable-disallowing-of-undefined-references ) + #myconf+=( --disable-disallowing-of-undefined-references ) # allow overriding Python include directory #ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none")