[dev-vcs/subversion*,www-apache/mod_dav_svn] revision bump to r1
Switches from Qt4 to Qt5. Used symlinked "files."
This commit is contained in:
Sławomir Nizio
@@ -1,3 +1,3 @@
|
||||
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.5.tar.bz2 7904861 SHA256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 SHA512 ff7241ffae2506e97f40011242b5d5c6fa665f5463743f9acc52136b59ad84b6db00b60e70c44a9060579db49b818db06da1d1352aaee78e5bfe6ce56f32a2cf WHIRLPOOL 37a124dc2f99bb465b47083de168530f8178305e3208972d56c2c29a93bbf73ded816f742808cf9e7a5d3f13690e48cdd9f800abd85452ad1da4c13d603454f3
|
||||
DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2
|
||||
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
../subversion/files
|
||||
+67
-34
@@ -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=5
|
||||
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 eutils flag-o-matic java-pkg-2 libtool 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/~mgorny/dist/${MY_SVN_PN}-1.8.18-patchset.tar.bz2"
|
||||
S="${WORKDIR}/${MY_SVN_P/_/-}"
|
||||
|
||||
sab-patches_update_SRC_URI
|
||||
|
||||
LICENSE="Subversion"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
@@ -38,6 +37,34 @@ RDEPEND="
|
||||
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
|
||||
|
||||
@@ -49,7 +76,7 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sab-patches_apply_all
|
||||
default
|
||||
|
||||
fperms +x build/transform_libtool_scripts.sh
|
||||
|
||||
@@ -66,10 +93,32 @@ 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() {
|
||||
local myconf=()
|
||||
local myconf=(
|
||||
--libdir="${EPREFIX%/}/usr/$(get_libdir)"
|
||||
--without-apache-libexecdir
|
||||
--without-apxs
|
||||
--without-berkeley-db
|
||||
--without-ctypesgen
|
||||
--disable-runtime-module-search
|
||||
--without-gnome-keyring
|
||||
--enable-javahl
|
||||
--with-jdk="${JAVA_HOME}"
|
||||
--without-kwallet
|
||||
$(use_enable nls)
|
||||
--without-sasl
|
||||
--without-serf
|
||||
--with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
|
||||
--with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
|
||||
--disable-experimental-libtool
|
||||
--without-jikes
|
||||
--disable-mod-activation
|
||||
--disable-static
|
||||
)
|
||||
|
||||
myconf+=( --without-swig )
|
||||
myconf+=( --without-junit )
|
||||
@@ -79,6 +128,10 @@ src_configure() {
|
||||
# avoid recording immediate path to sharedlibs into executables
|
||||
append-ldflags -Wl,-bnoipath
|
||||
;;
|
||||
*-cygwin*)
|
||||
# no LD_PRELOAD support, no undefined symbols
|
||||
myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
|
||||
;;
|
||||
*-interix*)
|
||||
# loader crashes on the LD_PRELOADs...
|
||||
myconf+=( --disable-local-library-preloading )
|
||||
@@ -102,27 +155,7 @@ src_configure() {
|
||||
#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 )
|
||||
|
||||
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
--without-apache-libexecdir \
|
||||
--without-apxs \
|
||||
--without-berkeley-db \
|
||||
--without-ctypesgen \
|
||||
--disable-runtime-module-search \
|
||||
--without-gnome-keyring \
|
||||
--enable-javahl \
|
||||
--with-jdk="${JAVA_HOME}" \
|
||||
--without-kwallet \
|
||||
$(use_enable nls) \
|
||||
--without-sasl \
|
||||
--without-serf \
|
||||
${myconf[@]} \
|
||||
--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
|
||||
--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
|
||||
--disable-experimental-libtool \
|
||||
--without-jikes \
|
||||
--disable-mod-activation \
|
||||
--disable-static
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
@@ -135,10 +168,10 @@ src_compile() {
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install-javahl
|
||||
java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
|
||||
java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
|
||||
java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib
|
||||
java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
|
||||
rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
|
||||
java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
|
||||
rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
|
||||
|
||||
mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die
|
||||
|
||||
Reference in New Issue
Block a user