diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index db548790b..bc1467c53 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,2 +1,2 @@ -DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d +DIST subversion-1.7.11.tar.bz2 6042338 SHA256 c383b19d8d0db4c736570f1eb6af196416b26d0b3bde64ae60988a9d1f7ac3c0 SHA512 3a0be9144b6eaa8d0d81a77d3f3f4a5cab782f2d98f52126fedaa53967211ec1a2c190f31ec99bba4157d31b2c721a352edc8f3f401465d8484681ef15a4d171 WHIRLPOOL 0563276b5e185fa5ccd454b85533925b2bc654f1ca6594f49feed15b1a6aedaed243837ad6c870e6b063765c91c0aca32b207c353f68746d875f5d6258b5d1ae DIST subversion-1.7.9.tar.bz2 6040347 SHA256 f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4 SHA512 04f1287ef7a114e12018d9a0c76c6ff5bcb977afc398710b8760c126975d1f8033462e9da3a75eba67359ad9166a9d3f980be9bc2d440e1e5b16545581e9100c WHIRLPOOL 551bf4a01c8d72c45efa4fdd1adeafe76036b5a77726b9b39396a1bb754f2d2a3b1a80b1ab07ac84c5aa6896e138dd3e53952b3f0832828f232526bbfd759275 diff --git a/dev-vcs/subversion-java/subversion-java-1.7.7.ebuild b/dev-vcs/subversion-java/subversion-java-1.7.11.ebuild similarity index 85% rename from dev-vcs/subversion-java/subversion-java-1.7.7.ebuild rename to dev-vcs/subversion-java/subversion-java-1.7.11.ebuild index 5e929df98..8b3f0cae7 100644 --- a/dev-vcs/subversion-java/subversion-java-1.7.7.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.7.11.ebuild @@ -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/_/-}" @@ -44,6 +44,7 @@ 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 + epatch_user fperms +x build/transform_libtool_scripts.sh @@ -51,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!" @@ -60,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() { @@ -87,6 +87,15 @@ src_configure() { *-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 @@ -115,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 diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index db548790b..bc1467c53 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,2 +1,2 @@ -DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d +DIST subversion-1.7.11.tar.bz2 6042338 SHA256 c383b19d8d0db4c736570f1eb6af196416b26d0b3bde64ae60988a9d1f7ac3c0 SHA512 3a0be9144b6eaa8d0d81a77d3f3f4a5cab782f2d98f52126fedaa53967211ec1a2c190f31ec99bba4157d31b2c721a352edc8f3f401465d8484681ef15a4d171 WHIRLPOOL 0563276b5e185fa5ccd454b85533925b2bc654f1ca6594f49feed15b1a6aedaed243837ad6c870e6b063765c91c0aca32b207c353f68746d875f5d6258b5d1ae DIST subversion-1.7.9.tar.bz2 6040347 SHA256 f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4 SHA512 04f1287ef7a114e12018d9a0c76c6ff5bcb977afc398710b8760c126975d1f8033462e9da3a75eba67359ad9166a9d3f980be9bc2d440e1e5b16545581e9100c WHIRLPOOL 551bf4a01c8d72c45efa4fdd1adeafe76036b5a77726b9b39396a1bb754f2d2a3b1a80b1ab07ac84c5aa6896e138dd3e53952b3f0832828f232526bbfd759275 diff --git a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch deleted file mode 100644 index e568b88a3..000000000 --- a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/03/21 18:22:15 1303489 -+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:54:26 1345740 -@@ -60,6 +60,9 @@ - /* KWallet simple provider, puts passwords in KWallet */ - /*-----------------------------------------------------------------------*/ - -+static int q_argc = 1; -+static char q_argv0[] = "svn"; // Build non-const char * from string constant -+static char *q_argv[] = { q_argv0 }; - - static const char * - get_application_name(apr_hash_t *parameters, -@@ -212,12 +215,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), -@@ -289,12 +291,11 @@ - QCoreApplication *app; - if (! qApp) - { -- int argc = 1; -- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); -+ int argc = q_argc; -+ app = new QCoreApplication(argc, q_argv); - } - -- KCmdLineArgs::init(1, -- (char *[1]) {(char *) "svn"}, -+ KCmdLineArgs::init(q_argc, q_argv, - get_application_name(parameters, pool), - "subversion", - ki18n(get_application_name(parameters, pool)), diff --git a/dev-vcs/subversion/subversion-1.7.7.ebuild b/dev-vcs/subversion/subversion-1.7.11.ebuild similarity index 69% rename from dev-vcs/subversion/subversion-1.7.7.ebuild rename to dev-vcs/subversion/subversion-1.7.11.ebuild index af045d365..6a1550cf9 100644 --- a/dev-vcs/subversion/subversion-1.7.7.ebuild +++ b/dev-vcs/subversion/subversion-1.7.11.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*" +EAPI=5 +PYTHON_COMPAT=( python{2_5,2_6,2_7} ) +DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" MY_P="${P/_/-}" -inherit autotools bash-completion-r1 db-use depend.apache elisp-common eutils flag-o-matic libtool multilib perl-module python +inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils DESCRIPTION="Advanced version control system" HOMEPAGE="http://subversion.apache.org/" @@ -18,29 +18,32 @@ S="${WORKDIR}/${MY_P}" LICENSE="Subversion GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" +IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf" -CDEPEND=">=dev-db/sqlite-3.4 +COMMON_DEPEND=">=dev-db/sqlite-3.4[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14 ) - ctypes-python? ( =dev-lang/python-2* ) + ctypes-python? ( ${PYTHON_DEPS} ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) - python? ( =dev-lang/python-2* ) - ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) + python? ( ${PYTHON_DEPS} ) + ruby? ( >=dev-lang/ruby-1.8.2:1.8 + dev-ruby/rubygems[ruby_targets_ruby18] ) sasl? ( dev-libs/cyrus-sasl ) webdav-neon? ( >=net-libs/neon-0.28 ) webdav-serf? ( >=net-libs/serf-0.3.0 )" -RDEPEND="${CDEPEND} +RDEPEND="${COMMON_DEPEND} apache2? ( www-servers/apache[apache2_modules_dav] ) kde? ( kde-base/kwalletd ) nls? ( virtual/libintl ) perl? ( dev-perl/URI )" -DEPEND="${CDEPEND} +# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once +DEPEND="${COMMON_DEPEND} + test? ( ${PYTHON_DEPS} ) !!/dev/null || die + distutils-r1_src_compile + popd >/dev/null || die fi if use python; then - 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="-I${EPREFIX}$(python_get_includedir)" \ - PYTHON_VERSION="$(python_get_version)" \ - swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \ - swig-py + swig_py_compile() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + python_export PYTHON_INCLUDEDIR + emake swig-py \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" } - python_execute_function \ - --action-message 'Building of Subversion SWIG Python bindings with $(python_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 + + # this will give us proper BUILD_DIR for symlinking + BUILD_DIR=python \ + python_foreach_impl swig_py_compile fi if use perl; then - emake swig-pl || die "Building of Subversion SWIG Perl bindings failed" + emake swig-pl fi if use ruby; then - emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" + emake swig-rb fi if use extras; then - emake tools || die "Building of tools failed" + emake tools fi if use doc; then @@ -241,50 +258,64 @@ src_compile() { fi } -src_install() { - emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" +src_test() { + default if use ctypes-python; then - ctypes_python_bindings_installation() { - rm -f subversion/bindings/ctypes-python - ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python - emake DESTDIR="${D}" install-ctypes-python + python_test() { + "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \ + || die "ctypes-python tests fail with ${EPYTHON}" } - python_execute_function \ - --action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \ - --failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \ - ctypes_python_bindings_installation + + distutils-r1_src_test fi if use python; then - swig_python_bindings_installation() { - rm -f subversion/bindings/swig/python - ln -s python-${PYTHON_ABI} subversion/bindings/swig/python - emake \ - DESTDIR="${D}" \ - PYTHON_VERSION="$(python_get_version)" \ - swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \ - swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \ - install-swig-py + swig_py_test() { + pushd "${BUILD_DIR}" >/dev/null || die + "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}" + popd >/dev/null || die } - 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 failed with $(python_get_implementation) $(python_get_version)' \ - swig_python_bindings_installation + + BUILD_DIR=subversion/bindings/swig/python \ + python_foreach_impl swig_py_test + fi +} + +src_install() { + emake -j1 DESTDIR="${D}" local-install + + if use ctypes-python; then + pushd subversion/bindings/ctypes-python >/dev/null || die + distutils-r1_src_install + popd >/dev/null || die fi - if use ctypes-python || use python; then - python_clean_installation_image -q + if use python; then + swig_py_install() { + local p=subversion/bindings/swig/python + rm -f ${p} || die + ln -s "${BUILD_DIR}" ${p} || die + + emake \ + DESTDIR="${D}" \ + swig_pydir="$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="$(python_get_sitedir)/svn" \ + install-swig-py + } + + BUILD_DIR=python \ + python_foreach_impl swig_py_install fi if use perl; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed" + emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl fixlocalpod - find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr + find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete fi if use ruby; then - emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed" + emake DESTDIR="${D}" install-swig-rb fi # Install Apache module configuration. @@ -337,12 +368,12 @@ EOF rm -fr tools/{buildbot,dev,diff,po} insinto /usr/share/${PN} - python_convert_shebangs -r 2 tools + find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die doins -r tools fi if use doc; then - dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" + dohtml -r doc/doxygen/html/* fi find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f @@ -367,14 +398,6 @@ pkg_preinst() { pkg_postinst() { 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 - if [[ -n "${CHANGED_BDB_VERSION}" ]]; then ewarn "You upgraded from an older version of Berkeley DB and may experience" ewarn "problems with your repository. Run the following commands as root to fix it:" @@ -387,14 +410,6 @@ pkg_postinst() { pkg_postrm() { 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() { diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest index 43db07c80..91be164e5 100644 --- a/www-apache/mod_dav_svn/Manifest +++ b/www-apache/mod_dav_svn/Manifest @@ -1,3 +1,3 @@ +DIST subversion-1.7.11.tar.bz2 6042338 SHA256 c383b19d8d0db4c736570f1eb6af196416b26d0b3bde64ae60988a9d1f7ac3c0 SHA512 3a0be9144b6eaa8d0d81a77d3f3f4a5cab782f2d98f52126fedaa53967211ec1a2c190f31ec99bba4157d31b2c721a352edc8f3f401465d8484681ef15a4d171 WHIRLPOOL 0563276b5e185fa5ccd454b85533925b2bc654f1ca6594f49feed15b1a6aedaed243837ad6c870e6b063765c91c0aca32b207c353f68746d875f5d6258b5d1ae DIST subversion-1.7.7-Gentoo-patches.tar.gz 2035 SHA256 2e4ee343fb0ed56c9488f3de808133ebbbfb697a717251616d391c1b6268e8c1 SHA512 ab5810639cdd7fa7454b1b8dfc159e221c4ab276b5ac76502ef0c32512839cc0f2d776c98aeac30fe99946a7ab68c1d489a93ec8a4cf74961e1c0c29649e3425 WHIRLPOOL ce7d66223f6c632ebdbb0b3d272cb66e7122cf3aaabbb78081fccce6ad4e266221294130da904abe8c963e9bf4014fce3cec2c3b88e84201b244104cc9748d03 -DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d DIST subversion-1.7.9.tar.bz2 6040347 SHA256 f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4 SHA512 04f1287ef7a114e12018d9a0c76c6ff5bcb977afc398710b8760c126975d1f8033462e9da3a75eba67359ad9166a9d3f980be9bc2d440e1e5b16545581e9100c WHIRLPOOL 551bf4a01c8d72c45efa4fdd1adeafe76036b5a77726b9b39396a1bb754f2d2a3b1a80b1ab07ac84c5aa6896e138dd3e53952b3f0832828f232526bbfd759275 diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.7.7.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.7.11.ebuild similarity index 92% rename from www-apache/mod_dav_svn/mod_dav_svn-1.7.7.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.7.11.ebuild index c8898fad3..f685c5456 100644 --- a/www-apache/mod_dav_svn/mod_dav_svn-1.7.7.ebuild +++ b/www-apache/mod_dav_svn/mod_dav_svn-1.7.11.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="3" +EAPI=5 WANT_AUTOMAKE="none" MY_P="${P/_/-}" @@ -15,7 +15,7 @@ inherit autotools db-use depend.apache flag-o-matic libtool multilib eutils DESCRIPTION="Subversion WebDAV support" HOMEPAGE="http://subversion.apache.org/" SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2 - mirror://sabayon/dev-vcs/${MY_SVN_PN}-${PV}-Gentoo-patches.tar.gz" + mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.7.7-Gentoo-patches.tar.gz" S="${WORKDIR}/${MY_SVN_P}" LICENSE="Subversion" @@ -42,7 +42,7 @@ IUSE="berkdb debug +dso nls sasl +webdav-neon webdav-serf" # variable specific to www-apache/mod_dav_svn MY_CDEPS=" ~dev-vcs/subversion-${PV}[berkdb=,debug=,dso=,nls=,sasl=,webdav-neon=,webdav-serf=] - >=dev-db/sqlite-3.4 + >=dev-db/sqlite-3.4[threadsafe(+)] >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat @@ -113,13 +113,14 @@ pkg_setup() { } src_prepare() { - local d=${WORKDIR}/${PV}-Gentoo-patches + local d=${WORKDIR}/1.7.7-Gentoo-patches epatch "${d}"/${MY_SVN_PN}-1.5.4-interix.patch \ "${d}"/${MY_SVN_PN}-1.5.6-aix-dso.patch \ "${d}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch \ - "${d}"/${MY_SVN_PN}-fix-parallel-build-support-for-perl-bindings.patch \ - "${d}"/${MY_SVN_PN}-1.7.6-kwallet.patch + "${d}"/${MY_SVN_PN}-fix-parallel-build-support-for-perl-bindings.patch + # "${d}"/${MY_SVN_PN}-1.7.6-kwallet.patch + epatch_user fperms +x build/transform_libtool_scripts.sh @@ -127,8 +128,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!" @@ -136,7 +135,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() { @@ -167,6 +167,15 @@ src_configure() { *-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 @@ -179,7 +188,9 @@ src_configure() { myconf+=" --disable-disallowing-of-undefined-references" #force ruby-1.8 for bug 399105 + #allow overriding Python include directory ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \ + ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ --with-apxs="${APXS}" \ $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ @@ -197,18 +208,17 @@ 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 apache-mod || die + emake apache-mod } src_install() { - emake DESTDIR="${D}" install-mods-shared || die + emake DESTDIR="${D}" install-mods-shared # Install Apache module configuration. #use apache2