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

[dev-vcs/subversion{,-java}] version bump to 1.6.17

Browse Source
This commit is contained in:
Sławomir Nizio
2011-09-05 21:07:10 +02:00
parent a0a6bf6420
commit 39e3bc97c7
14 changed files with 976 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-vcs/subversion-java/Manifest
+6 -1
View File
@@ -1,10 +1,15 @@
AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
AUX subversion-1.5.4-interix.patch 4375 RMD160 4e10804e8a5ed2a61e66674588a6ccf0f61bba75 SHA1 fd614971d98c21dd4c9794b8f8b3d8c34d8e25d1 SHA256 1cb7dec795921a89e90f792d0176c52239aa3d87064bafbd5af9ded4df981dbe
AUX subversion-1.5.6-aix-dso.patch 787 RMD160 9c1278e65300aaa74b3c23c6ee65096a325b404a SHA1 bfbb8819b8b2ef96547f04cc153a74adadc9edb3 SHA256 2790b21e035ea77358d33c14e7e7c3c8977e1b3f5d4150768912eea719e2cf6c
AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
AUX subversion-1.6.2-local_library_preloading.patch 6412 RMD160 3b072c5f9d3c1f43e3be20959a24632db0c9f82c SHA1 85a3d394861a53e3919ef6fc243542af7df17b46 SHA256 50b83dd31eaf5ed577b7656dcd06e314d3acd31814089f4e3eba014a1efa442d
AUX subversion-1.6.3-hpux-dso.patch 627 RMD160 1286a74c3f54e992be3dcaa2b72df36a3f0ce84a SHA1 fa761a80bf045a5859ef131ae044f8390ae8319a SHA256 0fa69598635ea9630e95e3e8b693cd5f1b853784900e34d58ffe9e03d8c65b36
AUX subversion-1.6.3-kwallet_window.patch 10012 RMD160 d469e0fc8d9fd2ef8c857e5e303eeb24309e7f0d SHA1 9c99b63bc5abf54f642e447af1aa2f814cecb8ab SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de
AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c07020ea270b787ddf0dbb738391e20d3c8347af SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97
AUX svnserve.initd 818 RMD160 6a24ac0599ef46b2d1ef0ae9cde70bdc8124db68 SHA1 f3ef120b584d81124171ccaf5bafec709222d04e SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142
AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
DIST subversion-1.6.16.tar.bz2 5509729 RMD160 f12d7eb31372486290e08143ec1afda029767d34 SHA1 c1a050bd8ad2444eb6729b8a7f451960711af2df SHA256 dce4897d62d0dc29ab03834ed1d66ede95c07702e32a0042f96c24c6f1213386
DIST subversion-1.6.17.tar.bz2 5504298 RMD160 b0937be80622774fee5d4557e740ad44f7f47172 SHA1 6e3ed7c87d98fdf5f0a999050ab601dcec6155a1 SHA256 d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
EBUILD subversion-java-1.6.16.ebuild 4349 RMD160 d454ef9ace9fc78892052a37d420b5e45d3e45f2 SHA1 a744ac8b41caa951b9b750cc916fa0555a89ca5e SHA256 ec5f2a55ed2d686f665cb777e882e468c893dcf9920cd479ef8a38a0af9fe719
MISC metadata.xml 558 RMD160 7c6fecb710b66051ab3a61a5aa50ae51da74e658 SHA1 5722fe19c5fbd79e9579b50e8ba71f952ddd3ea0 SHA256 89cee02e2d381bace416b51fdb26af91061fa0b0a62e9f20512b252461b534a0
EBUILD subversion-java-1.6.17-r7.ebuild 3860 RMD160 a4c37fa5900fb6e25c050f993e1d1fd1a80e93ad SHA1 c786b355b7ba90c3b63b3bdc34686a4278b780a8 SHA256 707279ad6811a09c0e3eec521f00994d57169334535b2b0d7b185b6b4218379b
MISC metadata.xml 308 RMD160 6faf87981ff1e82cb6dd84d6ef3894e5162c4d14 SHA1 95e1b1795d6d212bb062db7b67d1aed5343f1779 SHA256 e65d7b19f003a7b6a767b187fda294ddff4e7ab366dd7cd187533f34f0df180c
dev-vcs/subversion-java/files/subversion-1.5.4-interix.patch
+114
View File
@@ -0,0 +1,114 @@
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:22:36 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h 2008-10-29 08:52:31 +0100
@@ -49,6 +49,11 @@
# endif
#endif
+// This is bad, but better than nothing ;)
+#if defined(__INTERIX)
+# define strtoll strtol
+#endif
+
#if defined(SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK)
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c subversion-1.5.4/subversion/bindings/swig/perl/native/core.c
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:22:37 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/core.c 2008-10-29 08:53:40 +0100
@@ -1733,7 +1733,10 @@
# endif
#endif
-
+#ifdef __INTERIX
+# define strtoull strtoul
+# define strtoll strtol
+#endif
SWIGINTERN int
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:22:37 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_client.c 2008-10-29 08:54:17 +0100
@@ -1872,6 +1872,10 @@
#endif
+#ifdef __INTERIX
+# define strtoull strtoul
+# define strtoll strtol
+#endif
SWIGINTERN int
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:22:37 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_delta.c 2008-10-29 08:54:28 +0100
@@ -1745,6 +1745,10 @@
#endif
+#ifdef __INTERIX
+# define strtoull strtoul
+# define strtoll strtol
+#endif
SWIGINTERN int
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:22:37 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_fs.c 2008-10-29 08:54:41 +0100
@@ -1818,6 +1818,10 @@
#endif
+#ifdef __INTERIX
+# define strtoull strtoul
+# define strtoll strtol
+#endif
SWIGINTERN int
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:22:37 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_ra.c 2008-10-29 08:54:52 +0100
@@ -1661,6 +1661,10 @@
# endif
#endif
+#ifdef __INTERIX
+# define strtoull strtoul
+# define strtoll strtol
+#endif
SWIGINTERN int
SWIG_AsVal_double SWIG_PERL_DECL_ARGS_2(SV *obj, double *val)
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:22:37 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_repos.c 2008-10-29 08:55:05 +0100
@@ -1792,6 +1792,10 @@
#endif
+#ifdef __INTERIX
+# define strtoull strtoul
+# define strtoll strtol
+#endif
SWIGINTERN int
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
diff -ru subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c
--- subversion-1.5.4.orig/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:22:37 +0100
+++ subversion-1.5.4/subversion/bindings/swig/perl/native/svn_wc.c 2008-10-29 08:55:17 +0100
@@ -1816,6 +1816,10 @@
#endif
+#ifdef __INTERIX
+# define strtoull strtoul
+# define strtoll strtol
+#endif
SWIGINTERN int
SWIG_AsVal_long_SS_long SWIG_PERL_DECL_ARGS_2(SV *obj, long long *val)
dev-vcs/subversion-java/files/subversion-1.5.6-aix-dso.patch
+21
View File
@@ -0,0 +1,21 @@
On AIX, load shared libraries even when created with full aix-soname support:
http://lists.gnu.org/archive/html/libtool/2011-01/msg00023.html
http://lists.gnu.org/archive/html/libtool/2011-02/msg00000.html
Once there is an agreement on that, this patch eventually is for upstream too.
--- subversion/libsvn_ra/ra_loader.c.orig 2009-04-28 14:53:35 +0200
+++ subversion/libsvn_ra/ra_loader.c 2009-04-28 14:55:37 +0200
@@ -164,6 +164,13 @@
/* find/load the specified library */
SVN_ERR(svn_dso_load(&dso, libname));
+#ifdef _AIX
+ if (! dso) {
+ libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0(shr.o)",
+ ra_name, SVN_VER_MAJOR);
+ SVN_ERR(svn_dso_load(&dso, libname));
+ }
+#endif
if (! dso)
return SVN_NO_ERROR;
dev-vcs/subversion-java/files/subversion-1.6.3-hpux-dso.patch
+16
View File
@@ -0,0 +1,16 @@
--- subversion/libsvn_ra/ra_loader.c.orig 2009-07-20 14:46:02 +0200
+++ subversion/libsvn_ra/ra_loader.c 2009-07-20 14:50:02 +0200
@@ -154,8 +154,13 @@
const char *compat_funcname;
apr_status_t status;
+#if defined(__hpux) && defined(__hppa)
+ libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.0",
+ ra_name, SVN_VER_MAJOR);
+#else
libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.0",
ra_name, SVN_VER_MAJOR);
+#endif
funcname = apr_psprintf(pool, "svn_ra_%s__init", ra_name);
compat_funcname = apr_psprintf(pool, "svn_ra_%s_init", ra_name);
dev-vcs/subversion-java/metadata.xml
+2 -7
View File
@@ -3,12 +3,7 @@
<pkgmetadata>
<herd>no-herd</herd>
<maintainer>
<email>arfrever@gentoo.org</email>
<name>Arfrever Frehtes Taifersar Arahesis</name>
<description>Gentoo Subversion maintainer and Subversion upstream representative</description>
</maintainer>
<maintainer>
<email>poczta-sn@gazeta.pl</email>
<description>Maintainer for split subversion-java ebuild. Please send bugs about this one only here.</description>
<email>slawomir.nizio@sabayon.org</email>
<description>Maintainer for split subversion-java ebuild.</description>
</maintainer>
</pkgmetadata>
dev-vcs/subversion-java/subversion-java-1.6.17-r7.ebuild
+145
View File
@@ -0,0 +1,145 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="3"
WANT_AUTOMAKE="none"
MY_P="${P/_/-}"
MY_SVN_PN="subversion"
MY_SVN_P="${MY_SVN_PN}-${PV}"
MY_SVN_PF="${MY_SVN_PN}-${PVR}"
MY_SVN_CATEGORY="${CATEGORY}"
# note: java-pkg-2, not java-pkt-opt-2
inherit autotools base 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"
S="${WORKDIR}/${MY_SVN_P/_/-}"
LICENSE="Subversion"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug doc nls"
COMMON_DEPEND="~dev-vcs/subversion-${PV}"
RDEPEND="
${COMMON_DEPEND}
>=virtual/jre-1.5"
DEPEND="${COMMON_DEPEND}
>=virtual/jdk-1.5"
PATCHES=(
"${FILESDIR}/${MY_SVN_PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
"${FILESDIR}/${MY_SVN_PN}-1.6.2-local_library_preloading.patch"
"${FILESDIR}/${MY_SVN_PN}-1.6.3-kwallet_window.patch"
"${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"
)
pkg_setup() {
java-pkg-2_pkg_setup
if use debug; then
append-cppflags -DSVN_DEBUG -DAP_DEBUG
fi
}
src_prepare() {
base_src_prepare
fperms +x build/transform_libtool_scripts.sh
sed -i \
-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!"
eautoconf
elibtoolize
sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
}
src_configure() {
local myconf
myconf+=" --without-swig"
myconf+=" --without-junit"
if use nls; then
myconf+=" --enable-nls"
else
myconf+=" --disable-nls"
fi
case ${CHOST} in
*-solaris*)
# -lintl isn't added for some reason (makes Neon check fail)
use nls && append-libs -lintl
;;
*-aix*)
# avoid recording immediate path to sharedlibs into executables
append-ldflags -Wl,-bnoipath
;;
*-interix*)
# loader crashes on the LD_PRELOADs...
myconf="${myconf} --disable-local-library-preloading"
;;
esac
econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
--without-apxs \
--without-berkeley-db \
--without-ctypesgen \
--disable-runtime-module-search \
--without-gnome-keyring \
--enable-javahl \
--with-jdk="${JAVA_HOME}" \
--without-kwallet \
--without-sasl \
--without-neon \
--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 \
--enable-local-library-preloading \
--disable-mod-activation \
--disable-neon-version-check \
--disable-static \
--with-sqlite="${EPREFIX}/usr"
}
src_compile() {
emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
if use doc; then
emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
fi
}
src_install() {
emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
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
mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die
if use doc; then
java-pkg_dojavadoc doc/javadoc
fi
find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
}