diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index f939d7430..506337cd7 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,3 +1,4 @@ -DIST subversion-1.8.14.tar.bz2 6850562 SHA256 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f SHA512 95e1501494f5355f0c331fbe81422ca8f0b4d69e6d303125f4a5aac5f6fe946e958ca76fc96fe6b096cc0a530634ca103bf35622c12af90489ae17d0b9a9d987 WHIRLPOOL 0323746d40830109e081e002f499f1c73c15fe77acd4f1c9b790ae12440b3361d189f1d5212d49ba6f6c449297aec3513761375f748800686892607705310a56 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad DIST subversion-1.9.4.tar.bz2 7911473 SHA256 1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299 SHA512 fa512d8315dd6a435dcc5a3c2ca3cd7cf932364dd3a82063be868aa3ebcc04caf87cd3ff732d3e3d8aec86f3f58848e2b55987451d4697479bb151d1269db07f WHIRLPOOL 0323e5258be08dfdacb0e450b413bdfd053c0026a290dd45cfe5a03437c727d9ad088baba5a42fdd98ff47af5bdc09a0bbeba70a1e4e4e19a8ebcba7e7b7ddd3 +DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 +DIST subversion-1.9.5.tar.bz2 7904861 SHA256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 SHA512 ff7241ffae2506e97f40011242b5d5c6fa665f5463743f9acc52136b59ad84b6db00b60e70c44a9060579db49b818db06da1d1352aaee78e5bfe6ce56f32a2cf WHIRLPOOL 37a124dc2f99bb465b47083de168530f8178305e3208972d56c2c29a93bbf73ded816f742808cf9e7a5d3f13690e48cdd9f800abd85452ad1da4c13d603454f3 diff --git a/dev-vcs/subversion-java/metadata.xml b/dev-vcs/subversion-java/metadata.xml index 76865e8f6..e14fe3de5 100644 --- a/dev-vcs/subversion-java/metadata.xml +++ b/dev-vcs/subversion-java/metadata.xml @@ -1,7 +1,7 @@ - + slawomir.nizio@sabayon.org Maintainer for split subversion-java ebuild. diff --git a/dev-vcs/subversion-java/subversion-java-1.8.14-r1.ebuild b/dev-vcs/subversion-java/subversion-java-1.9.5.ebuild similarity index 86% rename from dev-vcs/subversion-java/subversion-java-1.8.14-r1.ebuild rename to dev-vcs/subversion-java/subversion-java-1.9.5.ebuild index dc40308fc..934404dc0 100644 --- a/dev-vcs/subversion-java/subversion-java-1.8.14-r1.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}" MY_SVN_CATEGORY="${CATEGORY}" # note: java-pkg-2, not java-pkt-opt-2 -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) +SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.9.5-Gentoo-patches.tar.gz ) inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib DESCRIPTION="Java bindings for Subversion" @@ -50,9 +50,7 @@ pkg_setup() { } src_prepare() { - local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) sab-patches_apply_all - epatch_user fperms +x build/transform_libtool_scripts.sh @@ -72,10 +70,10 @@ src_prepare() { } src_configure() { - local myconf + local myconf=() - myconf+=" --without-swig" - myconf+=" --without-junit" + myconf+=( --without-swig ) + myconf+=( --without-junit ) case ${CHOST} in *-aix*) @@ -84,27 +82,27 @@ src_configure() { ;; *-interix*) # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" + myconf+=( --disable-local-library-preloading ) ;; *-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" + myconf+=( --disable-local-library-preloading ) ;; *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" + myconf+=( --enable-all-static --disable-local-library-preloading ) ;; *) # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" + 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" + myconf+=( --disable-disallowing-of-undefined-references ) econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ --without-apache-libexecdir \ @@ -119,7 +117,7 @@ src_configure() { $(use_enable nls) \ --without-sasl \ --without-serf \ - ${myconf} \ + ${myconf[@]} \ --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ --disable-experimental-libtool \ diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index f939d7430..506337cd7 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,3 +1,4 @@ -DIST subversion-1.8.14.tar.bz2 6850562 SHA256 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f SHA512 95e1501494f5355f0c331fbe81422ca8f0b4d69e6d303125f4a5aac5f6fe946e958ca76fc96fe6b096cc0a530634ca103bf35622c12af90489ae17d0b9a9d987 WHIRLPOOL 0323746d40830109e081e002f499f1c73c15fe77acd4f1c9b790ae12440b3361d189f1d5212d49ba6f6c449297aec3513761375f748800686892607705310a56 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad DIST subversion-1.9.4.tar.bz2 7911473 SHA256 1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299 SHA512 fa512d8315dd6a435dcc5a3c2ca3cd7cf932364dd3a82063be868aa3ebcc04caf87cd3ff732d3e3d8aec86f3f58848e2b55987451d4697479bb151d1269db07f WHIRLPOOL 0323e5258be08dfdacb0e450b413bdfd053c0026a290dd45cfe5a03437c727d9ad088baba5a42fdd98ff47af5bdc09a0bbeba70a1e4e4e19a8ebcba7e7b7ddd3 +DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 +DIST subversion-1.9.5.tar.bz2 7904861 SHA256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 SHA512 ff7241ffae2506e97f40011242b5d5c6fa665f5463743f9acc52136b59ad84b6db00b60e70c44a9060579db49b818db06da1d1352aaee78e5bfe6ce56f32a2cf WHIRLPOOL 37a124dc2f99bb465b47083de168530f8178305e3208972d56c2c29a93bbf73ded816f742808cf9e7a5d3f13690e48cdd9f800abd85452ad1da4c13d603454f3 diff --git a/dev-vcs/subversion/files/svnserve.initd3 b/dev-vcs/subversion/files/svnserve.initd3 index 1236cf56b..28a69f3d0 100644 --- a/dev-vcs/subversion/files/svnserve.initd3 +++ b/dev-vcs/subversion/files/svnserve.initd3 @@ -1,4 +1,4 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later # $Id$ diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml index aa158f77d..9adf7e58b 100644 --- a/dev-vcs/subversion/metadata.xml +++ b/dev-vcs/subversion/metadata.xml @@ -1,7 +1,7 @@ - + slawomir.nizio@sabayon.org Maintainer of the split Subversion ebuild. diff --git a/dev-vcs/subversion/subversion-1.8.14-r1.ebuild b/dev-vcs/subversion/subversion-1.9.5.ebuild similarity index 90% rename from dev-vcs/subversion/subversion-1.8.14-r1.ebuild rename to dev-vcs/subversion/subversion-1.9.5.ebuild index 8b8201ce2..d591ab9ec 100644 --- a/dev-vcs/subversion/subversion-1.8.14-r1.ebuild +++ b/dev-vcs/subversion/subversion-1.9.5.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby23 ruby22 ruby21 ruby20" DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils +SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.9.5-Gentoo-patches.tar.gz ) +inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic libtool multilib perl-module ruby-single MY_P="${P/_/-}" DESCRIPTION="Advanced version control system" @@ -34,13 +35,12 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12 berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) 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 ) + kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) - ruby? ( >=dev-lang/ruby-2.1:2.1 - dev-ruby/rubygems[ruby_targets_ruby21] ) + ruby? ( ${RUBY_DEPS} ) sasl? ( dev-libs/cyrus-sasl ) - http? ( >=net-libs/serf-1.2.1 )" + http? ( >=net-libs/serf-1.3.4 )" RDEPEND="${COMMON_DEPEND} apache2? ( www-servers/apache[apache2_modules_dav] ) kde? ( kde-apps/kwalletd:4 ) @@ -113,12 +113,22 @@ pkg_setup() { # 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 + if has_version dev-lang/ruby:${rbslot} ; then + RB_VER="${rbslot/.}" + break + fi + done + [[ -z "${RB_VER}" ]] && die "No useable ruby version found" + fi } src_prepare() { - local SAB_PATCHES_SKIP=( subversion-1.8.9-po_fixes.patch ) sab-patches_apply_all - epatch_user fperms +x build/transform_libtool_scripts.sh @@ -137,14 +147,6 @@ src_prepare() { -i build-outputs.mk || die "sed failed" if use python ; then - if [[ ${CHOST} == *-darwin* ]] ; then - # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E - # in short, we don't have gnome-keyring stuff here, patch - # borrowed from MacPorts - die "Darwin not supported; use Gentoo ebuild" # no need to bother with the patch for our needs - #epatch "${FILESDIR}"/...swig-python-no-gnome-keyring.patch - fi - # XXX: make python_copy_sources accept path S=${S}/subversion/bindings/swig/python python_copy_sources rm -r "${S}"/subversion/bindings/swig/python || die @@ -152,12 +154,12 @@ src_prepare() { } src_configure() { - local myconf + local myconf=() if use python || use perl || use ruby; then - myconf+=" --with-swig" + myconf+=( --with-swig ) else - myconf+=" --without-swig" + myconf+=( --without-swig ) fi case ${CHOST} in @@ -167,31 +169,31 @@ src_configure() { ;; *-interix*) # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" + myconf+=( --disable-local-library-preloading ) ;; *-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" + myconf+=( --disable-local-library-preloading ) ;; *-mint*) - myconf+=" --enable-all-static --disable-local-library-preloading" + myconf+=( --enable-all-static --disable-local-library-preloading ) ;; *) # inject LD_PRELOAD entries for easy in-tree development - myconf+=" --enable-local-library-preloading" + 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" + myconf+=( --disable-disallowing-of-undefined-references ) # for build-time scripts if use ctypes-python || use python || use test; then - python_export_best + python_setup fi if use python && [[ ${CHOST} == *-darwin* ]] ; then @@ -200,10 +202,9 @@ src_configure() { export ac_cv_python_compile="$(tc-getCC)" fi - # force ruby-2.1 # allow overriding Python include directory - ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none") \ - ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "none") \ + 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") \ ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ $(use_with apache2 apache-libexecdir) \ @@ -217,7 +218,7 @@ src_configure() { $(use_enable nls) \ $(use_with sasl) \ $(use_with http serf) \ - ${myconf} \ + ${myconf[@]} \ --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ --disable-experimental-libtool \ @@ -395,14 +396,15 @@ EOF fi if use doc ; then - dohtml -r doc/doxygen/html/* + docinto html + dodoc -r doc/doxygen/html/* fi prune_libtool_files --all cd "${ED}"usr/share/locale for i in * ; do - [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; } + [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; } done } diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest index f939d7430..506337cd7 100644 --- a/www-apache/mod_dav_svn/Manifest +++ b/www-apache/mod_dav_svn/Manifest @@ -1,3 +1,4 @@ -DIST subversion-1.8.14.tar.bz2 6850562 SHA256 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f SHA512 95e1501494f5355f0c331fbe81422ca8f0b4d69e6d303125f4a5aac5f6fe946e958ca76fc96fe6b096cc0a530634ca103bf35622c12af90489ae17d0b9a9d987 WHIRLPOOL 0323746d40830109e081e002f499f1c73c15fe77acd4f1c9b790ae12440b3361d189f1d5212d49ba6f6c449297aec3513761375f748800686892607705310a56 DIST subversion-1.8.9-Gentoo-patches.tar.gz 3179 SHA256 95847de918a22c51120ead7695034b587a4654c78d1ac18c26f1be891ffe8ffa SHA512 4f4ad2b900b25c3dfe72a0a41097402e0f96d6c12ab410c595262d586be37c7284a1b38b013aaf20bbed301704b2676b4f6e80544039b1ef47071049704131b8 WHIRLPOOL be5d33bd34bfea2a6f4b1e002522bb51407042e2ea5c8bf0beb2c8185238df4567eceeda993fd6b13b3022499e338da66483c044e5480f3f455b0cc12d705aad DIST subversion-1.9.4.tar.bz2 7911473 SHA256 1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299 SHA512 fa512d8315dd6a435dcc5a3c2ca3cd7cf932364dd3a82063be868aa3ebcc04caf87cd3ff732d3e3d8aec86f3f58848e2b55987451d4697479bb151d1269db07f WHIRLPOOL 0323e5258be08dfdacb0e450b413bdfd053c0026a290dd45cfe5a03437c727d9ad088baba5a42fdd98ff47af5bdc09a0bbeba70a1e4e4e19a8ebcba7e7b7ddd3 +DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 +DIST subversion-1.9.5.tar.bz2 7904861 SHA256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 SHA512 ff7241ffae2506e97f40011242b5d5c6fa665f5463743f9acc52136b59ad84b6db00b60e70c44a9060579db49b818db06da1d1352aaee78e5bfe6ce56f32a2cf WHIRLPOOL 37a124dc2f99bb465b47083de168530f8178305e3208972d56c2c29a93bbf73ded816f742808cf9e7a5d3f13690e48cdd9f800abd85452ad1da4c13d603454f3 diff --git a/www-apache/mod_dav_svn/metadata.xml b/www-apache/mod_dav_svn/metadata.xml new file mode 100644 index 000000000..c17720146 --- /dev/null +++ b/www-apache/mod_dav_svn/metadata.xml @@ -0,0 +1,11 @@ + + + + + slawomir.nizio@sabayon.org + Maintainer for split subversion-java ebuild. + + + Enable runtime module search + + diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.8.14-r1.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.9.5.ebuild similarity index 97% rename from www-apache/mod_dav_svn/mod_dav_svn-1.8.14-r1.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.9.5.ebuild index ff97eb38c..53938514e 100644 --- a/www-apache/mod_dav_svn/mod_dav_svn-1.8.14-r1.ebuild +++ b/www-apache/mod_dav_svn/mod_dav_svn-1.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,8 +10,8 @@ MY_SVN_PN="subversion" MY_SVN_P="${MY_SVN_PN}-${PV}" MY_SVN_PF="${MY_SVN_PN}-${PVR}" -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.8.9-Gentoo-patches.tar.gz ) -inherit sab-patches autotools db-use depend.apache flag-o-matic libtool multilib eutils +SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.9.5-Gentoo-patches.tar.gz ) +inherit sab-patches autotools db-use depend.apache eutils flag-o-matic libtool multilib eutils DESCRIPTION="Subversion WebDAV support" HOMEPAGE="http://subversion.apache.org/" @@ -56,7 +56,7 @@ MY_CDEPS=" DEPEND="${MY_CDEPS} sasl? ( dev-libs/cyrus-sasl ) - >=net-libs/serf-1.2.1 + >=net-libs/serf-1.3.4 virtual/pkgconfig !!