[dev-vcs/subversion*] version bump to 1.7.2
- added ~arm to subversion-java - incorporated changes (into 1.7.2) made in Portage tree in ebuild for version 1.7.1, CVS revision 1.2 - updated files/svnserve.initd2 to sync. it with Portage, too
This commit is contained in:
Sławomir Nizio
@@ -11,7 +11,9 @@ AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d
|
||||
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
|
||||
DIST subversion-1.7.1.tar.bz2 5973480 RMD160 cd076403c8e9dd0124a49235730f2c6f24605787 SHA1 4bfaa8e33e9eaf26a504117cd91b23805518071a SHA256 d34bde626fac1aa553f5c9aeedf961999a77cc31540ace18da5aeacdd03d6608
|
||||
DIST subversion-1.7.2.tar.bz2 5944987 RMD160 0d20e364c120da454f3139e95d3ec86c22e7e3c1 SHA1 8c0824aeb7f42da1ff4f7cd296877af7f59812bb SHA256 7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517
|
||||
EBUILD subversion-java-1.6.16.ebuild 4349 RMD160 d454ef9ace9fc78892052a37d420b5e45d3e45f2 SHA1 a744ac8b41caa951b9b750cc916fa0555a89ca5e SHA256 ec5f2a55ed2d686f665cb777e882e468c893dcf9920cd479ef8a38a0af9fe719
|
||||
EBUILD subversion-java-1.6.17-r7.ebuild 3860 RMD160 a4c37fa5900fb6e25c050f993e1d1fd1a80e93ad SHA1 c786b355b7ba90c3b63b3bdc34686a4278b780a8 SHA256 707279ad6811a09c0e3eec521f00994d57169334535b2b0d7b185b6b4218379b
|
||||
EBUILD subversion-java-1.7.1.ebuild 3654 RMD160 b37920c8ad058fc4ee3b27eeacb3c242e3a2c3b9 SHA1 526d491b4a3aaf5fa75869b7a61390f04be6deb6 SHA256 cb2375936b1e744b44c925e8843e9438a83a5e35d0461293072f426157ed037f
|
||||
MISC metadata.xml 308 RMD160 6faf87981ff1e82cb6dd84d6ef3894e5162c4d14 SHA1 95e1b1795d6d212bb062db7b67d1aed5343f1779 SHA256 e65d7b19f003a7b6a767b187fda294ddff4e7ab366dd7cd187533f34f0df180c
|
||||
EBUILD subversion-java-1.7.2.ebuild 3670 RMD160 8b98547e9fd933f39c7cb7f6b8cec6c239c39e30 SHA1 c8b5c8e4e8edfc7ec1be9b9fc2812670e9fc1eb4 SHA256 d7eebf1f03243b54aa5c3514350d3ba6aa6ce167d1f67c8f700ca7ffbc84bf48
|
||||
MISC metadata.xml 286 RMD160 2431b313f7dbef6ca78fdd87c1b4de2077634c01 SHA1 39ab12a0f999d65946182288e157f5222598e6f1 SHA256 f67628961bf775bf88adcc6abf072eb4126a0f85e48d848054f3a7bc0ec951bb
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>no-herd</herd>
|
||||
<maintainer>
|
||||
<email>slawomir.nizio@sabayon.org</email>
|
||||
<description>Maintainer for split subversion-java ebuild.</description>
|
||||
|
||||
@@ -0,0 +1,142 @@
|
||||
# Copyright 1999-2012 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 ~arm ~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.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*$(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
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user