diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index 99f04fb5d..98e52d893 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,3 +1,4 @@ -DIST subversion-1.8.18-patchset.tar.bz2 7407 SHA256 d4a8b4c44286e5ceebce2a4791fd06483eb868df3b20cc941cc358eb1c55b31f SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 WHIRLPOOL adb60234b115e6e2ba2007dd824ab995ac558c8560cf471c9b2e465063a27657d75db32a3946e3652842a3ba9e340aff334ee2e78bb4bf1b43fa610dda5f235e -DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 -DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2 +DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a +DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 +DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 +DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b diff --git a/dev-vcs/subversion-java/subversion-java-1.9.7.ebuild b/dev-vcs/subversion-java/subversion-java-1.10.0.ebuild similarity index 90% rename from dev-vcs/subversion-java/subversion-java-1.9.7.ebuild rename to dev-vcs/subversion-java/subversion-java-1.10.0.ebuild index 650ba68f6..79ab9519e 100644 --- a/dev-vcs/subversion-java/subversion-java-1.9.7.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.10.0.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + WANT_AUTOMAKE="none" MY_P="${P/_/-}" @@ -11,16 +12,14 @@ 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.9.5-Gentoo-patches.tar.gz ) -inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib +inherit autotools flag-o-matic java-pkg-2 libtool ltprune multilib xdg-utils DESCRIPTION="Java bindings for Subversion" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${MY_SVN_PN}-1.10.0_rc1-patches-1.tar.xz" S="${WORKDIR}/${MY_SVN_P/_/-}" -sab-patches_update_SRC_URI - LICENSE="Subversion" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" @@ -30,10 +29,12 @@ 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 sys-apps/file" RDEPEND=" ${COMMON_DEPEND} app-arch/bzip2 + app-arch/lz4 >=virtual/jre-1.5" DEPEND="${COMMON_DEPEND} >=virtual/jdk-1.5" @@ -49,8 +50,8 @@ pkg_setup() { } src_prepare() { - sab-patches_apply_all - default + eapply "${WORKDIR}/patches" + eapply_user fperms +x build/transform_libtool_scripts.sh @@ -67,6 +68,8 @@ src_prepare() { sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ -i build-outputs.mk || die "sed failed" + + xdg_environment_reset } src_configure() { diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 99f04fb5d..98e52d893 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,3 +1,4 @@ -DIST subversion-1.8.18-patchset.tar.bz2 7407 SHA256 d4a8b4c44286e5ceebce2a4791fd06483eb868df3b20cc941cc358eb1c55b31f SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 WHIRLPOOL adb60234b115e6e2ba2007dd824ab995ac558c8560cf471c9b2e465063a27657d75db32a3946e3652842a3ba9e340aff334ee2e78bb4bf1b43fa610dda5f235e -DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 -DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2 +DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a +DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 +DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 +DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b diff --git a/dev-vcs/subversion/subversion-1.9.7.ebuild b/dev-vcs/subversion/subversion-1.10.0.ebuild similarity index 89% rename from dev-vcs/subversion/subversion-1.9.7.ebuild rename to dev-vcs/subversion/subversion-1.10.0.ebuild index 51ce2e2c8..cb6e41525 100644 --- a/dev-vcs/subversion/subversion-1.9.7.ebuild +++ b/dev-vcs/subversion/subversion-1.10.0.ebuild @@ -1,52 +1,62 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + PYTHON_COMPAT=( python2_7 ) USE_RUBY="ruby23 ruby22 ruby21" DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -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 +inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool ltprune multilib perl-module ruby-single xdg-utils MY_P="${P/_/-}" DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz" S="${WORKDIR}/${MY_P}" -sab-patches_update_SRC_URI - LICENSE="Subversion GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" + IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax" COMMON_DEPEND=" app-arch/bzip2 + app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat + dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) + gnome-keyring? ( + dev-libs/glib:2 + gnome-base/libgnome-keyring + sys-apps/dbus + ) http? ( >=net-libs/serf-1.3.4 ) - kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) + kwallet? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kwallet:5 + sys-apps/dbus + ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) sasl? ( dev-libs/cyrus-sasl )" RDEPEND="${COMMON_DEPEND} apache2? ( www-servers/apache[apache2_modules_dav] ) - kwallet? ( || ( - ( >=kde-frameworks/kwallet-5.34.0-r1 ) - ( kde-apps/kwalletd:4 ) - ) ) nls? ( virtual/libintl ) perl? ( dev-perl/URI )" # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once @@ -56,7 +66,10 @@ DEPEND="${COMMON_DEPEND} doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) - kwallet? ( virtual/pkgconfig ) + kwallet? ( + kde-frameworks/kdelibs4support:5 + virtual/pkgconfig + ) nls? ( sys-devel/gettext ) test? ( ${PYTHON_DEPS} )" PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )" @@ -131,8 +144,8 @@ pkg_setup() { } src_prepare() { - sab-patches_apply_all - default + eapply "${WORKDIR}/patches" + eapply_user fperms +x build/transform_libtool_scripts.sh @@ -155,6 +168,8 @@ src_prepare() { S=${S}/subversion/bindings/swig/python python_copy_sources rm -r "${S}"/subversion/bindings/swig/python || die fi + + xdg_environment_reset } src_configure() { @@ -343,7 +358,7 @@ src_install() { if use perl ; then emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl perl_delete_localpod - find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete + find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die fi if use ruby ; then @@ -373,12 +388,14 @@ src_install() { newins "${FILESDIR}"/svnserve.xinetd svnserve #adjust default user and group with disabled apache2 USE flag, bug 381385 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ + if ! use apache2 ; then + sed -e "s\USER:-apache\USER:-svn\g" \ -e "s\GROUP:-apache\GROUP:-svnusers\g" \ -i "${ED%/}"/etc/init.d/svnserve || die - use apache2 || sed -e "0,/apache/s//svn/" \ + sed -e "0,/apache/s//svn/" \ -e "s:apache:svnusers:" \ -i "${ED%/}"/etc/xinetd.d/svnserve || die + fi # Install documentation. dodoc CHANGES COMMITTERS README @@ -395,7 +412,7 @@ src_install() { emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr + find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr rm -fr tools/client-side/svnmucc rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* rm -fr tools/{buildbot,dev,diff,po} @@ -414,14 +431,16 @@ src_install() { cd "${ED%/}"/usr/share/locale for i in * ; do - [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; } + if [[ ${i} != *${LINGUAS}* ]] ; then + rm -r ${i} || die + fi done } pkg_preinst() { # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then + OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then CHANGED_BDB_VERSION="1" @@ -456,11 +475,11 @@ pkg_config() { einfo "Populating repository directory..." # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" + "${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" + SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" + SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" if use apache2 ; then [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest index 99f04fb5d..98e52d893 100644 --- a/www-apache/mod_dav_svn/Manifest +++ b/www-apache/mod_dav_svn/Manifest @@ -1,3 +1,4 @@ -DIST subversion-1.8.18-patchset.tar.bz2 7407 SHA256 d4a8b4c44286e5ceebce2a4791fd06483eb868df3b20cc941cc358eb1c55b31f SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 WHIRLPOOL adb60234b115e6e2ba2007dd824ab995ac558c8560cf471c9b2e465063a27657d75db32a3946e3652842a3ba9e340aff334ee2e78bb4bf1b43fa610dda5f235e -DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 -DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2 +DIST subversion-1.10.0.tar.bz2 8369823 BLAKE2B a8496959d838f6a0a9046913768e2090d7c46e2ac91f0360c2287a7b91c19e4cf5eae1a4421f79ceb2be4b998ee47735b22f5c22947992ff736a8d743f819556 SHA512 26e49c961d54c4e78067caa202f384c36544e0ce7506abbffe73e59186ac34559a70cbd6c0934ed47dcc5c3580fce0f0cc2ef14b77695c26e8dbbc6358d1ec6a +DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2 +DIST subversion-1.8.18-patchset.tar.bz2 7407 BLAKE2B dc3b6d80dfdf4c6cc30f1663c8cee3eebc4f42d433c3965d8b309f9cc79c31b566a74cf43b3b04037c2498b6a2bffe2c60953c5cfb25aec61a8e4a7e928efcae SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 +DIST subversion-1.9.7.tar.bz2 7881909 BLAKE2B 004a180780e00f5af80e14586dee799bae07dccde7f240a51594590b1a084f3054b5b4d917d5e47e0b6ffb11097ecfb97fff490f6d31c0532f2aae8cd9d10031 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.9.7.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.10.0.ebuild similarity index 91% rename from www-apache/mod_dav_svn/mod_dav_svn-1.9.7.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.10.0.ebuild index 07522eb15..547ce013d 100644 --- a/www-apache/mod_dav_svn/mod_dav_svn-1.9.7.ebuild +++ b/www-apache/mod_dav_svn/mod_dav_svn-1.10.0.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 + WANT_AUTOMAKE="none" MY_P="${P/_/-}" @@ -9,16 +10,14 @@ 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.9.5-Gentoo-patches.tar.gz ) -inherit sab-patches autotools db-use depend.apache eutils flag-o-matic libtool multilib eutils +inherit autotools db-use depend.apache flag-o-matic libtool multilib xdg-utils DESCRIPTION="Subversion WebDAV support" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2 + https://dev.gentoo.org/~polynomial-c/${MY_SVN_PN}-1.10.0_rc1-patches-1.tar.xz" S="${WORKDIR}/${MY_SVN_P}" -sab-patches_update_SRC_URI - LICENSE="Subversion" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" @@ -44,10 +43,12 @@ IUSE="berkdb debug +dso nls sasl" MY_CDEPS=" ~dev-vcs/subversion-${PV}[berkdb=,debug=,dso=,nls=,sasl=,http] app-arch/bzip2 + app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat + dev-libs/libutf8proc sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) @@ -57,7 +58,6 @@ DEPEND="${MY_CDEPS} >=net-libs/serf-1.3.4 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig - !!