[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rapidsvn/files/, profiles/, dev-vcs/rapidsvn/

[Michał Górny]

commit:     0aa048a4d87a2cd095900b40f645e19b30a4b25f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 08:18:02 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 08:18:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa048a4

dev-vcs/rapidsvn: Remove last-rited pkg

Closes: https://bugs.gentoo.org/735340
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-vcs/rapidsvn/Manifest                          |   2 -
 .../rapidsvn/files/rapidsvn-0.12.1-locale.patch    |  23 ---
 ...rapidsvn-0.12.1-subversion1.9-private-api.patch | 129 --------------
 .../files/rapidsvn-0.12.1-svncpp_link.patch        |  12 --
 dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch | 192 ---------------------
 dev-vcs/rapidsvn/metadata.xml                      |  10 --
 dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild         | 113 ------------
 profiles/package.mask                              |   5 -
 8 files changed, 486 deletions(-)

diff --git a/dev-vcs/rapidsvn/Manifest b/dev-vcs/rapidsvn/Manifest
deleted file mode 100644
index 604dee0154c..00000000000
--- a/dev-vcs/rapidsvn/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST rapidsvn-0.12.1.tar.gz 1087511 BLAKE2B c3e32766baab520d4de31387915b79b9199557f01269128853e366c2d75d28727bd220770c2683d78969cc1919c43089d4c2b1b81ca893a0028de4d0b9deb427 SHA512 892dab56e8ec19c5f26a0ddfab378187bc0325275f9fcf759c12beead70aab17876f7e5920bcf214fc86354faef58244ce25926ba010158f7354cd144e1c4c07
-DIST svncpp.dox.xz 1684 BLAKE2B 64725edae989b09b38fa3fff04aa0908356b67ffa8ab50abddf42f2562ccdaa80c9599f5c6790d8b1f2c17d707c227ee6dd8e114e8527362b628463690db17f9 SHA512 6314632b2f6a0f21bdd4644f856c8d60951c30135a82e509a7f929908dacb56462a2fa768c2e45cd7baf99face50fa5d4592a0691cfa1f16335bf64892933589

diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch
deleted file mode 100644
index e1712df85b1..00000000000
--- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-locale.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- rapidsvn-0.12.0dfsg.orig/src/locale/Makefile.in
-+++ rapidsvn-0.12.0dfsg/src/locale/Makefile.in
-@@ -369,8 +369,7 @@ all: all-mo
- distclean: clean
- clean:
- 	for i in $(RAPIDSVN_LANGUAGES) ; do \
--		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo ; \
--		fi ; \
-+		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo || true; \
- 	done
- .PHONY: all-mo
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
---- rapidsvn-0.12.0dfsg.orig/src/locale/Makefile.am
-+++ rapidsvn-0.12.0dfsg/src/locale/Makefile.am
-@@ -38,7 +38,6 @@ all: all-mo
- distclean: clean
- clean:
- 	for i in $(RAPIDSVN_LANGUAGES) ; do \
--		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo ; \
--		fi ; \
-+		test -f $(srcdir)/$$i/rapidsvn.mo && rm $(srcdir)/$$i/rapidsvn.mo || true; \
- 	done
- .PHONY: all-mo

diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch
deleted file mode 100644
index 7c84c8d481f..00000000000
--- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Fix compile errors due to hiding of private API in subversion 1.9.
-See also:
-  https://bugs.gentoo.org/show_bug.cgi?id=558572
-  https://slackbuilds.org/cgit/slackbuilds/commit/?id=c2df77021b476ca9484772361003df04fa03038a
-  https://github.com/RapidSVN/RapidSVN/issues/6
-
---- rapidsvn-0.12.1/src/svncpp/client_ls.cpp
-+++ rapidsvn-0.12.1/src/svncpp/client_ls.cpp
-@@ -29,6 +29,7 @@
- #include "svn_client.h"
- #include "svn_path.h"
- #include "svn_sorts.h"
-+#include "svn_version.h"
- //#include "svn_utf.h"
- 
- // svncpp
-@@ -37,6 +38,8 @@
- #include "svncpp/exception.hpp"
- 
- 
-+#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
-+
- static int
- compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
- {
-@@ -90,6 +93,72 @@
-   }
- }
- 
-+#else
-+
-+#include <algorithm>
-+
-+static svn_error_t* store_entry(
-+        void *baton,
-+        const char *path,
-+        const svn_dirent_t *dirent,
-+        const svn_lock_t *,
-+        const char *abs_path,
-+        const char *,
-+        const char *,
-+        apr_pool_t *scratch_pool)
-+{
-+  svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
-+  if (path[0] == '\0') {
-+    if (dirent->kind == svn_node_file) {
-+      // for compatibility with svn_client_ls behaviour, listing a file
-+      // stores that file name
-+      entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
-+    }
-+  } else {
-+    entries->push_back(svn::DirEntry(path, dirent));
-+  }
-+  return SVN_NO_ERROR;
-+}
-+
-+static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
-+{
-+  return svn_path_compare_paths(a.name(), b.name()) < 0;
-+}
-+
-+namespace svn
-+{
-+  DirEntries
-+  Client::list(const char * pathOrUrl,
-+               svn_opt_revision_t * revision,
-+               bool recurse) throw(ClientException)
-+  {
-+    Pool pool;
-+    DirEntries entries;
-+
-+    svn_error_t * error =
-+      svn_client_list3(pathOrUrl,
-+                       revision,
-+                       revision,
-+                       SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
-+                       SVN_DIRENT_ALL,
-+                       FALSE, // fetch locks
-+                       FALSE, // include externals
-+                       &store_entry,
-+                       &entries,
-+                       *m_context,
-+                       pool);
-+
-+    if (error != SVN_NO_ERROR)
-+      throw ClientException(error);
-+
-+    std::sort(entries.begin(), entries.end(), &sort_by_path);
-+
-+    return entries;
-+  }
-+}
-+
-+#endif
-+
- /* -----------------------------------------------------------------
-  * local variables:
-  * eval: (load-file "../../rapidsvn-dev.el")
---- rapidsvn-0.12.1/include/svncpp/dirent.hpp
-+++ rapidsvn-0.12.1/include/svncpp/dirent.hpp
-@@ -41,7 +41,7 @@
-     /**
-      * constructor for existing @a svn_dirent_t entries
-      */
--    DirEntry(const char * name, svn_dirent_t * dirEntry);
-+    DirEntry(const char * name, const svn_dirent_t * dirEntry);
- 
-     /**
-      * copy constructor
---- rapidsvn-0.12.1/src/svncpp/dirent.cpp
-+++ rapidsvn-0.12.1/src/svncpp/dirent.cpp
-@@ -47,7 +47,7 @@
-     {
-     }
- 
--    Data(const char * _name, svn_dirent_t * dirEntry)
-+    Data(const char * _name, const svn_dirent_t * dirEntry)
-         : name(_name), kind(dirEntry->kind), size(dirEntry->size),
-         hasProps(dirEntry->has_props != 0),
-         createdRev(dirEntry->created_rev), time(dirEntry->time)
-@@ -78,7 +78,7 @@
-   {
-   }
- 
--  DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
-+  DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
-       : m(new Data(name, DirEntry))
-   {
-   }

diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
deleted file mode 100644
index e26ecda15d9..00000000000
--- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/svncpp/Makefile.am
-===================================================================
---- rapidsvn-0.12.1/src/svncpp/Makefile.am	(revision 7100)
-+++ rapidsvn-0.12.1/src/svncpp/Makefile.am	(working copy)
-@@ -27,3 +27,7 @@
- 	url.cpp \
- 	wc.cpp
- 
-+libsvncpp_la_LIBADD= $(SVN_LIBS) \
-+	$(NEON_LIBS) \
-+	$(APR_LIBS) \
-+	-lstdc++

diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
deleted file mode 100644
index 2862e30b21f..00000000000
--- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-wx3.0.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Description: Update for wx 3.0.0
- Update configure to recognise that wx 3.0.0 >= 2.4.2.
- Fix code for wx API changes.
-Author: Olly Betts <olly@××××××.com>
-Origin: debian
-Forwarded: no
-Last-Update: 2014-04-10
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -171,6 +171,8 @@
-         ;;
-     [2.[5-9].*])
- 	;;
-+    3.*)
-+	;;
-     *)
-         AC_MSG_ERROR([wxWidgets >= 2.4.2 required, found version $WX_VERSION])
- 	AC_MSG_ERROR([Try --with-wx-config.])
---- a/src/filelist_ctrl.cpp
-+++ b/src/filelist_ctrl.cpp
-@@ -1029,7 +1029,7 @@
- 
-     // Workaround for issue 324 (only local+non-flat+update):
-     //   we chdir to the requested dir and pass "." to svn
--    if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode)
-+    if (!pathUtf8.isUrl() && m->WithUpdate && !m->FlatMode && !m->Path.empty())
-     {
-       m->IsRelative = true;
-       ::wxSetWorkingDirectory(m->Path);
-@@ -1606,7 +1606,7 @@
-   }
- }
- 
--inline void
-+bool
- FileListCtrl::SetColumnWidth(const int col, const int width)
- {
-   m->ColumnWidth[col] = width;
-@@ -1614,8 +1614,9 @@
-   int index = m->ColumnIndex[col];
-   if (index != -1)
-   {
--    wxListCtrl::SetColumnWidth(index, width);
-+    return wxListCtrl::SetColumnWidth(index, width);
-   }
-+  return false;
- }
- 
- int
---- a/src/filelist_ctrl.hpp
-+++ b/src/filelist_ctrl.hpp
-@@ -118,7 +118,7 @@
-    * @param col column number
-    * @param width
-    */
--  void
-+  bool
-   SetColumnWidth(const int col, const int width);
- 
-   /**
---- a/src/hist_val.cpp
-+++ b/src/hist_val.cpp
-@@ -113,7 +113,7 @@
-       }
- 
-       // if we have an entry, select it
--      if (!comboBox->IsEmpty())
-+      if (!comboBox->IsListEmpty())
-         comboBox->SetSelection(0, 0);
-     }
- 
---- a/src/listener.cpp
-+++ b/src/listener.cpp
-@@ -167,7 +167,7 @@
-     wxMutexLocker lock(mutex);
-     wxString localCertFile = wxFileSelector(
-                                _("Select Certificate File"), wxT(""), wxT(""), wxT(""),
--                               wxT("*.*"), wxOPEN | wxFILE_MUST_EXIST, parent);
-+                               wxT("*.*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST, parent);
-     LocalToUtf8(localCertFile, certFile);
- 
-     dataReceived = !localCertFile.empty();
---- a/src/log_dlg.cpp
-+++ b/src/log_dlg.cpp
-@@ -211,7 +211,7 @@
- 
-     for (size_t idx = 0; idx < str.Length(); idx++)
-     {
--      switch (str[idx])
-+      switch ((wchar_t)str[idx])
-       {
-       case wxT('\r'):
-       case wxT('\n'):
---- a/src/preferences_dlg.cpp
-+++ b/src/preferences_dlg.cpp
-@@ -126,7 +126,7 @@
- PreferencesDlg::SelectExecutable(const wxString & title, wxTextCtrl * textCtrl)
- {
-   wxFileDialog dlg(this, title, wxEmptyString, wxEmptyString,
--                   EXECUTABLE_WILDCARD, wxOPEN);
-+                   EXECUTABLE_WILDCARD, wxFD_OPEN);
-   dlg.SetPath(textCtrl->GetValue());
- 
-   if (dlg.ShowModal() != wxID_OK)
---- a/src/verblist.cpp
-+++ b/src/verblist.cpp
-@@ -71,7 +71,7 @@
- const wxString &
- VerbList::GetName(size_t /*index*/) const
- {
--  return wxT("");
-+  return wxEmptyString;
- }
- 
- 
---- a/src/checkout_action.cpp
-+++ b/src/checkout_action.cpp
-@@ -120,7 +120,8 @@
-       pegRevision = svn::Revision(revnum);
-   }
- 
--  wxSetWorkingDirectory(m_data.DestFolder);
-+  if (!m_data.DestFolder.empty())
-+    wxSetWorkingDirectory(m_data.DestFolder);
- 
-   svn::Path repUrlUtf8(PathUtf8(m_data.RepUrl));
-   svn::Path destFolderUtf8(PathUtf8(dest_folder));
---- a/src/action.cpp
-+++ b/src/action.cpp
-@@ -218,7 +218,9 @@
- bool
- Action::Prepare()
- {
--  wxSetWorkingDirectory(Utf8ToLocal(m->path.c_str()));
-+  const wxString & dir = Utf8ToLocal(m->path.c_str());
-+  if (!dir.empty())
-+    wxSetWorkingDirectory(dir);
- 
-   return true;
- }
---- a/src/cleanup_action.cpp
-+++ b/src/cleanup_action.cpp
-@@ -52,7 +52,9 @@
-   svn::Client client(GetContext());
-   const svn::Path & path = GetPath();
- 
--  wxSetWorkingDirectory(Utf8ToLocal(path.c_str()));
-+  const wxString & dir = Utf8ToLocal(path.c_str());
-+  if (!dir.empty())
-+    wxSetWorkingDirectory(dir);
-   client.cleanup(path.c_str());
- 
-   return true;
---- a/src/export_action.cpp
-+++ b/src/export_action.cpp
-@@ -111,7 +111,8 @@
-       pegRevision = svn::Revision(revnum);
-   }
- 
--  wxSetWorkingDirectory(m_data.DestPath);
-+  if (!m_data.DestPath.empty())
-+    wxSetWorkingDirectory(m_data.DestPath);
- 
-   svn::Path srcPathUtf8(PathUtf8(m_data.SrcPath));
-   svn::Path destPathUtf8(PathUtf8(m_data.DestPath));
---- a/src/get_action.cpp
-+++ b/src/get_action.cpp
-@@ -56,7 +56,9 @@
-              m_data.revision.revnum());
-   Trace(msg);
- 
--  wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str()));
-+  const wxString & dir = Utf8ToLocal(GetPath().c_str());
-+  if (!dir.empty())
-+    wxSetWorkingDirectory(dir);
-   client.update(svn::Path(LocalToUtf8(m_data.path)),
-                 m_data.revision,
-                 true, false);
---- a/src/update_action.cpp
-+++ b/src/update_action.cpp
-@@ -75,7 +75,9 @@
-     }
-   }
- 
--  wxSetWorkingDirectory(Utf8ToLocal(GetPath().c_str()));
-+  const wxString & dir = Utf8ToLocal(GetPath().c_str());
-+  if (!dir.empty())
-+    wxSetWorkingDirectory(dir);
-   svn::Client client(GetContext());
- 
-   client.update(GetTargets(), revision, m_data.recursive,

diff --git a/dev-vcs/rapidsvn/metadata.xml b/dev-vcs/rapidsvn/metadata.xml
deleted file mode 100644
index 0302c7d4363..00000000000
--- a/dev-vcs/rapidsvn/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-RapidSVN is a cross-platform GUI front-end for the Subversion revision 
-system written in C++ using the wxWidgets framework. This project also 
-includes a Subversion client C++ API.
-</longdescription>
-</pkgmetadata>

diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
deleted file mode 100644
index 0bf26433bbc..00000000000
--- a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER=3.0
-
-inherit autotools eutils fdo-mime flag-o-matic ltprune python-single-r1 versionator wxwidgets
-
-MY_PV=$(get_version_component_range 1-2)
-MY_REL="1"
-
-DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
-HOMEPAGE="http://rapidsvn.tigris.org/"
-SRC_URI="
-	http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz
-	doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )"
-
-LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEP="
-	${PYTHON_DEPS}
-	dev-libs/apr
-	dev-libs/apr-util
-	dev-vcs/subversion
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${COMMON_DEP}
-	doc? (
-		dev-libs/libxslt
-		app-text/docbook-sgml-utils
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		media-gfx/graphviz
-	)"
-RDEPEND="${COMMON_DEP}"
-
-DOCS=( HACKING.txt TRANSLATIONS )
-
-src_prepare() {
-	need-wxwidgets unicode
-	if use doc; then
-		mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die
-	fi
-	strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g')
-	sed \
-		-e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \
-		-i src/locale/Makefile.am || die
-
-	mv configure.in configure.ac || die
-	epatch "${FILESDIR}/${P}-svncpp_link.patch"
-	epatch "${FILESDIR}/${P}-locale.patch"
-	epatch "${FILESDIR}/${P}-wx3.0.patch"
-	epatch "${FILESDIR}/${P}-subversion1.9-private-api.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags $( apr-1-config --cppflags )
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with doc manpage) \
-		$(use_with doc xsltproc) \
-		$(use_with doc doxygen) \
-		$(use_with doc dot) \
-		--with-wx-config="${WX_CONFIG}" \
-		--with-svn-lib="${EPREFIX}/usr/$(get_libdir)" \
-		--with-svn-include="${EPREFIX}/usr/include" \
-		--with-apr-config="${EPREFIX}/usr/bin/apr-1-config" \
-		--with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
-}
-
-src_compile() {
-	default
-	use doc && emake -C doc/manpage manpage
-}
-
-src_install() {
-	default
-
-	doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png
-	make_desktop_entry rapidsvn "RapidSVN ${PV}" \
-		"${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \
-		"RevisionControl;Development"
-
-	if use doc ; then
-		doman doc/manpage/${PN}.1
-		dodoc doc/svncpp/html/*
-	fi
-
-	prune_libtool_files
-}
-
-src_test() {
-	pushd src/tests/svncpp > /dev/null || die
-	default
-	./svncpptest | grep OK || die
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index df74aaae1d2..9402349cb0a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -645,11 +645,6 @@ net-mail/libpst
 dev-util/coccigrep
 dev-util/coccinelle
 
-# Aaron Bauman <bman@g.o> (2020-08-02)
-# Py2 only. m-n. Bug #735340
-# Removal in 30 days
-dev-vcs/rapidsvn
-
 # Mikle Kolyada <zlogene@g.o> (2020-08-02)
 # consolekit is abandoned upstream.
 # People are encouraged to switch to any logind