From a4e4fa6f5cdecba94c22c9bb3b1ec152c8945e1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Sat, 20 Dec 2014 17:50:07 +0100 Subject: [PATCH] [dev-vcs/subversion*,www-apache/mod_dav_svn] v. bump to 1.8.11 --- dev-vcs/subversion-java/Manifest | 2 +- ...9.ebuild => subversion-java-1.8.11.ebuild} | 0 dev-vcs/subversion/Manifest | 2 +- ...-1.8.9.ebuild => subversion-1.8.11.ebuild} | 68 ++++++++++--------- www-apache/mod_dav_svn/Manifest | 2 +- ...1.8.9.ebuild => mod_dav_svn-1.8.11.ebuild} | 0 6 files changed, 39 insertions(+), 35 deletions(-) rename dev-vcs/subversion-java/{subversion-java-1.8.9.ebuild => subversion-java-1.8.11.ebuild} (100%) rename dev-vcs/subversion/{subversion-1.8.9.ebuild => subversion-1.8.11.ebuild} (93%) rename www-apache/mod_dav_svn/{mod_dav_svn-1.8.9.ebuild => mod_dav_svn-1.8.11.ebuild} (100%) diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index 3453fd157..2d004a41d 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,3 +1,3 @@ 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 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad -DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf diff --git a/dev-vcs/subversion-java/subversion-java-1.8.9.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild similarity index 100% rename from dev-vcs/subversion-java/subversion-java-1.8.9.ebuild rename to dev-vcs/subversion-java/subversion-java-1.8.11.ebuild diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 3453fd157..2d004a41d 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,3 +1,3 @@ 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 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad -DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf diff --git a/dev-vcs/subversion/subversion-1.8.9.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild similarity index 93% rename from dev-vcs/subversion/subversion-1.8.9.ebuild rename to dev-vcs/subversion/subversion-1.8.11.ebuild index 38dbdb35e..45cfaf9a4 100644 --- a/dev-vcs/subversion/subversion-1.8.9.ebuild +++ b/dev-vcs/subversion/subversion-1.8.11.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 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 ) + perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( >=dev-lang/ruby-1.9.3:1.9 dev-ruby/rubygems[ruby_targets_ruby19] ) @@ -40,7 +40,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 http? ( >=net-libs/serf-1.2.1 )" RDEPEND="${COMMON_DEPEND} apache2? ( www-servers/apache[apache2_modules_dav] ) - kde? ( kde-base/kwalletd ) + 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 @@ -58,7 +58,10 @@ PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )" REQUIRED_USE=" ctypes-python? ( ${PYTHON_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) - test? ( ${PYTHON_REQUIRED_USE} )" + test? ( + ${PYTHON_REQUIRED_USE} + !dso + )" want_apache @@ -265,31 +268,33 @@ src_compile() { } src_test() { - if ! has_version ~${CATEGORY}/${P} ; then + 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." - fi - - 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 + ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*" + ewarn "before running the test suite." + ewarn "Test suite skipped." fi } @@ -321,7 +326,7 @@ src_install() { if use perl ; then emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl - fixlocalpod + perl_delete_localpod find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete fi @@ -337,7 +342,8 @@ src_install() { fi # Install Bash Completion, bug 43179. - newbashcomp tools/client-side/bash_completion subversion + 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. @@ -407,8 +413,6 @@ pkg_preinst() { } pkg_postinst() { - use perl && perl-module_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:" @@ -420,7 +424,7 @@ pkg_postinst() { } pkg_postrm() { - use perl && perl-module_pkg_postrm + : } pkg_config() { diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest index 3453fd157..2d004a41d 100644 --- a/www-apache/mod_dav_svn/Manifest +++ b/www-apache/mod_dav_svn/Manifest @@ -1,3 +1,3 @@ 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 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad -DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.8.9.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.8.11.ebuild similarity index 100% rename from www-apache/mod_dav_svn/mod_dav_svn-1.8.9.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.8.11.ebuild