sablink/sablink-distro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[dev-vcs/subversion*,www-apache/mod_dav_svn] version bump to 1.9.4

Browse Source
This commit is contained in:
Sławomir Nizio
2016-07-30 16:51:58 +02:00
parent 15e887d827
commit da03ec79a7
6 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-vcs/subversion-java/Manifest
+1 -1
View File
@@ -1,3 +1,3 @@
DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4
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
dev-vcs/subversion-java/subversion-java-1.8.13.ebuild → dev-vcs/subversion-java/subversion-java-1.9.4.ebuild
+10 -11
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -52,7 +52,6 @@ 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 +71,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 +83,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 +118,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 \
dev-vcs/subversion/Manifest
+1 -1
View File
@@ -1,3 +1,3 @@
DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4
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
dev-vcs/subversion/subversion-1.8.13.ebuild → dev-vcs/subversion/subversion-1.9.4.ebuild
+35 -31
View File
@@ -1,15 +1,16 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 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
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"
@@ -37,25 +38,24 @@ COMMON_DEPEND=">=dev-db/sqlite-3.7.12
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:= )
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 kde-base/kwalletd ) )
kde? ( kde-apps/kwalletd:4 )
nls? ( virtual/libintl )
perl? ( dev-perl/URI )"
# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
DEPEND="${COMMON_DEPEND}
test? ( ${PYTHON_DEPS} )
!!<sys-apps/sandbox-1.6
ctypes-python? ( dev-python/ctypesgen )
doc? ( app-doc/doxygen )
gnome-keyring? ( virtual/pkgconfig )
http? ( virtual/pkgconfig )
kde? ( virtual/pkgconfig )
nls? ( sys-devel/gettext )
http? ( virtual/pkgconfig )"
test? ( ${PYTHON_DEPS} )"
PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )"
REQUIRED_USE="
@@ -113,12 +113,23 @@ 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 +148,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 +155,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 +170,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,9 +203,9 @@ src_configure() {
export ac_cv_python_compile="$(tc-getCC)"
fi
# force ruby-2.1
# allow overriding Python include directory
ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \
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) \
@@ -216,7 +219,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 \
@@ -394,14 +397,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
}
www-apache/mod_dav_svn/Manifest
+1 -1
View File
@@ -1,3 +1,3 @@
DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4
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
www-apache/mod_dav_svn/mod_dav_svn-1.8.13.ebuild → www-apache/mod_dav_svn/mod_dav_svn-1.9.4.ebuild
+5 -4
View File
@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ 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
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
!!<sys-apps/sandbox-1.6
@@ -175,7 +175,8 @@ src_configure() {
# force ruby-2.1
# allow overriding Python include directory
ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \
#ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby21" "none")
#ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc21" "none")
ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
--with-apache-libexecdir \