diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index f66a5d981..99f04fb5d 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,3 +1,3 @@ +DIST subversion-1.8.18-patchset.tar.bz2 7407 SHA256 d4a8b4c44286e5ceebce2a4791fd06483eb868df3b20cc941cc358eb1c55b31f SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 WHIRLPOOL adb60234b115e6e2ba2007dd824ab995ac558c8560cf471c9b2e465063a27657d75db32a3946e3652842a3ba9e340aff334ee2e78bb4bf1b43fa610dda5f235e DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 -DIST subversion-1.9.5.tar.bz2 7904861 SHA256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 SHA512 ff7241ffae2506e97f40011242b5d5c6fa665f5463743f9acc52136b59ad84b6db00b60e70c44a9060579db49b818db06da1d1352aaee78e5bfe6ce56f32a2cf WHIRLPOOL 37a124dc2f99bb465b47083de168530f8178305e3208972d56c2c29a93bbf73ded816f742808cf9e7a5d3f13690e48cdd9f800abd85452ad1da4c13d603454f3 DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2 diff --git a/dev-vcs/subversion-java/files b/dev-vcs/subversion-java/files new file mode 120000 index 000000000..984a23b9c --- /dev/null +++ b/dev-vcs/subversion-java/files @@ -0,0 +1 @@ +../subversion/files \ No newline at end of file diff --git a/dev-vcs/subversion-java/subversion-java-1.9.5.ebuild b/dev-vcs/subversion-java/subversion-java-1.9.7-r1.ebuild similarity index 54% rename from dev-vcs/subversion-java/subversion-java-1.9.5.ebuild rename to dev-vcs/subversion-java/subversion-java-1.9.7-r1.ebuild index 8660b334e..7fbec3a86 100644 --- a/dev-vcs/subversion-java/subversion-java-1.9.5.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.9.7-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 + WANT_AUTOMAKE="none" MY_P="${P/_/-}" @@ -11,16 +12,14 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}" MY_SVN_CATEGORY="${CATEGORY}" # note: java-pkg-2, not java-pkt-opt-2 -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.9.5-Gentoo-patches.tar.gz ) -inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib +inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib xdg-utils DESCRIPTION="Java bindings for Subversion" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/${MY_SVN_PN}-1.8.18-patchset.tar.bz2" S="${WORKDIR}/${MY_SVN_P/_/-}" -sab-patches_update_SRC_URI - LICENSE="Subversion" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" @@ -38,6 +37,34 @@ RDEPEND=" DEPEND="${COMMON_DEPEND} >=virtual/jdk-1.5" +# Making PATCHES more friendly for merging with Gentoo. +# Simple variable expansion is being done (so keep it updated). +_sab_PATCHES=' + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch + "${FILESDIR}"/${P}-kf5.patch +' +PATCHES=() +while read -r _sab_p; do + _sab_kvs=( + '${P}' "${MY_SVN_P}" '${PN}' "${MY_SVN_PN}" '"${WORKDIR}"' "${WORKDIR}" '"${FILESDIR}"' "${FILESDIR}" + ) + while (( ${#_sab_kvs[@]} )); do + _sab_k=${_sab_kvs[0]} + _sab_v=${_sab_kvs[1]} + _sab_p=${_sab_p//${_sab_k}/${_sab_v}} + _sab_kvs=( "${_sab_kvs[@]:2}" ) + done + [[ ${_sab_p} = *\$* ]] && die "${_sab_p} not fully \$-evaluated" + [[ -n ${_sab_p} ]] && PATCHES+=( "${_sab_p}" ) +done <<< "${_sab_PATCHES}" +unset _sab_k _sab_v _sab_PATCHES _sab_kvs _sab_p +[[ -z ${PATCHES[0]} ]] && die "PATCHES sanity check failed." + pkg_setup() { java-pkg-2_pkg_setup @@ -49,7 +76,7 @@ pkg_setup() { } src_prepare() { - sab-patches_apply_all + default fperms +x build/transform_libtool_scripts.sh @@ -66,10 +93,32 @@ src_prepare() { sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \ -i build-outputs.mk || die "sed failed" + + xdg_environment_reset } src_configure() { - local myconf=() + local myconf=( + --libdir="${EPREFIX%/}/usr/$(get_libdir)" + --without-apache-libexecdir + --without-apxs + --without-berkeley-db + --without-ctypesgen + --disable-runtime-module-search + --without-gnome-keyring + --enable-javahl + --with-jdk="${JAVA_HOME}" + --without-kwallet + $(use_enable nls) + --without-sasl + --without-serf + --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" + --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" + --disable-experimental-libtool + --without-jikes + --disable-mod-activation + --disable-static + ) myconf+=( --without-swig ) myconf+=( --without-junit ) @@ -79,6 +128,10 @@ src_configure() { # avoid recording immediate path to sharedlibs into executables append-ldflags -Wl,-bnoipath ;; + *-cygwin*) + # no LD_PRELOAD support, no undefined symbols + myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined ) + ;; *-interix*) # loader crashes on the LD_PRELOADs... myconf+=( --disable-local-library-preloading ) @@ -102,27 +155,7 @@ src_configure() { #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 ) - - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --without-apache-libexecdir \ - --without-apxs \ - --without-berkeley-db \ - --without-ctypesgen \ - --disable-runtime-module-search \ - --without-gnome-keyring \ - --enable-javahl \ - --with-jdk="${JAVA_HOME}" \ - --without-kwallet \ - $(use_enable nls) \ - --without-sasl \ - --without-serf \ - ${myconf[@]} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static + econf "${myconf[@]}" } src_compile() { @@ -135,10 +168,10 @@ src_compile() { src_install() { emake DESTDIR="${D}" install-javahl - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) + java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname) java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib - java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar - rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar + java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/" || die diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index f66a5d981..99f04fb5d 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,3 +1,3 @@ +DIST subversion-1.8.18-patchset.tar.bz2 7407 SHA256 d4a8b4c44286e5ceebce2a4791fd06483eb868df3b20cc941cc358eb1c55b31f SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 WHIRLPOOL adb60234b115e6e2ba2007dd824ab995ac558c8560cf471c9b2e465063a27657d75db32a3946e3652842a3ba9e340aff334ee2e78bb4bf1b43fa610dda5f235e DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 -DIST subversion-1.9.5.tar.bz2 7904861 SHA256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 SHA512 ff7241ffae2506e97f40011242b5d5c6fa665f5463743f9acc52136b59ad84b6db00b60e70c44a9060579db49b818db06da1d1352aaee78e5bfe6ce56f32a2cf WHIRLPOOL 37a124dc2f99bb465b47083de168530f8178305e3208972d56c2c29a93bbf73ded816f742808cf9e7a5d3f13690e48cdd9f800abd85452ad1da4c13d603454f3 DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2 diff --git a/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch new file mode 100644 index 000000000..5b692fa30 --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.9.7-kf5.patch @@ -0,0 +1,211 @@ +diff -u b/subversion/libsvn_auth_kwallet/kwallet.cpp b/subversion/libsvn_auth_kwallet/kwallet.cpp +--- b/subversion/libsvn_auth_kwallet/kwallet.cpp (revision 1798731) ++++ b/subversion/libsvn_auth_kwallet/kwallet.cpp 2018-01-18 16:48:52.026801597 +0100 +@@ -39,8 +39,6 @@ + #include + + #include +-#include +-#include + #include + #include + +@@ -221,14 +219,15 @@ + app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(q_argc, q_argv, +- get_application_name(parameters, pool), +- "subversion", +- ki18n(get_application_name(parameters, pool)), +- SVN_VER_NUMBER, +- ki18n("Version control system"), +- KCmdLineArgs::CmdLineArgKDE); +- KComponentData component_data(KCmdLineArgs::aboutData()); ++ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ ++ ++ /* componentName appears in KDE GUI prompts */ ++ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ ++ i18n(get_application_name(parameters, ++ pool)), /* displayName */ ++ QStringLiteral(SVN_VER_NUMBER)); ++ KAboutData::setApplicationData(aboutData); ++ + QString folder = QString::fromUtf8("Subversion"); + QString key = + QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring); +@@ -291,14 +290,15 @@ + app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(q_argc, q_argv, +- get_application_name(parameters, pool), +- "subversion", +- ki18n(get_application_name(parameters, pool)), +- SVN_VER_NUMBER, +- ki18n("Version control system"), +- KCmdLineArgs::CmdLineArgKDE); +- KComponentData component_data(KCmdLineArgs::aboutData()); ++ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */ ++ ++ /* componentName appears in KDE GUI prompts */ ++ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */ ++ i18n(get_application_name(parameters, ++ pool)), /* displayName */ ++ QStringLiteral(SVN_VER_NUMBER)); ++ KAboutData::setApplicationData(aboutData); ++ + QString q_password = QString::fromUtf8(password); + QString folder = QString::fromUtf8("Subversion"); + KWallet::Wallet *wallet = get_wallet(wallet_name, parameters); +unchanged: +--- a/build/ac-macros/compiler.m4 (revision 1798730) ++++ b/build/ac-macros/compiler.m4 (revision 1798731) +@@ -126,3 +126,18 @@ + SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option]) + fi + ]) ++ ++dnl The KWallet provider needs to use C++11 mode when using KDE 5 ++AC_DEFUN([SVN_CXX_MODE_SETUP11], ++[ ++ CXXFLAGS_KEEP="$CXXFLAGS" ++ CXXFLAGS="" ++ ++ if test "$GXX" = "yes"; then ++ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11]) ++ fi ++ ++ CXXMODEFLAGS="$CXXFLAGS" ++ CXXFLAGS="$CXXFLAGS_KEEP" ++ AC_SUBST(CXXMODEFLAGS) ++]) +unchanged: +--- a/build/ac-macros/kwallet.m4 (revision 1798730) ++++ b/build/ac-macros/kwallet.m4 (revision 1802646) +@@ -25,8 +25,10 @@ + AC_DEFUN(SVN_LIB_KWALLET, + [ + AC_ARG_WITH(kwallet, +- [AS_HELP_STRING([[--with-kwallet[=PATH]]], +- [Enable use of KWallet (KDE 4) for auth credentials])], ++ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]], ++ [Enable use of KWallet (KDE 5 or 4) for auth credentials. ++ PATH is the KDE install path, alternatively INCDIR:LIBDIR ++ are the header and library install paths. ])], + [svn_lib_kwallet="$withval"], + [svn_lib_kwallet=no]) + +@@ -42,40 +44,70 @@ + if test "$APR_HAS_DSO" = "yes"; then + if test -n "$PKG_CONFIG"; then + if test "$HAVE_DBUS" = "yes"; then +- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui]) +- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_CHECKING([for Qt]) ++ if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then ++ AC_MSG_RESULT([yes, Qt5]) ++ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui" ++ kde_config_name="kf5-config" ++ kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n" ++ kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core" ++ elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then ++ AC_MSG_RESULT([yes, Qt4]) ++ qt_pkg_config_names="QtCore QtDBus QtGui" ++ kde_config_name="kde4-config" ++ kde_inc_names="/" ++ kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore" ++ fi ++ if test -n "$qt_pkg_config_names"; then + if test "$svn_lib_kwallet" != "yes"; then +- AC_MSG_CHECKING([for kde4-config]) +- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config" +- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then ++ AC_MSG_CHECKING([for $kde_config_name]) ++ KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name" ++ if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then + AC_MSG_RESULT([yes]) + else +- KDE4_CONFIG="" +- AC_MSG_RESULT([no]) ++ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then ++ AC_MSG_RESULT([unneeded]) ++ KDE_CONFIG="unneeded" ++ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"] ++ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"] ++ else ++ AC_MSG_RESULT([no]) ++ KDE_CONFIG="" ++ fi + fi + else +- AC_PATH_PROG(KDE4_CONFIG, kde4-config) ++ AC_PATH_PROG(KDE_CONFIG, $kde_config_name) ++ if test -n "$KDE_CONFIG"; then ++ kde_incdir="`$KDE_CONFIG --install include`" ++ kde_libdir="`$KDE_CONFIG --install lib`" ++ fi + fi +- if test -n "$KDE4_CONFIG"; then +- AC_MSG_CHECKING([for KWallet]) ++ if test -n "$KDE_CONFIG"; then ++ if test $kde_config_name = "kf5-config"; then ++ dnl KF5 does not compile with -std=c++98 ++ SVN_CXX_MODE_SETUP11 ++ fi + old_CXXFLAGS="$CXXFLAGS" + old_LDFLAGS="$LDFLAGS" + old_LIBS="$LIBS" +- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do ++ dnl --std=c++11 may be required ++ CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS" ++ AC_MSG_CHECKING([for KWallet]) ++ for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do + if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then + CPPFLAGS="$CPPFLAGS $d" + fi + done +- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`" +- kde_incdir="`$KDE4_CONFIG --install include`" +- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir" +- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`" +- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options" +- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES" ++ qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`" ++ for kde_inc_name in $kde_inc_names; do ++ kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name" ++ done ++ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes" ++ qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`" ++ SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options" ++ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC" + LIBS="$LIBS $SVN_KWALLET_LIBS" +- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`" +- kde_libdir="`$KDE4_CONFIG --install lib`" ++ qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`" + LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`" + AC_LANG(C++) + AC_LINK_IFELSE([AC_LANG_SOURCE([[ +@@ -87,16 +119,19 @@ + AC_MSG_RESULT([yes]) + CXXFLAGS="$old_CXXFLAGS" + LIBS="$old_LIBS" ++ if test "$kde_config_name" = "kf5-config"; then ++ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available]) ++ fi + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot find KWallet]) + fi + else +- AC_MSG_ERROR([cannot find kde4-config]) ++ AC_MSG_ERROR([cannot find $kde_config_name]) + fi + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui]) ++ AC_MSG_ERROR([cannot find Qt]) + fi + else + AC_MSG_ERROR([cannot find D-Bus]) diff --git a/dev-vcs/subversion/subversion-1.9.5.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild similarity index 81% rename from dev-vcs/subversion/subversion-1.9.5.ebuild rename to dev-vcs/subversion/subversion-1.9.7-r1.ebuild index 8a10f05ff..f4f3f9751 100644 --- a/dev-vcs/subversion/subversion-1.9.5.ebuild +++ b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild @@ -1,24 +1,23 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 + PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby23 ruby22 ruby21 ruby20" +USE_RUBY="ruby23 ruby22 ruby21" DISTUTILS_OPTIONAL=1 WANT_AUTOMAKE="none" GENTOO_DEPEND_ON_PERL="no" -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${PN}-1.9.5-Gentoo-patches.tar.gz ) -inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic libtool multilib perl-module ruby-single +inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic libtool multilib perl-module ruby-single xdg-utils MY_P="${P/_/-}" DESCRIPTION="Advanced version control system" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2" S="${WORKDIR}/${MY_P}" -sab-patches_update_SRC_URI - LICENSE="Subversion GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" @@ -34,16 +33,27 @@ COMMON_DEPEND=" sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( ${PYTHON_DEPS} ) - gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-keyring ) + gnome-keyring? ( + dev-libs/glib:2 + gnome-base/libgnome-keyring + sys-apps/dbus + ) http? ( >=net-libs/serf-1.3.4 ) - kwallet? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 ) + kwallet? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kwallet:5 + sys-apps/dbus + ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) ruby? ( ${RUBY_DEPS} ) sasl? ( dev-libs/cyrus-sasl )" RDEPEND="${COMMON_DEPEND} apache2? ( www-servers/apache[apache2_modules_dav] ) - kwallet? ( kde-apps/kwalletd:4 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI )" # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once @@ -53,7 +63,10 @@ DEPEND="${COMMON_DEPEND} doc? ( app-doc/doxygen ) gnome-keyring? ( virtual/pkgconfig ) http? ( virtual/pkgconfig ) - kwallet? ( virtual/pkgconfig ) + kwallet? ( + kde-frameworks/kdelibs4support:5 + virtual/pkgconfig + ) nls? ( sys-devel/gettext ) test? ( ${PYTHON_DEPS} )" PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )" @@ -66,6 +79,16 @@ REQUIRED_USE=" !dso )" +PATCHES=( + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch + "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch + "${FILESDIR}"/${P}-kf5.patch +) + want_apache pkg_setup() { @@ -128,7 +151,7 @@ pkg_setup() { } src_prepare() { - sab-patches_apply_all + default fperms +x build/transform_libtool_scripts.sh @@ -151,10 +174,32 @@ src_prepare() { S=${S}/subversion/bindings/swig/python python_copy_sources rm -r "${S}"/subversion/bindings/swig/python || die fi + + xdg_environment_reset } src_configure() { - local myconf=() + local myconf=( + --libdir="${EPREFIX%/}/usr/$(get_libdir)" + $(use_with apache2 apache-libexecdir) + $(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) + --disable-javahl + $(use_with java jdk "${JAVA_HOME}") + $(use_with kwallet) + $(use_enable nls) + $(use_with sasl) + $(use_with http serf) + --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" + --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" + --disable-experimental-libtool + --without-jikes + --disable-mod-activation + --disable-static + ) if use python || use perl || use ruby; then myconf+=( --with-swig ) @@ -167,6 +212,10 @@ src_configure() { # avoid recording immediate path to sharedlibs into executables append-ldflags -Wl,-bnoipath ;; + *-cygwin*) + # no LD_PRELOAD support, no undefined symbols + myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined ) + ;; *-interix*) # loader crashes on the LD_PRELOADs... myconf+=( --disable-local-library-preloading ) @@ -203,28 +252,10 @@ src_configure() { fi # allow overriding Python include directory - ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ - ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ + ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ + ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ - econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(use_with apache2 apache-libexecdir) \ - $(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) \ - --disable-javahl \ - $(use_with kwallet) \ - $(use_enable nls) \ - $(use_with sasl) \ - $(use_with http serf) \ - ${myconf[@]} \ - --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ - --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ - --disable-experimental-libtool \ - --without-jikes \ - --disable-mod-activation \ - --disable-static + econf "${myconf[@]}" } src_compile() { @@ -365,10 +396,10 @@ src_install() { #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 + -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 + -i "${ED%/}"/etc/xinetd.d/svnserve || die # Install documentation. dodoc CHANGES COMMITTERS README @@ -377,10 +408,10 @@ src_install() { # 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 + 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 @@ -402,7 +433,7 @@ EOF prune_libtool_files --all - cd "${ED}"usr/share/locale + cd "${ED%/}"/usr/share/locale for i in * ; do [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; } done @@ -410,9 +441,9 @@ EOF 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 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 diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest index f66a5d981..99f04fb5d 100644 --- a/www-apache/mod_dav_svn/Manifest +++ b/www-apache/mod_dav_svn/Manifest @@ -1,3 +1,3 @@ +DIST subversion-1.8.18-patchset.tar.bz2 7407 SHA256 d4a8b4c44286e5ceebce2a4791fd06483eb868df3b20cc941cc358eb1c55b31f SHA512 b5c207ed7b6923f1259290563409b2e946a512cc052e4e5d8a061abf3f0909dbbb15c0525a1fca618f1ec5e4abbbc8b49f3f0f714c9dd100f1d6c7e6d88442b2 WHIRLPOOL adb60234b115e6e2ba2007dd824ab995ac558c8560cf471c9b2e465063a27657d75db32a3946e3652842a3ba9e340aff334ee2e78bb4bf1b43fa610dda5f235e DIST subversion-1.9.5-Gentoo-patches.tar.gz 3223 SHA256 dfd5395b22b0daa0e9bd0eda9bf1dcbd010d9271cad91b20e31289079e738529 SHA512 be9f88f2331902e283458fa3d15192a7019c4753164320bbb4633a00560e8d51851ee87d948787bf192795afe484b1cd41918b6e2f1e19e6f3785ec042bafad6 WHIRLPOOL d72326654064e00bdf0a8ecd0707e027de54af1f8da8810fa12bfa145256a43ccedbf5bdf3e0d87cb97744cb0fd4658502cddb87eed9e900ee7712a45af95033 -DIST subversion-1.9.5.tar.bz2 7904861 SHA256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 SHA512 ff7241ffae2506e97f40011242b5d5c6fa665f5463743f9acc52136b59ad84b6db00b60e70c44a9060579db49b818db06da1d1352aaee78e5bfe6ce56f32a2cf WHIRLPOOL 37a124dc2f99bb465b47083de168530f8178305e3208972d56c2c29a93bbf73ded816f742808cf9e7a5d3f13690e48cdd9f800abd85452ad1da4c13d603454f3 DIST subversion-1.9.7.tar.bz2 7881909 SHA256 c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623 SHA512 a55efd3edaddbc099450d849fcc6fe5a8d20b85ece966d8ac2fd73ee9cb4255a0349bbcfceb4e9fca6daf054ce7c648eff8d273c6873f5dade6e62dcea7eeb2b WHIRLPOOL ec2491100ebc94fe9bb82b50daf349564ba7bf1ec7b404bf5a31aec0e1e0932843b41d96813a2659220e139c34aa996ddcbb2999528c49cea3dede2f2af43bf2 diff --git a/www-apache/mod_dav_svn/files b/www-apache/mod_dav_svn/files new file mode 120000 index 000000000..0f2069424 --- /dev/null +++ b/www-apache/mod_dav_svn/files @@ -0,0 +1 @@ +../../dev-vcs/subversion/files \ No newline at end of file diff --git a/www-apache/mod_dav_svn/files/47_mod_dav_svn.conf b/www-apache/mod_dav_svn/files/47_mod_dav_svn.conf deleted file mode 100644 index 52d08b7ab..000000000 --- a/www-apache/mod_dav_svn/files/47_mod_dav_svn.conf +++ /dev/null @@ -1,16 +0,0 @@ - -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 -# - diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.9.5.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.9.7-r1.ebuild similarity index 71% rename from www-apache/mod_dav_svn/mod_dav_svn-1.9.5.ebuild rename to www-apache/mod_dav_svn/mod_dav_svn-1.9.7-r1.ebuild index 41c09615b..8c02ad094 100644 --- a/www-apache/mod_dav_svn/mod_dav_svn-1.9.5.ebuild +++ b/www-apache/mod_dav_svn/mod_dav_svn-1.9.7-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 + WANT_AUTOMAKE="none" MY_P="${P/_/-}" @@ -9,16 +10,14 @@ MY_SVN_PN="subversion" MY_SVN_P="${MY_SVN_PN}-${PV}" MY_SVN_PF="${MY_SVN_PN}-${PVR}" -SAB_PATCHES_SRC=( mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.9.5-Gentoo-patches.tar.gz ) -inherit sab-patches autotools db-use depend.apache eutils flag-o-matic libtool multilib eutils +inherit autotools db-use depend.apache eutils flag-o-matic libtool multilib eutils xdg-utils DESCRIPTION="Subversion WebDAV support" -HOMEPAGE="http://subversion.apache.org/" -SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2" +HOMEPAGE="https://subversion.apache.org/" +SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/${MY_SVN_PN}-1.8.18-patchset.tar.bz2" S="${WORKDIR}/${MY_SVN_P}" -sab-patches_update_SRC_URI - LICENSE="Subversion" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" @@ -57,7 +56,6 @@ DEPEND="${MY_CDEPS} >=net-libs/serf-1.3.4 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig - !!