[dev-vcs/subversion,dev-vcs/subversion-java,www-apache/mod_dav_svn] version bump to 1.10.2
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
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
|
||||
DIST subversion-1.10.2.tar.bz2 8369762 BLAKE2B 1cd9ecf91818172ce60b8a38b1cb0eec0180725af58c09b9b5e62aa70fc2a7266d20b9fcfdafe993cbbb57f118dc9eb77126c199c3f4f2797fd50ef5f59b1f7e SHA512 ccbe860ec93a198745e40620cb7e005a85797e344a99ddbc0e24c32ad846976eae35cf5b3d62ba5751b998f0d40bbebbba72f484d92c92693bbb2112c989b129
|
||||
|
||||
+6
-31
@@ -12,12 +12,12 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}"
|
||||
MY_SVN_CATEGORY="${CATEGORY}"
|
||||
|
||||
# note: java-pkg-2, not java-pkt-opt-2
|
||||
inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib xdg-utils
|
||||
inherit autotools flag-o-matic java-pkg-2 libtool ltprune multilib xdg-utils
|
||||
|
||||
DESCRIPTION="Java bindings for Subversion"
|
||||
HOMEPAGE="https://subversion.apache.org/"
|
||||
SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2
|
||||
https://dev.gentoo.org/~mgorny/dist/${MY_SVN_PN}-1.8.18-patchset.tar.bz2"
|
||||
https://dev.gentoo.org/~polynomial-c/${MY_SVN_PN}-1.10.0_rc1-patches-1.tar.xz"
|
||||
S="${WORKDIR}/${MY_SVN_P/_/-}"
|
||||
|
||||
LICENSE="Subversion"
|
||||
@@ -29,42 +29,16 @@ 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"
|
||||
|
||||
# Making PATCHES more friendly for merging with Gentoo.
|
||||
# Simple variable expansion is being done (so keep it updated).
|
||||
_sab_PATCHES='
|
||||
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch
|
||||
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch
|
||||
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch
|
||||
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch
|
||||
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch
|
||||
"${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
|
||||
"${FILESDIR}"/${P}-kf5.patch
|
||||
'
|
||||
PATCHES=()
|
||||
while read -r _sab_p; do
|
||||
_sab_kvs=(
|
||||
'${P}' "${MY_SVN_P}" '${PN}' "${MY_SVN_PN}" '"${WORKDIR}"' "${WORKDIR}" '"${FILESDIR}"' "${FILESDIR}"
|
||||
)
|
||||
while (( ${#_sab_kvs[@]} )); do
|
||||
_sab_k=${_sab_kvs[0]}
|
||||
_sab_v=${_sab_kvs[1]}
|
||||
_sab_p=${_sab_p//${_sab_k}/${_sab_v}}
|
||||
_sab_kvs=( "${_sab_kvs[@]:2}" )
|
||||
done
|
||||
[[ ${_sab_p} = *\$* ]] && die "${_sab_p} not fully \$-evaluated"
|
||||
[[ -n ${_sab_p} ]] && PATCHES+=( "${_sab_p}" )
|
||||
done <<< "${_sab_PATCHES}"
|
||||
unset _sab_k _sab_v _sab_PATCHES _sab_kvs _sab_p
|
||||
[[ -z ${PATCHES[0]} ]] && die "PATCHES sanity check failed."
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-2_pkg_setup
|
||||
|
||||
@@ -76,7 +50,8 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eapply "${WORKDIR}/patches"
|
||||
eapply_user
|
||||
|
||||
fperms +x build/transform_libtool_scripts.sh
|
||||
|
||||
Reference in New Issue
Block a user