diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index ec48feada..62599f39b 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.10.3.tar.bz2 8374465 BLAKE2B 48610f0edec52dad43a4fd971098ed5d8b43a5396fcc3fdaa42af6ff7ce4722300f0c32a342521072abcccbc32e1364a87fc644913cb4a3a21658793f5991234 SHA512 e753c76be2c7a7d1e47ef70a417f33ad48a5076ddbe02062b478b0baf8ce063f101aab3a86895e33f6277f273917b87d8c07b002e3e4f9fe3a750a2f8142ef6d DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92 +DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d diff --git a/dev-vcs/subversion-java/subversion-java-1.10.3.ebuild b/dev-vcs/subversion-java/subversion-java-1.11.1.ebuild similarity index 96% rename from dev-vcs/subversion-java/subversion-java-1.10.3.ebuild rename to dev-vcs/subversion-java/subversion-java-1.11.1.ebuild index d0030ca05..1ec0b76d1 100644 --- a/dev-vcs/subversion-java/subversion-java-1.10.3.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.11.1.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 @@ -29,7 +29,7 @@ IUSE="debug doc nls" COMMON_DEPEND="~dev-vcs/subversion-${PV} >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 - dev-libs/libutf8proc + dev-libs/libutf8proc:= sys-apps/file" RDEPEND=" ${COMMON_DEPEND} @@ -51,6 +51,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index ec48feada..62599f39b 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.10.3.tar.bz2 8374465 BLAKE2B 48610f0edec52dad43a4fd971098ed5d8b43a5396fcc3fdaa42af6ff7ce4722300f0c32a342521072abcccbc32e1364a87fc644913cb4a3a21658793f5991234 SHA512 e753c76be2c7a7d1e47ef70a417f33ad48a5076ddbe02062b478b0baf8ce063f101aab3a86895e33f6277f273917b87d8c07b002e3e4f9fe3a750a2f8142ef6d DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92 +DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d diff --git a/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch b/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch new file mode 100644 index 000000000..6658bd683 --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.9.7-fix-wc-queries-test-test.patch @@ -0,0 +1,26 @@ +https://bugs.gentoo.org/605438 + +--- a/subversion/tests/libsvn_wc/wc-queries-test.c 2019/01/24 10:33:42 1852012 ++++ b/subversion/tests/libsvn_wc/wc-queries-test.c 2019/01/24 10:58:23 1852013 +@@ -670,7 +670,20 @@ + || (item->expression_vars < 1)) + && !is_result_table(item->table)) + { +- if (in_list(primary_key_statements, i)) ++ if (MATCH_TOKEN(item->table, "sqlite_master")) ++ { ++ /* The sqlite_master table does not have an index. ++ Query explanations that say 'SCAN TABLE sqlite_master' ++ will appear if SQLite was compiled with the option ++ SQLITE_ENABLE_STMT_SCANSTATUS, for queries such ++ as 'DROP TABLE foo', but the performance of such ++ statements is not our concern here. */ ++ ++ /* "Slow" statements do expect too see a warning, however. */ ++ if (is_slow_statement(i)) ++ warned = TRUE; ++ } ++ else if (in_list(primary_key_statements, i)) + { + /* Reported as primary key index usage in Sqlite 3.7, + as table scan in 3.8+, while the execution plan is diff --git a/dev-vcs/subversion/subversion-1.10.3.ebuild b/dev-vcs/subversion/subversion-1.11.1.ebuild similarity index 99% rename from dev-vcs/subversion/subversion-1.10.3.ebuild rename to dev-vcs/subversion/subversion-1.11.1.ebuild index 3f97bab46..6eb86d501 100644 --- a/dev-vcs/subversion/subversion-1.10.3.ebuild +++ b/dev-vcs/subversion/subversion-1.11.1.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 @@ -31,7 +31,7 @@ COMMON_DEPEND=" >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat - dev-libs/libutf8proc + dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) @@ -148,6 +148,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch eapply_user fperms +x build/transform_libtool_scripts.sh diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest index ec48feada..62599f39b 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.10.3.tar.bz2 8374465 BLAKE2B 48610f0edec52dad43a4fd971098ed5d8b43a5396fcc3fdaa42af6ff7ce4722300f0c32a342521072abcccbc32e1364a87fc644913cb4a3a21658793f5991234 SHA512 e753c76be2c7a7d1e47ef70a417f33ad48a5076ddbe02062b478b0baf8ce063f101aab3a86895e33f6277f273917b87d8c07b002e3e4f9fe3a750a2f8142ef6d DIST subversion-1.11.0.tar.bz2 8490744 BLAKE2B 27b2172e1ebae5641fc2bc73fd77f479278bc0725645e6bf8f974932e5c313552c508cdeeddce101f12fb983398ff81fd2ca2408950513d4ad0bd2cae4fcf729 SHA512 d73cc800080529b1716a027fd3001d9c963a3cb69619d059498c99426cccc21a2985d1eeb5e1bff8d421fff477a9dff6f9be1c092470152452cf5e7175414e92 +DIST subversion-1.11.1.tar.bz2 8499709 BLAKE2B f14bbe9b28dec32894a8c262d32f36e01c9866352f1c54b5468804e81c1eadb895cbe9e33783a9e7d4a7f54dfa3b25b762015b9ca4886a14628c434254995c77 SHA512 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.10.3.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.11.1.ebuild similarity index 98% rename from www-apache/mod_dav_svn/mod_dav_svn-1.10.3.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.11.1.ebuild index c76d22e38..9327f73e9 100644 --- a/www-apache/mod_dav_svn/mod_dav_svn-1.10.3.ebuild +++ b/www-apache/mod_dav_svn/mod_dav_svn-1.11.1.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 @@ -48,7 +48,7 @@ MY_CDEPS=" >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat - dev-libs/libutf8proc + dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) @@ -111,6 +111,7 @@ pkg_setup() { src_prepare() { eapply "${WORKDIR}/patches" + eapply "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch eapply_user fperms +x build/transform_libtool_scripts.sh