diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index 2d004a41d..7de9f33bc 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.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad diff --git a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild similarity index 96% rename from dev-vcs/subversion-java/subversion-java-1.8.10.ebuild rename to dev-vcs/subversion-java/subversion-java-1.8.13.ebuild index 0445352b0..8053872b4 100644 --- a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.8.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -30,7 +30,8 @@ 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/apr-util-1.3:1 + sys-apps/file" RDEPEND=" ${COMMON_DEPEND} app-arch/bzip2 @@ -49,6 +50,7 @@ pkg_setup() { } src_prepare() { + local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) sab-patches_apply_all epatch_user diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 2d004a41d..7de9f33bc 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.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad diff --git a/dev-vcs/subversion/files/svnserve.initd3 b/dev-vcs/subversion/files/svnserve.initd3 new file mode 100644 index 000000000..2a4fd4b0a --- /dev/null +++ b/dev-vcs/subversion/files/svnserve.initd3 @@ -0,0 +1,21 @@ +#!/sbin/runscript +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd3,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $ + +description="svn server" +pidfile="/var/run/svnserve.pid" +command="/usr/bin/svnserve" +command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}" +command_background="true" +start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}" + +depend() { + need net +} + +start_pre() { + # Ensure that we run from a readable working dir, and that we do not + # lock filesystems when being run from such a location. + cd / +} diff --git a/dev-vcs/subversion/subversion-1.8.10.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild similarity index 95% rename from dev-vcs/subversion/subversion-1.8.10.ebuild rename to dev-vcs/subversion/subversion-1.8.13.ebuild index 57ea4f160..5c3122bb9 100644 --- a/dev-vcs/subversion/subversion-1.8.10.ebuild +++ b/dev-vcs/subversion/subversion-1.8.13.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" @@ -28,21 +28,22 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat + sys-apps/file sys-libs/zlib app-arch/bzip2 - berkdb? ( >=sys-libs/db-4.0.14 ) + berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) + gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-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] ) + ruby? ( >=dev-lang/ruby-2.1:2.1 + dev-ruby/rubygems[ruby_targets_ruby21] ) sasl? ( dev-libs/cyrus-sasl ) 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 @@ -115,6 +116,7 @@ pkg_setup() { } src_prepare() { + local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) sab-patches_apply_all epatch_user @@ -198,9 +200,9 @@ src_configure() { export ac_cv_python_compile="$(tc-getCC)" fi - # force ruby-1.9 + # force ruby-2.1 # allow overriding Python include directory - ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \ + ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \ ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ $(use_with apache2 apache-libexecdir) \ @@ -328,7 +330,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 @@ -344,7 +346,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. @@ -352,7 +355,7 @@ src_install() { rm -fr tools/backup # Install svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd2 svnserve + newinitd "${FILESDIR}"/svnserve.initd3 svnserve newconfd "${FILESDIR}"/svnserve.confd svnserve insinto /etc/xinetd.d newins "${FILESDIR}"/svnserve.xinetd svnserve @@ -414,8 +417,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:" @@ -427,7 +428,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 2d004a41d..7de9f33bc 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.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.8.10.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.8.13.ebuild similarity index 97% rename from www-apache/mod_dav_svn/mod_dav_svn-1.8.10.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.8.13.ebuild index fa3c4ccb9..7408e3604 100644 --- a/www-apache/mod_dav_svn/mod_dav_svn-1.8.10.ebuild +++ b/www-apache/mod_dav_svn/mod_dav_svn-1.8.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -48,9 +48,10 @@ MY_CDEPS=" >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat + sys-apps/file sys-libs/zlib app-arch/bzip2 - berkdb? ( >=sys-libs/db-4.0.14 ) + berkdb? ( >=sys-libs/db-4.0.14:= ) " DEPEND="${MY_CDEPS} @@ -110,6 +111,7 @@ pkg_setup() { } src_prepare() { + local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) sab-patches_apply_all epatch_user @@ -171,9 +173,9 @@ src_configure() { #check newer versions, if this is still/again needed myconf+=" --disable-disallowing-of-undefined-references" - # force ruby-1.9 + # force ruby-2.1 # allow overriding Python include directory - ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \ + ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \ ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ --with-apache-libexecdir \