From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PvGLG-0005VG-29 for garchives@archives.gentoo.org; Thu, 03 Mar 2011 21:45:50 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2327EE0345; Thu, 3 Mar 2011 21:45:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B3A3FE0345 for ; Thu, 3 Mar 2011 21:45:42 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9507A1B4056 for ; Thu, 3 Mar 2011 21:45:41 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2244) id 34CF820054; Thu, 3 Mar 2011 21:45:40 +0000 (UTC) From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, arfrever@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/subversion: ChangeLog subversion-1.6.16.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog subversion-1.6.16.ebuild X-VCS-Directories: dev-vcs/subversion X-VCS-Committer: arfrever X-VCS-Committer-Name: Arfrever Frehtes Taifersar Arahesis Content-Type: text/plain; charset=utf8 Message-Id: <20110303214540.34CF820054@flycatcher.gentoo.org> Date: Thu, 3 Mar 2011 21:45:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c3548bc987bebe37def2f0ccbacf005d arfrever 11/03/03 21:45:40 Modified: ChangeLog Added: subversion-1.6.16.ebuild Log: Version bump (bug #356741). =20 (Portage version: 2.2.0_alpha26_p5/cvs/Linux x86_64) Revision Changes Path 1.35 dev-vcs/subversion/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion= /ChangeLog?rev=3D1.35&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion= /ChangeLog?rev=3D1.35&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion= /ChangeLog?r1=3D1.34&r2=3D1.35 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- ChangeLog 11 Jan 2011 19:16:40 -0000 1.34 +++ ChangeLog 3 Mar 2011 21:45:39 -0000 1.35 @@ -1,6 +1,12 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.34 2= 011/01/11 19:16:40 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.35 2= 011/03/03 21:45:39 arfrever Exp $ + +*subversion-1.6.16 (03 Mar 2011) + + 03 Mar 2011; Arfrever Frehtes Taifersar Arahesis + -subversion-1.6.13.ebuild, +subversion-1.6.16.ebuild: + Version bump (bug #356741). =20 11 Jan 2011; Jeroen Roovers subversion-1.6.15.ebuild: Stable for HPPA (bug #350166). 1.1 dev-vcs/subversion/subversion-1.6.16.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion= /subversion-1.6.16.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion= /subversion-1.6.16.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: subversion-1.6.16.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.16.e= build,v 1.1 2011/03/03 21:45:39 arfrever Exp $ EAPI=3D"3" SUPPORT_PYTHON_ABIS=3D"1" RESTRICT_PYTHON_ABIS=3D"3.* *-jython" WANT_AUTOMAKE=3D"none" inherit autotools bash-completion db-use depend.apache elisp-common eutil= s flag-o-matic java-pkg-opt-2 libtool multilib perl-module python DESCRIPTION=3D"Advanced version control system" HOMEPAGE=3D"http://subversion.apache.org/" SRC_URI=3D"http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2" LICENSE=3D"Subversion" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sp= arc ~x86 ~x86-fbsd" IUSE=3D"apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-ke= yring java kde nls perl python ruby sasl test vim-syntax +webdav-neon web= dav-serf" CDEPEND=3D">=3Ddev-db/sqlite-3.4[threadsafe] >=3Ddev-libs/apr-1.3:1 >=3Ddev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( =3Dsys-libs/db-4* ) ctypes-python? ( =3Ddev-lang/python-2* ) emacs? ( virtual/emacs ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring = ) kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >= =3Dkde-base/kdelibs-4 ) perl? ( dev-lang/perl ) python? ( =3Ddev-lang/python-2* ) ruby? ( >=3Ddev-lang/ruby-1.8.2 ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=3Dnet-libs/neon-0.28 ) webdav-serf? ( >=3Dnet-libs/serf-0.3.0 )" RDEPEND=3D"${CDEPEND} apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=3Dvirtual/jre-1.5 ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI )" APACHE_TEST_DEPEND=3D"|| ( =3Dwww-servers/apache-2.4*[apache2_modules_auth_basic,apache2_modules_au= thn_core,apache2_modules_authn_file,apache2_modules_authz_core,apache2_mo= dules_authz_user,apache2_modules_dav,apache2_modules_log_config,apache2_m= odules_unixd] =3Dwww-servers/apache-2.2*[apache2_modules_auth_basic,apache2_modules_au= thn_file,apache2_modules_dav,apache2_modules_log_config] )" DEPEND=3D"${CDEPEND} !!=3Dvirtual/jdk-1.5 ) kde? ( dev-util/pkgconfig ) nls? ( sys-devel/gettext ) test? ( =3Ddev-lang/python-2* webdav-neon? ( ${APACHE_TEST_DEPEND} ) webdav-serf? ( ${APACHE_TEST_DEPEND} ) ) webdav-neon? ( dev-util/pkgconfig )" want_apache S=3D"${WORKDIR}/${P/_/-}" print() { local blue color green normal red if [[ "${NOCOLOR:-false}" =3D~ ^(false|no)$ ]]; then red=3D$'\e[1;31m' green=3D$'\e[1;32m' blue=3D$'\e[1;34m' normal=3D$'\e[0m' fi while (($#)); do case "$1" in --red) color=3D"${red}" ;; --green) color=3D"${green}" ;; --blue) color=3D"${blue}" ;; --) shift break ;; -*) die "${FUNCNAME}(): Unrecognized option '$1'" ;; *) break ;; esac shift done echo " ${green}*${normal} ${color}$@${normal}" } pkg_setup() { if use kde && ! use nls; then eerror "Support for KWallet (KDE) requires Native Language Support (NLS= )." die "Enable \"nls\" USE flag" fi if use berkdb; then einfo if [[ -z "${SVN_BDB_VERSION}" ]]; then SVN_BDB_VERSION=3D"$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/n= ull)")" einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce u= sing of specific version of Berkeley DB." fi einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" einfo local apu_bdb_version=3D"$(scanelf -nq "${EROOT}usr/$(get_libdir)/libap= rutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/l= ibdb-\(.*\)/\1/")" if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" !=3D "${apu_bdb_v= ersion}" ]]; then eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but= you are trying" eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VER= SION}." eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=3D\"${apu_bdb= _version}\"." eerror "Aborting to avoid possible run-time crashes." die "Berkeley DB version mismatch" fi fi depend.apache_pkg_setup java-pkg-opt-2_pkg_setup if use ctypes-python || use python || use test; then python_pkg_setup fi if ! use webdav-neon && ! use webdav-serf; then ewarn ewarn "WebDAV support is disabled. You need WebDAV to" ewarn "access repositories through the HTTP protocol." ewarn ewarn "WebDAV support needs one of the following USE flags enabled:" ewarn " webdav-neon webdav-serf" ewarn ewarn "You can do this by enabling one of these flags in /etc/portage/p= ackage.use:" ewarn " ${CATEGORY}/${PN} webdav-neon webdav-serf" ewarn echo -ne "\a" fi if use test; then print print --red "**********************************************************= **************************************" print print "NOTES ABOUT TESTS" print print "You can set the following variables to enable testing of some fe= atures and configure testing:" if use webdav-neon || use webdav-serf; then print " SVN_TEST_APACHE_PORT=3Dinteger - Set Apache port num= ber (Default value: 62208)" fi print " SVN_TEST_SVNSERVE_PORT=3Dinteger - Set svnserve port nu= mber (Default value: 62209)" print " SVN_TEST_FSFS_MEMCACHED=3D1 - Enable using of Memc= ached for FSFS repositories" print " SVN_TEST_FSFS_MEMCACHED_PORT=3Dinteger - Set Memcached port n= umber (Default value: 62210)" print " SVN_TEST_FSFS_SHARDING=3Dinteger - Enable sharding of F= SFS repositories and set default shard size for FSFS repositories" print " SVN_TEST_FSFS_PACKING=3D1 - Enable packing of FS= FS repositories" print " (SVN_TEST_FSFS_PACKING= requires SVN_TEST_FSFS_SHARDING)" # if use sasl; then # print " SVN_TEST_SASL=3D1 - Enable SASL authe= ntication" # fi if use ctypes-python || use java || use perl || use python || use ruby;= then print " SVN_TEST_BINDINGS=3D1 - Enable testing of b= indings" fi if use java || use perl || use python || use ruby; then print " (Testing of bindings = requires ${CATEGORY}/${PF})" fi if use java; then print " (Testing of JavaHL li= brary requires dev-java/junit:4)" fi print print --red "**********************************************************= **************************************" print if ! use apache2 && { use webdav-neon || use webdav-serf; }; then eerror "Testing of libsvn_ra_neon / libsvn_ra_serf requires support fo= r Apache." die "Enable \"apache2\" USE flag." fi if [[ -n "${SVN_TEST_APACHE_PORT}" ]] && ! ([[ "$((${SVN_TEST_APACHE_PO= RT}))" =3D=3D "${SVN_TEST_APACHE_PORT}" ]]) &>/dev/null; then die "Value of SVN_TEST_APACHE_PORT must be an integer" fi if [[ -n "${SVN_TEST_SVNSERVE_PORT}" ]] && ! ([[ "$((${SVN_TEST_SVNSERV= E_PORT}))" =3D=3D "${SVN_TEST_SVNSERVE_PORT}" ]]) &>/dev/null; then die "Value of SVN_TEST_SVNSERVE_PORT must be an integer" fi if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]] && ! has_version net-misc/memc= ached; then die "net-misc/memcached must be installed" fi if [[ -n "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]] && ! ([[ "$((${SVN_TEST_F= SFS_MEMCACHED_PORT}))" =3D=3D "${SVN_TEST_FSFS_MEMCACHED_PORT}" ]]) &>/de= v/null; then die "Value of SVN_TEST_FSFS_MEMCACHED_PORT must be an integer" fi if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]] && ! ([[ "$((${SVN_TEST_FSFS_SH= ARDING}))" =3D=3D "${SVN_TEST_FSFS_SHARDING}" ]]) &>/dev/null; then die "Value of SVN_TEST_FSFS_SHARDING must be an integer" fi if [[ -n "${SVN_TEST_FSFS_PACKING}" && -z "${SVN_TEST_FSFS_SHARDING}" ]= ]; then die "SVN_TEST_FSFS_PACKING requires SVN_TEST_FSFS_SHARDING" fi if [[ -n "${SVN_TEST_BINDINGS}" ]]; then if { use java || use perl || use python || use ruby; } && ! has_versio= n "=3D${CATEGORY}/${PF}"; then die "${CATEGORY}/${PF} must be installed" fi if use java && ! has_version dev-java/junit:4; then die "dev-java/junit:4 must be installed" fi fi fi if use debug; then append-cppflags -DSVN_DEBUG -DAP_DEBUG fi # Allow for custom repository locations. SVN_REPOS_LOC=3D"${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" } src_prepare() { epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_librari= es.patch" epatch "${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch" epatch "${FILESDIR}/${PN}-1.6.3-kwallet_window.patch" chmod +x build/transform_libtool_scripts.sh || die "chmod failed" if ! use test; then sed -i \ -e "s/\(BUILD_RULES=3D.*\) bdb-test\(.*\)/\1\2/g" \ -e "s/\(BUILD_RULES=3D.*\) test\(.*\)/\1\2/g" configure.ac fi sed -e "/SWIG_PY_INCLUDES=3D/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INC= LUDES)/" -i build/ac-macros/swig.m4 || die "sed failed" 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 if use python || use perl || use ruby; then myconf+=3D" --with-swig" else myconf+=3D" --without-swig" fi if use java; then if use test && [[ -n "${SVN_TEST_BINDINGS}" ]]; then myconf+=3D" --with-junit=3D${EPREFIX}/usr/share/junit-4/lib/junit.jar" else myconf+=3D" --without-junit" fi fi econf --libdir=3D"${EPREFIX}/usr/$(get_libdir)" \ $(use_with apache2 apxs "${APXS}") \ $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_= VERSION}::db-${SVN_BDB_VERSION}") \ $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \ $(use_enable dso runtime-module-search) \ $(use_with gnome-keyring) \ $(use_enable java javahl) \ $(use_with java jdk "${JAVA_HOME}") \ $(use_with kde kwallet) \ $(use_enable nls) \ $(use_with sasl) \ $(use_with webdav-neon neon) \ $(use_with webdav-serf serf "${EPREFIX}/usr") \ ${myconf} \ --with-apr=3D"${EPREFIX}/usr/bin/apr-1-config" \ --with-apr-util=3D"${EPREFIX}/usr/bin/apu-1-config" \ --disable-experimental-libtool \ --without-jikes \ --enable-local-library-preloading \ --disable-mod-activation \ --disable-neon-version-check \ --with-sqlite=3D"${EPREFIX}/usr" } src_compile() { print print "Building of core of Subversion" print emake local-all || die "Building of core of Subversion failed" if use ctypes-python; then print print "Building of Subversion Ctypes Python bindings" print python_copy_sources subversion/bindings/ctypes-python rm -fr subversion/bindings/ctypes-python ctypes_python_bindings_building() { rm -f subversion/bindings/ctypes-python ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python emake ctypes-python } python_execute_function \ --action-message 'Building of Subversion Ctypes Python bindings with $= (python_get_implementation) $(python_get_version)' \ --failure-message 'Building of Subversion Ctypes Python bindings faile= d with $(python_get_implementation) $(python_get_version)' \ ctypes_python_bindings_building fi if use python; then print print "Building of Subversion SWIG Python bindings" print python_copy_sources subversion/bindings/swig/python rm -fr subversion/bindings/swig/python swig_python_bindings_building() { rm -f subversion/bindings/swig/python ln -s python-${PYTHON_ABI} subversion/bindings/swig/python emake \ PYTHON_INCLUDES=3D"-I${EPREFIX}$(python_get_includedir)" \ PYTHON_VERSION=3D"$(python_get_version)" \ swig_pydir=3D"${EPREFIX}$(python_get_sitedir)/libsvn" \ swig_pydir_extra=3D"${EPREFIX}$(python_get_sitedir)/svn" \ swig-py } python_execute_function \ --action-message 'Building of Subversion SWIG Python bindings with $(p= ython_get_implementation) $(python_get_version)' \ --failure-message 'Building of Subversion SWIG Python bindings failed = with $(python_get_implementation) $(python_get_version)' \ swig_python_bindings_building fi if use perl; then print print "Building of Subversion SWIG Perl bindings" print emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings fai= led" fi if use ruby; then print print "Building of Subversion SWIG Ruby bindings" print emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" fi if use java; then print print "Building of Subversion JavaHL library" print emake -j1 JAVAC_FLAGS=3D"$(java-pkg_javac-args) -encoding iso8859-1" ja= vahl || die "Building of Subversion JavaHL library failed" fi if use emacs; then print print "Compilation of Emacs modules" print elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-d= oc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed" fi if use extras; then print print "Building of contrib and tools" print emake contrib || die "Building of contrib failed" emake tools || die "Building of tools failed" fi if use doc; then print print "Building of Subversion HTML documentation" print doxygen doc/doxygen.conf || die "Building of Subversion HTML documentat= ion failed" if use java; then print print "Building of Subversion JavaHL library HTML documentation" print emake doc-javahl || die "Building of Subversion JavaHL library HTML do= cumentation failed" fi fi } create_apache_tests_configuration() { get_loadmodule_directive() { if [[ "$("${APACHE_BIN}" -l)" !=3D *"mod_$1.c"* ]]; then echo "LoadModule $1_module \"${APACHE_MODULESDIR}/mod_$1.so\"" fi } get_loadmodule_directives() { if has_version "=3Dwww-servers/apache-2.4*"; then get_loadmodule_directive auth_basic get_loadmodule_directive authn_core get_loadmodule_directive authn_file get_loadmodule_directive authz_core get_loadmodule_directive authz_user get_loadmodule_directive dav get_loadmodule_directive log_config get_loadmodule_directive unixd else get_loadmodule_directive auth_basic get_loadmodule_directive authn_file get_loadmodule_directive dav get_loadmodule_directive log_config fi } mkdir -p "${T}/apache" cat << EOF > "${T}/apache/apache.conf" $(get_loadmodule_directives) LoadModule dav_svn_module "${S}/subversion/mod_dav_svn/.libs/mod_dav_svn.= so" LoadModule authz_svn_module "${S}/subversion/mod_authz_svn/.libs/mod_auth= z_svn.so" User $(id -un) Group $(id -gn) Listen localhost:${SVN_TEST_APACHE_PORT} ServerName localhost ServerRoot "${T}" DocumentRoot "${T}" CoreDumpDirectory "${T}" PidFile "${T}/apache.pid" CustomLog "${T}/apache/access_log" "%h %l %u %{%Y-%m-%dT%H:%M:%= S}t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" CustomLog "${T}/apache/svn_log" "%{%Y-%m-%dT%H:%M:%S}t %u %{SVN= -REPOS-NAME}e %{SVN-ACTION}e" env=3DSVN-ACTION ErrorLog "${T}/apache/error_log" LogLevel Debug MaxRequestsPerChild 0 AllowOverride None DAV svn SVNParentPath "${S}/subversion/tests/cmdline/svn-test-work/repositories" AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz" AuthType Basic AuthName "Subversion Repository" AuthUserFile "${T}/apache/users" Require valid-user DAV svn SVNPath "${S}/subversion/tests/cmdline/svn-test-work/local_tmp/repos" AuthzSVNAccessFile "${S}/subversion/tests/cmdline/svn-test-work/authz" AuthType Basic AuthName "Subversion Repository" AuthUserFile "${T}/apache/users" Require valid-user EOF cat << EOF > "${T}/apache/users" jrandom:xCGl35kV9oWCY jconstant:xCGl35kV9oWCY EOF } set_tests_variables() { if [[ "$1" =3D=3D "local" ]]; then base_url=3D"file://${S}/subversion/tests/cmdline" http_library=3D"" fi if [[ "$1" =3D=3D "svn" ]]; then base_url=3D"svn://127.0.0.1:${SVN_TEST_SVNSERVE_PORT}" http_library=3D"" fi if [[ "$1" =3D=3D "neon" || "$1" =3D=3D "serf" ]]; then base_url=3D"http://127.0.0.1:${SVN_TEST_APACHE_PORT}" http_library=3D"$1" fi } src_test() { if ! use test; then die "Invalid configuration" fi local fs_type fs_types ra_type ra_types options failed_tests fs_types=3D"fsfs" use berkdb && fs_types+=3D" bdb" ra_types=3D"local svn" use webdav-neon && ra_types+=3D" neon" use webdav-serf && ra_types+=3D" serf" local pid_file for pid_file in svnserve.pid apache.pid memcached.pid; do rm -f "${T}/${pid_file}" done termination() { local die=3D"$1" pid_file if [[ -n "${die}" ]]; then echo -e "\n\e[1;31mKilling of child processes...\e[0m\a" > /dev/tty fi for pid_file in svnserve.pid apache.pid memcached.pid; do if [[ -f "${T}/${pid_file}" ]]; then kill "$(<"${T}/${pid_file}")" fi done if [[ -n "${die}" ]]; then sleep 6 die "Termination" fi } trap 'termination 1 &' SIGINT SIGTERM SVN_TEST_SVNSERVE_PORT=3D"${SVN_TEST_SVNSERVE_PORT:-62209}" LC_ALL=3D"C" subversion/svnserve/svnserve -dr "subversion/tests/cmdline"= --listen-port "${SVN_TEST_SVNSERVE_PORT}" --log-file "${T}/svnserve.log"= --pid-file "${T}/svnserve.pid" if use webdav-neon || use webdav-serf; then SVN_TEST_APACHE_PORT=3D"${SVN_TEST_APACHE_PORT:-62208}" create_apache_tests_configuration "${APACHE_BIN}" -f "${T}/apache/apache.conf" fi if [[ -n "${SVN_TEST_FSFS_MEMCACHED}" ]]; then SVN_TEST_FSFS_MEMCACHED_PORT=3D"${SVN_TEST_FSFS_MEMCACHED_PORT:-62210}" sed -e "/\[memcached-servers\]/akey =3D 127.0.0.1:${SVN_TEST_FSFS_MEMCA= CHED_PORT}" -i subversion/tests/tests.conf memcached -dp "${SVN_TEST_FSFS_MEMCACHED_PORT}" -P "${T}/memcached.pid" fi if [[ -n "${SVN_TEST_FSFS_SHARDING}" ]]; then options+=3D" FSFS_SHARDING=3D${SVN_TEST_FSFS_SHARDING}" fi if [[ -n "${SVN_TEST_FSFS_PACKING}" ]]; then options+=3D" FSFS_PACKING=3D1" fi # if [[ -n "${SVN_TEST_SASL}" ]]; then # options+=3D" ENABLE_SASL=3D1" # fi sleep 6 for ra_type in ${ra_types}; do for fs_type in ${fs_types}; do [[ "${ra_type}" =3D=3D "local" && "${fs_type}" =3D=3D "bdb" ]] && cont= inue print print --blue "Testing of ra_${ra_type} + $(echo ${fs_type} | tr '[:low= er:]' '[:upper:]')" print set_tests_variables ${ra_type} time emake check FS_TYPE=3D"${fs_type}" BASE_URL=3D"${base_url}" HTTP_= LIBRARY=3D"${http_library}" CLEANUP=3D"1" ${options} || failed_tests=3D"1= " mv tests.log "${T}/tests-ra_${ra_type}-${fs_type}.log" done done unset base_url http_library termination trap - SIGINT SIGTERM if [[ -n "${SVN_TEST_BINDINGS}" ]]; then local swig_lingua swig_linguas local -A linguas if use ctypes-python; then print print --blue "Testing of Subversion Ctypes Python bindings" print ctypes_python_bindings_testing() { rm -f subversion/bindings/ctypes-python ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python time emake check-ctypes-python || failed_tests=3D"1" } python_execute_function \ --action-message 'Testing of Subversion Ctypes Python bindings with $= (python_get_implementation) $(python_get_version)' \ --failure-message 'Testing of Subversion Ctypes Python bindings faile= d with $(python_get_implementation) $(python_get_version)' \ ctypes_python_bindings_testing fi if use python; then print print --blue "Testing of Subversion SWIG Python bindings" print swig_python_bindings_testing() { rm -f subversion/bindings/swig/python ln -s python-${PYTHON_ABI} subversion/bindings/swig/python time emake PYTHON_VERSION=3D"$(python_get_version)" check-swig-py || = failed_tests=3D"1" } python_execute_function \ --action-message 'Testing of Subversion SWIG Python bindings with $(p= ython_get_implementation) $(python_get_version)' \ --failure-message 'Testing of Subversion SWIG Python bindings failed = with $(python_get_implementation) $(python_get_version)' \ swig_python_bindings_testing fi use perl && swig_linguas+=3D" pl" use ruby && swig_linguas+=3D" rb" linguas[pl]=3D"Perl" linguas[rb]=3D"Ruby" for swig_lingua in ${swig_linguas}; do print print --blue "Testing of Subversion SWIG ${linguas[${swig_lingua}]} bi= ndings" print time emake check-swig-${swig_lingua} || failed_tests=3D"1" done if use java; then print print --blue "Testing of Subversion JavaHL library" print time emake check-javahl || failed_tests=3D"1" fi fi if [[ -n "${failed_tests}" ]]; then ewarn ewarn "\e[1;31mTests failed\e[0m" ewarn fi } src_install() { print print "Installation of core of Subversion" print emake -j1 DESTDIR=3D"${D}" local-install || die "Installation of core of= Subversion failed" if use ctypes-python; then print print "Installation of Subversion Ctypes Python bindings" print ctypes_python_bindings_installation() { rm -f subversion/bindings/ctypes-python ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python emake DESTDIR=3D"${D}" install-ctypes-python } python_execute_function \ --action-message 'Installation of Subversion Ctypes Python bindings wi= th $(python_get_implementation) $(python_get_version)' \ --failure-message 'Installation of Subversion Ctypes Python bindings f= ailed with $(python_get_implementation) $(python_get_version)' \ ctypes_python_bindings_installation fi if use python; then print print "Installation of Subversion SWIG Python bindings" print swig_python_bindings_installation() { rm -f subversion/bindings/swig/python ln -s python-${PYTHON_ABI} subversion/bindings/swig/python emake -j1 \ DESTDIR=3D"${D}" \ PYTHON_VERSION=3D"$(python_get_version)" \ swig_pydir=3D"${EPREFIX}$(python_get_sitedir)/libsvn" \ swig_pydir_extra=3D"${EPREFIX}$(python_get_sitedir)/svn" \ install-swig-py } python_execute_function \ --action-message 'Installation of Subversion SWIG Python bindings with= $(python_get_implementation) $(python_get_version)' \ --failure-message 'Installation of Subversion SWIG Python bindings fai= led with $(python_get_implementation) $(python_get_version)' \ swig_python_bindings_installation delete_static_libraries() { find "${ED}$(python_get_sitedir)" -name "*.a" -print0 | xargs -0 rm -f } python_execute_function -q delete_static_libraries fi if use ctypes-python || use python; then python_clean_installation_image -q fi if use perl; then print print "Installation of Subversion SWIG Perl bindings" print emake -j1 DESTDIR=3D"${D}" INSTALLDIRS=3D"vendor" install-swig-pl || di= e "Installation of Subversion SWIG Perl bindings failed" fixlocalpod find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0= rm -fr fi if use ruby; then print print "Installation of Subversion SWIG Ruby bindings" print emake -j1 DESTDIR=3D"${D}" install-swig-rb || die "Installation of Subv= ersion SWIG Ruby bindings failed" find "${ED}usr/$(get_libdir)/ruby" "(" -name "*.a" -o -name "*.la" ")" = -print0 | xargs -0 rm -f fi if use java; then print print "Installation of Subversion JavaHL library" print emake -j1 DESTDIR=3D"${D}" install-javahl || die "Installation of Subve= rsion JavaHL library failed" java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar fi # Install Apache module configuration. if use apache2; then mkdir -p "${D}${APACHE_MODULES_CONFDIR}" cat << EOF > "${D}${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf LoadModule dav_svn_module modules/mod_dav_svn.so LoadModule authz_svn_module modules/mod_authz_svn.so # Example configuration: # # DAV svn # SVNPath ${SVN_REPOS_LOC}/repos # AuthType Basic # AuthName "Subversion repository" # AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers # Require valid-user # EOF fi # Install Bash Completion, bug 43179. dobashcompletion tools/client-side/bash_completion subversion rm -f tools/client-side/bash_completion # Install hot backup script, bug 54304. newbin tools/backup/hot-backup.py svn-hot-backup rm -fr tools/backup # Install svn_load_dirs.pl. if use perl; then dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl fi rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl # Install svnserve init-script and xinet.d snippet, bug 43245. newinitd "${FILESDIR}"/svnserve.initd svnserve newconfd "${FILESDIR}"/svnserve.confd svnserve insinto /etc/xinetd.d newins "${FILESDIR}"/svnserve.xinetd svnserve # Install documentation. dodoc CHANGES COMMITTERS README dodoc tools/xslt/svnindex.{css,xsl} rm -fr tools/xslt # Install Vim syntax files. if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax doins contrib/client-side/vim/svn.vim fi rm -f contrib/client-side/vim/svn.vim # Install Emacs Lisps. if use emacs; then elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/= svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs= modules failed" elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} ||= die "Installation of Emacs modules failed" touch "${ED}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installat= ion of Emacs site-init file failed" fi rm -fr contrib/client-side/emacs # Install extra files. if use extras; then print print "Installation of contrib and tools" print cat << EOF > 80subversion-extras PATH=3D"${EPREFIX}/usr/$(get_libdir)/subversion/bin" ROOTPATH=3D"${EPREFIX}/usr/$(get_libdir)/subversion/bin" EOF doenvd 80subversion-extras emake DESTDIR=3D"${D}" contribdir=3D"/usr/$(get_libdir)/subversion/bin"= install-contrib || die "Installation of contrib failed" emake DESTDIR=3D"${D}" toolsdir=3D"/usr/$(get_libdir)/subversion/bin" i= nstall-tools || die "Installation of tools failed" find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" "= )" -print0 | xargs -0 rm -fr rm -fr contrib/client-side/svn-push rm -fr contrib/server-side/svnstsw rm -fr tools/client-side/svnmucc rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-vali= date}* rm -fr tools/{buildbot,dev,diff,po} insinto /usr/share/${PN} doins -r contrib tools fi if use doc; then print print "Installation of Subversion HTML documentation" print dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML do= cumentation failed" insinto /usr/share/doc/${PF} doins -r notes ecompressdir /usr/share/doc/${PF}/notes # if use ruby; then # emake DESTDIR=3D"${D}" install-swig-rb-doc # fi if use java; then java-pkg_dojavadoc doc/javadoc fi fi } pkg_preinst() { # Compare versions of Berkeley DB, bug 122877. if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then OLD_BDB_VERSION=3D"$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr= -1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-= \(.*\)/\1/")" NEW_BDB_VERSION=3D"$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.= so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.= *\)/\1/")" if [[ "${OLD_BDB_VERSION}" !=3D "${NEW_BDB_VERSION}" ]]; then CHANGED_BDB_VERSION=3D"1" fi fi } pkg_postinst() { use emacs && elisp-site-regen use perl && perl-module_pkg_postinst if use ctypes-python; then python_mod_optimize csvn fi if use python; then python_mod_optimize libsvn svn fi elog "Subversion Server Notes" elog "-----------------------" elog elog "If you intend to run a server, a repository needs to be created us= ing" elog "svnadmin (see man svnadmin) or the following command to create it = in" elog "${SVN_REPOS_LOC}:" elog elog " emerge --config =3D${CATEGORY}/${PF}" elog elog "Subversion has multiple server types, take your pick:" elog elog " - svnserve daemon: " elog " 1. Edit /etc/conf.d/svnserve" elog " 2. Fix the repository permissions (see \"Fixing the repository = permissions\")" elog " 3. Start daemon: /etc/init.d/svnserve start" elog " 4. Make persistent: rc-update add svnserve default" elog elog " - svnserve via xinetd:" elog " 1. Edit /etc/xinetd.d/svnserve (remove disable line)" elog " 2. Fix the repository permissions (see \"Fixing the repository = permissions\")" elog " 3. Restart xinetd.d: /etc/init.d/xinetd restart" elog elog " - svn over ssh:" elog " 1. Fix the repository permissions (see \"Fixing the repository = permissions\")" elog " Additionally run:" elog " groupadd svnusers" elog " chown -R root:svnusers ${SVN_REPOS_LOC}/repos" elog " 2. Create an svnserve wrapper in /usr/local/bin to set the umas= k you" elog " want, for example:" elog " #!/bin/bash" elog " . /etc/conf.d/svnserve" elog " umask 007" elog " exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\"" elog if use apache2; then elog " - http-based server:" elog " 1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-= D SVN\"" elog " 2. Create an htpasswd file:" elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" elog " 3. Fix the repository permissions (see \"Fixing the repository= permissions\")" elog " 4. Restart Apache: /etc/init.d/apache2 restart" elog fi elog " Fixing the repository permissions:" elog " chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf" elog " chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos" elog " chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db" elog " chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks" elog elog "If you intend to use svn-hot-backup, you can specify the number of= " elog "backups to keep per repository by specifying an environment variab= le." elog "If you want to keep e.g. 2 backups, do the following:" elog "echo '# hot-backup: Keep that many repository backups around' > /e= tc/env.d/80subversion" elog "echo 'SVN_HOTBACKUP_BACKUPS_NUMBER=3D2' >> /etc/env.d/80subversion= " elog elog "Subversion contains support for the use of Memcached" elog "to cache data of FSFS repositories." elog "You should install \"net-misc/memcached\", start memcached" elog "and configure your FSFS repositories, if you want to use this feat= ure." elog "See the documentation for details." elog if [[ -n "${CHANGED_BDB_VERSION}" ]]; then ewarn "You upgraded from an older version of Berkeley DB and may experi= ence" ewarn "problems with your repository. Run the following commands as roo= t to fix it:" ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" fi } pkg_postrm() { use emacs && elisp-site-regen use perl && perl-module_pkg_postrm if use ctypes-python; then python_mod_cleanup csvn fi if use python; then python_mod_cleanup libsvn svn fi } pkg_config() { einfo "Initializing the database in ${EROOT}${SVN_REPOS_LOC}..." if [[ -e "${EROOT}${SVN_REPOS_LOC}/repos" ]]; then echo "A Subversion repository already exists and I will not overwrite i= t." echo "Delete \"${EROOT}${SVN_REPOS_LOC}/repos\" first if you're sure yo= u want to have a clean version." else mkdir -p "${EROOT}${SVN_REPOS_LOC}/conf" einfo "Populating repository directory..." # Create initial repository. "${EROOT}usr/bin/svnadmin" create "${EROOT}${SVN_REPOS_LOC}/repos" einfo "Setting repository permissions..." SVNSERVE_USER=3D"$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_US= ER}")" SVNSERVE_GROUP=3D"$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_G= ROUP}")" if use apache2; then [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER=3D"apache" [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP=3D"apache" else [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER=3D"svn" [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP=3D"svnusers" enewgroup "${SVNSERVE_GROUP}" enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP= }" fi chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${EROOT}${SVN_REPOS_LOC= }/repos" chmod -Rf go-rwx "${EROOT}${SVN_REPOS_LOC}/conf" chmod -Rf o-rwx "${EROOT}${SVN_REPOS_LOC}/repos" fi }