diff options
author | Thomas Sachau <tommy@gentoo.org> | 2012-10-25 17:07:41 +0000 |
---|---|---|
committer | Thomas Sachau <tommy@gentoo.org> | 2012-10-25 17:07:41 +0000 |
commit | 5ba64d5beb14fc8c38a7071b9b3b875056d2fc36 (patch) | |
tree | 2abd95eb5d3ab7712e4d4d66a6056c07a7e3e905 /dev-vcs/subversion | |
parent | Drop dodoc on notes/*, since that does not exist any more (diff) | |
download | gentoo-2-5ba64d5beb14fc8c38a7071b9b3b875056d2fc36.tar.gz gentoo-2-5ba64d5beb14fc8c38a7071b9b3b875056d2fc36.tar.bz2 gentoo-2-5ba64d5beb14fc8c38a7071b9b3b875056d2fc36.zip |
Version bump, fixes bug 439362, drop old versions
(Portage version: 2.2.0_alpha141-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)
Diffstat (limited to 'dev-vcs/subversion')
-rw-r--r-- | dev-vcs/subversion/ChangeLog | 9 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.7.0.ebuild | 437 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.7.1.ebuild | 437 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.7.2.ebuild | 438 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.7.4.ebuild | 451 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.7.7.ebuild (renamed from dev-vcs/subversion/subversion-1.7.5.ebuild) | 24 |
6 files changed, 24 insertions, 1772 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog index 8f52aa98db03..807670ce50bd 100644 --- a/dev-vcs/subversion/ChangeLog +++ b/dev-vcs/subversion/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.84 2012/10/25 17:04:23 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.85 2012/10/25 17:07:41 tommy Exp $ + +*subversion-1.7.7 (25 Oct 2012) + + 25 Oct 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + -subversion-1.7.0.ebuild, -subversion-1.7.1.ebuild, -subversion-1.7.2.ebuild, + -subversion-1.7.4.ebuild, -subversion-1.7.5.ebuild, +subversion-1.7.7.ebuild: + Version bump, fixes bug 439362, drop old versions 25 Oct 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> subversion-1.7.6.ebuild: diff --git a/dev-vcs/subversion/subversion-1.7.0.ebuild b/dev-vcs/subversion/subversion-1.7.0.ebuild deleted file mode 100644 index 5dd0e4735f9e..000000000000 --- a/dev-vcs/subversion/subversion-1.7.0.ebuild +++ /dev/null @@ -1,437 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.0.ebuild,v 1.5 2012/07/20 16:19:07 kensington Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*" -WANT_AUTOMAKE="none" -MY_P="${P/_/-}" - -inherit autotools base bash-completion db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python user - -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" - -CDEPEND=">=dev-db/sqlite-3.4 - >=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* ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) - kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 ) - perl? ( dev-lang/perl ) - python? ( =dev-lang/python-2* ) - ruby? ( >=dev-lang/ruby-1.8.2 ) - sasl? ( dev-libs/cyrus-sasl ) - webdav-neon? ( >=net-libs/neon-0.28 ) - webdav-serf? ( >=net-libs/serf-0.3.0 )" -RDEPEND="${CDEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - java? ( >=virtual/jre-1.5 ) - kde? ( kde-base/kwalletd ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -DEPEND="${CDEPEND} - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - java? ( >=virtual/jdk-1.5 ) - kde? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - webdav-neon? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}/${PN}-1.5.4-interix.patch" - "${FILESDIR}/${PN}-1.5.6-aix-dso.patch" - "${FILESDIR}/${PN}-1.6.3-hpux-dso.patch" -) - -want_apache - -pkg_setup() { - if use berkdb; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]]; then - if [[ -n "${apu_bdb_version}" ]]; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; 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_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${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; then - python_pkg_setup - fi - - if ! use webdav-neon && ! use webdav-serf; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling one of the following USE-flags:" - ewarn " webdav-neon webdav-serf" - echo -ne "\a" - fi - - if use debug; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" -} - -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 - - if use python || use perl || use ruby; then - myconf+=" --with-swig" - else - myconf+=" --without-swig" - fi - - if use java; then - myconf+=" --without-junit" - fi - - if use kde || 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)" \ - $(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_with sasl) \ - $(use_with webdav-neon neon) \ - $(use_with webdav-serf serf "${EPREFIX}/usr") \ - ${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 local-all || die "Building of core of Subversion failed" - - if use ctypes-python; then - 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 failed with $(python_get_implementation) $(python_get_version)' \ - ctypes_python_bindings_building - 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 - } - 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 - fi - - if use perl; then - emake swig-pl || die "Building of Subversion SWIG Perl bindings failed" - fi - - if use ruby; then - emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed" - fi - - if use extras; then - emake tools || die "Building of tools failed" - fi - - if use doc; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - - if use java; then - emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed" - fi - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" - - 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_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 - 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 - } - 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 - fi - - if use ctypes-python || use python; then - python_clean_installation_image -q - fi - - if use perl; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "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 - emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake DESTDIR="${D}" install-javahl || die "Installation of Subversion 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 - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - 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 svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd2 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 extra files. - if use extras; then - cat << EOF > 80subversion-extras -PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed" - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - doins -r tools - fi - - if use doc; then - dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" - - dodoc notes/* - - if use java; then - java-pkg_dojavadoc doc/javadoc - fi - fi - - find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(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}" != "${NEW_BDB_VERSION}" ]]; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -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:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -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() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..." - if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - enewgroup "${SVNSERVE_GROUP}" - enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}" - fi - chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos" - chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos" - fi -} diff --git a/dev-vcs/subversion/subversion-1.7.1.ebuild b/dev-vcs/subversion/subversion-1.7.1.ebuild deleted file mode 100644 index 38a7dc5a8de2..000000000000 --- a/dev-vcs/subversion/subversion-1.7.1.ebuild +++ /dev/null @@ -1,437 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.6 2012/07/20 16:19:07 kensington Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*" -WANT_AUTOMAKE="none" -MY_P="${P/_/-}" - -inherit autotools base bash-completion db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python user - -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" - -CDEPEND=">=dev-db/sqlite-3.4 - >=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* ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) - kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 ) - perl? ( dev-lang/perl ) - python? ( =dev-lang/python-2* ) - ruby? ( >=dev-lang/ruby-1.8.2 ) - sasl? ( dev-libs/cyrus-sasl ) - webdav-neon? ( >=net-libs/neon-0.28 ) - webdav-serf? ( >=net-libs/serf-0.3.0 )" -RDEPEND="${CDEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - java? ( >=virtual/jre-1.5 ) - kde? ( kde-base/kwalletd ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -DEPEND="${CDEPEND} - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - java? ( >=virtual/jdk-1.5 ) - kde? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - webdav-neon? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}/${PN}-1.5.4-interix.patch" - "${FILESDIR}/${PN}-1.5.6-aix-dso.patch" - "${FILESDIR}/${PN}-1.6.3-hpux-dso.patch" -) - -want_apache - -pkg_setup() { - if use berkdb; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]]; then - if [[ -n "${apu_bdb_version}" ]]; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; 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_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${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; then - python_pkg_setup - fi - - if ! use webdav-neon && ! use webdav-serf; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling one of the following USE-flags:" - ewarn " webdav-neon webdav-serf" - echo -ne "\a" - fi - - if use debug; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" -} - -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 - - if use python || use perl || use ruby; then - myconf+=" --with-swig" - else - myconf+=" --without-swig" - fi - - if use java; then - myconf+=" --without-junit" - fi - - if use kde || 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)" \ - $(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_with sasl) \ - $(use_with webdav-neon neon) \ - $(use_with webdav-serf serf "${EPREFIX}/usr") \ - ${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 local-all || die "Building of core of Subversion failed" - - if use ctypes-python; then - 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 failed with $(python_get_implementation) $(python_get_version)' \ - ctypes_python_bindings_building - 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 - } - 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 - fi - - if use perl; then - emake swig-pl || die "Building of Subversion SWIG Perl bindings failed" - fi - - if use ruby; then - emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed" - fi - - if use extras; then - emake tools || die "Building of tools failed" - fi - - if use doc; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - - if use java; then - emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed" - fi - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" - - 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_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 - 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 - } - 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 - fi - - if use ctypes-python || use python; then - python_clean_installation_image -q - fi - - if use perl; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "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 - emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) - 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 - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - 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 svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd2 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 extra files. - if use extras; then - cat << EOF > 80subversion-extras -PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed" - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - doins -r tools - fi - - if use doc; then - dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" - - dodoc notes/* - - if use java; then - java-pkg_dojavadoc doc/javadoc - fi - fi - - find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -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:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -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() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..." - if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - enewgroup "${SVNSERVE_GROUP}" - enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}" - fi - chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos" - chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos" - fi -} diff --git a/dev-vcs/subversion/subversion-1.7.2.ebuild b/dev-vcs/subversion/subversion-1.7.2.ebuild deleted file mode 100644 index 8c6f51cec581..000000000000 --- a/dev-vcs/subversion/subversion-1.7.2.ebuild +++ /dev/null @@ -1,438 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.2.ebuild,v 1.6 2012/07/20 16:19:07 kensington Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*" -WANT_AUTOMAKE="none" -MY_P="${P/_/-}" - -inherit autotools base bash-completion-r1 db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python user - -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" - -CDEPEND=">=dev-db/sqlite-3.4 - >=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* ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) - kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 ) - perl? ( dev-lang/perl ) - python? ( =dev-lang/python-2* ) - ruby? ( >=dev-lang/ruby-1.8.2 ) - sasl? ( dev-libs/cyrus-sasl ) - webdav-neon? ( >=net-libs/neon-0.28 ) - webdav-serf? ( >=net-libs/serf-0.3.0 )" -RDEPEND="${CDEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - java? ( >=virtual/jre-1.5 ) - kde? ( kde-base/kwalletd ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -DEPEND="${CDEPEND} - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - java? ( >=virtual/jdk-1.5 ) - kde? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - webdav-neon? ( virtual/pkgconfig )" - -PATCHES=( - "${FILESDIR}/${PN}-1.5.4-interix.patch" - "${FILESDIR}/${PN}-1.5.6-aix-dso.patch" - "${FILESDIR}/${PN}-1.6.3-hpux-dso.patch" -) - -want_apache - -pkg_setup() { - if use berkdb; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]]; then - if [[ -n "${apu_bdb_version}" ]]; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; 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_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${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; then - python_pkg_setup - fi - - if ! use webdav-neon && ! use webdav-serf; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling one of the following USE-flags:" - ewarn " webdav-neon webdav-serf" - echo -ne "\a" - fi - - if use debug; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" -} - -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 - - if use python || use perl || use ruby; then - myconf+=" --with-swig" - else - myconf+=" --without-swig" - fi - - if use java; then - myconf+=" --without-junit" - fi - - if use kde || use nls; then - myconf+=" --enable-nls" - else - myconf+=" --disable-nls" - fi - - case ${CHOST} in - *-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)" \ - $(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_with sasl) \ - $(use_with webdav-neon neon) \ - $(use_with webdav-serf serf "${EPREFIX}/usr") \ - ${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 local-all || die "Building of core of Subversion failed" - - if use ctypes-python; then - 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 failed with $(python_get_implementation) $(python_get_version)' \ - ctypes_python_bindings_building - 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 - } - 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 - fi - - if use perl; then - emake swig-pl || die "Building of Subversion SWIG Perl bindings failed" - fi - - if use ruby; then - emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed" - fi - - if use extras; then - emake tools || die "Building of tools failed" - fi - - if use doc; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - - if use java; then - emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed" - fi - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" - - 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_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 - 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 - } - 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 - fi - - if use ctypes-python || use python; then - python_clean_installation_image -q - fi - - if use perl; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "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 - emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) - 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 - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - fi - - # Install Bash Completion, bug 43179. - newbashcomp 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 svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd2 svnserve - newconfd "${FILESDIR}"/svnserve.confd svnserve - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - #adjust default user and group with disabled apache2 USE flag, bug 381385 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${D}"etc/init.d/svnserve - - # Install documentation. - dodoc CHANGES COMMITTERS README - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install extra files. - if use extras; then - cat << EOF > 80subversion-extras -PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed" - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - doins -r tools - fi - - if use doc; then - dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" - - dodoc notes/* - - if use java; then - java-pkg_dojavadoc doc/javadoc - fi - fi - - find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -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:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -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() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..." - if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - enewgroup "${SVNSERVE_GROUP}" - enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}" - fi - chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos" - chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos" - fi -} diff --git a/dev-vcs/subversion/subversion-1.7.4.ebuild b/dev-vcs/subversion/subversion-1.7.4.ebuild deleted file mode 100644 index b2377e302ed2..000000000000 --- a/dev-vcs/subversion/subversion-1.7.4.ebuild +++ /dev/null @@ -1,451 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.4.ebuild,v 1.6 2012/07/20 16:19:07 kensington Exp $ - -EAPI="3" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*" -WANT_AUTOMAKE="none" -MY_P="${P/_/-}" - -inherit autotools bash-completion-r1 db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python eutils - -DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="Subversion" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" - -CDEPEND=">=dev-db/sqlite-3.4 - >=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* ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) - kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 ) - perl? ( dev-lang/perl ) - python? ( =dev-lang/python-2* ) - ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) - sasl? ( dev-libs/cyrus-sasl ) - webdav-neon? ( >=net-libs/neon-0.28 ) - webdav-serf? ( >=net-libs/serf-0.3.0 )" -RDEPEND="${CDEPEND} - apache2? ( www-servers/apache[apache2_modules_dav] ) - java? ( >=virtual/jre-1.5 ) - kde? ( kde-base/kwalletd ) - nls? ( virtual/libintl ) - perl? ( dev-perl/URI )" -DEPEND="${CDEPEND} - !!<sys-apps/sandbox-1.6 - ctypes-python? ( dev-python/ctypesgen ) - doc? ( app-doc/doxygen ) - gnome-keyring? ( virtual/pkgconfig ) - java? ( >=virtual/jdk-1.5 ) - kde? ( virtual/pkgconfig ) - nls? ( sys-devel/gettext ) - webdav-neon? ( virtual/pkgconfig )" - -want_apache - -pkg_setup() { - if use berkdb; then - local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ - | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ - | sed 's:.*b::')" - einfo - if [[ -z "${SVN_BDB_VERSION}" ]]; then - if [[ -n "${apu_bdb_version}" ]]; then - SVN_BDB_VERSION="${apu_bdb_version}" - einfo "Matching db version to apr-util" - else - SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" - einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." - fi - fi - einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" - einfo - - if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; 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_VERSION}." - eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${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; then - python_pkg_setup - fi - - if ! use webdav-neon && ! use webdav-serf; then - ewarn "WebDAV support is disabled. You need WebDAV to" - ewarn "access repositories through the HTTP protocol." - ewarn "Consider enabling one of the following USE-flags:" - ewarn " webdav-neon webdav-serf" - echo -ne "\a" - fi - - if use debug; then - append-cppflags -DSVN_DEBUG -DAP_DEBUG - fi - - # Allow for custom repository locations. - SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \ - "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \ - "${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \ - "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch - - 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 - - if use python || use perl || use ruby; then - myconf+=" --with-swig" - else - myconf+=" --without-swig" - fi - - if use java; then - myconf+=" --without-junit" - fi - - if use kde || use nls; then - myconf+=" --enable-nls" - else - myconf+=" --disable-nls" - fi - - case ${CHOST} in - *-aix*) - # avoid recording immediate path to sharedlibs into executables - append-ldflags -Wl,-bnoipath - ;; - *-interix*) - # loader crashes on the LD_PRELOADs... - myconf+=" --disable-local-library-preloading" - ;; - esac - - #workaround for bug 387057 - has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references" - - #force ruby-1.8 for bug 399105 - ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \ - econf --libdir="${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_with sasl) \ - $(use_with webdav-neon neon) \ - $(use_with webdav-serf serf "${EPREFIX}/usr") \ - ${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 local-all || die "Building of core of Subversion failed" - - if use ctypes-python; then - 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 failed with $(python_get_implementation) $(python_get_version)' \ - ctypes_python_bindings_building - 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 - } - 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 - fi - - if use perl; then - emake swig-pl || die "Building of Subversion SWIG Perl bindings failed" - fi - - if use ruby; then - emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed" - fi - - if use extras; then - emake tools || die "Building of tools failed" - fi - - if use doc; then - doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" - - if use java; then - emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed" - fi - fi -} - -src_install() { - emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" - - 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_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 - 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 - } - 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 - fi - - if use ctypes-python || use python; then - python_clean_installation_image -q - fi - - if use perl; then - emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "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 - emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed" - fi - - if use java; then - emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) - 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 - keepdir "${APACHE_MODULES_CONFDIR}" - insinto "${APACHE_MODULES_CONFDIR}" - doins "${FILESDIR}/47_mod_dav_svn.conf" - fi - - # Install Bash Completion, bug 43179. - newbashcomp 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 svnserve init-script and xinet.d snippet, bug 43245. - newinitd "${FILESDIR}"/svnserve.initd2 svnserve - newconfd "${FILESDIR}"/svnserve.confd svnserve - insinto /etc/xinetd.d - newins "${FILESDIR}"/svnserve.xinetd svnserve - - #adjust default user and group with disabled apache2 USE flag, bug 381385 - use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ - -e "s\GROUP:-apache\GROUP:-svnusers\g" \ - -i "${ED}"etc/init.d/svnserve || die - use apache2 || sed -e "0,/apache/s//svn/" \ - -e "s:apache:svnusers:" \ - -i "${ED}"etc/xinetd.d/svnserve || die - - # Install documentation. - dodoc CHANGES COMMITTERS README - dodoc tools/xslt/svnindex.{css,xsl} - rm -fr tools/xslt - - # Install extra files. - if use extras; then - cat << EOF > 80subversion-extras -PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" -EOF - doenvd 80subversion-extras - - emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed" - - find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr - rm -fr tools/client-side/svnmucc - rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* - rm -fr tools/{buildbot,dev,diff,po} - - insinto /usr/share/${PN} - doins -r tools - fi - - if use doc; then - dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" - - dodoc notes/* - - if use java; then - java-pkg_dojavadoc doc/javadoc - fi - fi - - find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f - - cd "${ED}"usr/share/locale - for i in * ; do - [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; } - done -} - -pkg_preinst() { - # Compare versions of Berkeley DB, bug 122877. - if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then - CHANGED_BDB_VERSION="1" - fi - fi -} - -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:" - ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" - ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" - fi - - ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." -} - -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() { - # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} - # already has EPREFIX in it - einfo "Initializing the database in ${SVN_REPOS_LOC}..." - if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then - echo "A Subversion repository already exists and I will not overwrite it." - echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version." - else - mkdir -p "${SVN_REPOS_LOC}/conf" - - einfo "Populating repository directory..." - # Create initial repository. - "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" - - einfo "Setting repository permissions..." - SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" - SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" - if use apache2; then - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" - else - [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" - [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" - fi - chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" - chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" - echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" - echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." - echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" - echo "to finish the configuration." - fi -} diff --git a/dev-vcs/subversion/subversion-1.7.5.ebuild b/dev-vcs/subversion/subversion-1.7.7.ebuild index 5e18c83519cb..53f53ee6dfd0 100644 --- a/dev-vcs/subversion/subversion-1.7.5.ebuild +++ b/dev-vcs/subversion/subversion-1.7.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.5.ebuild,v 1.2 2012/07/20 16:19:07 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.1 2012/10/25 17:07:41 tommy Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -12,10 +12,10 @@ inherit autotools bash-completion-r1 db-use depend.apache elisp-common flag-o-ma DESCRIPTION="Advanced version control system" HOMEPAGE="http://subversion.apache.org/" -SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" -LICENSE="Subversion" +LICENSE="Subversion GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" @@ -108,7 +108,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \ "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \ "${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \ - "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch + "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \ + "${FILESDIR}"/${PN}-1.7.6-kwallet.patch fperms +x build/transform_libtool_scripts.sh @@ -156,11 +157,20 @@ src_configure() { # loader crashes on the LD_PRELOADs... myconf+=" --disable-local-library-preloading" ;; + *-solaris*) + # need -lintl to link + use nls && append-libs intl + ;; 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" + #force ruby-1.8 for bug 399105 ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -183,8 +193,7 @@ src_configure() { --enable-local-library-preloading \ --disable-mod-activation \ --disable-neon-version-check \ - --disable-static \ - --with-sqlite="${EPREFIX}/usr" + --disable-static } src_compile() { @@ -351,14 +360,13 @@ EOF rm -fr tools/{buildbot,dev,diff,po} insinto /usr/share/${PN} + python_convert_shebangs -r 2 tools doins -r tools fi if use doc; then dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" - dodoc notes/* - if use java; then java-pkg_dojavadoc doc/javadoc fi |