[www-apache/mod_dav_svn,dev-vcs/subversion*] version bump to 1.7.8
This commit is contained in:
Sławomir Nizio
@@ -1,2 +1,2 @@
|
||||
DIST subversion-1.7.6.tar.bz2 6006767 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05
|
||||
DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d
|
||||
DIST subversion-1.7.8.tar.bz2 6023912 SHA256 fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686 SHA512 1e97a2049d7decaa7002d23a4353b67425ec682c4d229932a5a384d547855b61cdb02f2ee6ea89b9b63a35715a0321dc6ba35b3148d242c4899f4ccdf6ce35cd WHIRLPOOL 1c70043922986ec7af0a99455eb7f60c70461342af838b6151de740afcff6e3e8e999f480ea86020fc64a8620ee5a79eff7c7723df4320a86a2a38eb55063310
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
--- build-outputs.mk 2012-08-21 20:38:31.000000000 +0200
|
||||
+++ build-outputs.mk.new 2012-08-21 20:45:08.000000000 +0200
|
||||
@@ -825,7 +825,7 @@
|
||||
# Section 6: Install-Group build targets
|
||||
########################################
|
||||
|
||||
-apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
|
||||
+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
|
||||
|
||||
bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
|
||||
|
||||
@@ -877,16 +877,17 @@
|
||||
|
||||
test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)
|
||||
|
||||
-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
|
||||
+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
|
||||
|
||||
|
||||
########################################
|
||||
# Section 7: Install-Group install targets
|
||||
########################################
|
||||
|
||||
-install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
|
||||
+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
|
||||
cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
|
||||
cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
|
||||
+ cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
|
||||
|
||||
install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
|
||||
$(MKDIR) $(DESTDIR)$(bdb_libdir)
|
||||
@@ -1036,7 +1037,7 @@
|
||||
$(MKDIR) $(DESTDIR)$(swig_rb_libdir)
|
||||
cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
|
||||
|
||||
-install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la
|
||||
+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
|
||||
$(MKDIR) $(DESTDIR)$(toolsdir)
|
||||
cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
|
||||
cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
|
||||
@@ -1046,7 +1047,6 @@
|
||||
cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
|
||||
cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
|
||||
cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
|
||||
- cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
|
||||
|
||||
|
||||
########################################
|
||||
+28
-12
@@ -1,8 +1,8 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
EAPI=5
|
||||
WANT_AUTOMAKE="none"
|
||||
MY_P="${P/_/-}"
|
||||
|
||||
@@ -16,7 +16,7 @@ inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib
|
||||
|
||||
DESCRIPTION="Java bindings for Subversion"
|
||||
HOMEPAGE="http://subversion.apache.org/"
|
||||
SRC_URI="http://subversion.tigris.org/downloads/${MY_SVN_P}.tar.bz2"
|
||||
SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
|
||||
S="${WORKDIR}/${MY_SVN_P/_/-}"
|
||||
|
||||
LICENSE="Subversion"
|
||||
@@ -43,8 +43,8 @@ pkg_setup() {
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${MY_SVN_PN}-1.5.4-interix.patch \
|
||||
"${FILESDIR}"/${MY_SVN_PN}-1.5.6-aix-dso.patch \
|
||||
"${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch \
|
||||
"${FILESDIR}"/${MY_SVN_PN}-${PV}-revert-mod_dontdothat-move.patch
|
||||
"${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch
|
||||
epatch_user
|
||||
|
||||
fperms +x build/transform_libtool_scripts.sh
|
||||
|
||||
@@ -52,8 +52,6 @@ src_prepare() {
|
||||
-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
|
||||
-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
|
||||
|
||||
sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
|
||||
|
||||
# this bites us in particular on Solaris
|
||||
sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
|
||||
die "/bin/sh is not POSIX shell!"
|
||||
@@ -61,7 +59,8 @@ src_prepare() {
|
||||
eautoconf
|
||||
elibtoolize
|
||||
|
||||
sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
|
||||
sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
|
||||
-i build-outputs.mk || die "sed failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
@@ -85,11 +84,29 @@ src_configure() {
|
||||
# loader crashes on the LD_PRELOADs...
|
||||
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"
|
||||
;;
|
||||
*-mint*)
|
||||
myconf+=" --enable-all-static --disable-local-library-preloading"
|
||||
;;
|
||||
*)
|
||||
# inject LD_PRELOAD entries for easy in-tree development
|
||||
myconf+=" --enable-local-library-preloading"
|
||||
;;
|
||||
esac
|
||||
|
||||
#workaround for bug 387057
|
||||
has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
|
||||
|
||||
#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"
|
||||
|
||||
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
|
||||
--without-apxs \
|
||||
--without-berkeley-db \
|
||||
@@ -107,22 +124,21 @@ src_configure() {
|
||||
--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
|
||||
--disable-experimental-libtool \
|
||||
--without-jikes \
|
||||
--enable-local-library-preloading \
|
||||
--disable-mod-activation \
|
||||
--disable-neon-version-check \
|
||||
--disable-static
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
|
||||
emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
|
||||
|
||||
if use doc; then
|
||||
emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
|
||||
emake doc-javahl
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
|
||||
emake DESTDIR="${D}" install-javahl
|
||||
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
|
||||
Reference in New Issue
Block a user