gentoo resync : 30.05.2020

4 files changed, 101 insertions, 0 deletions

diff --git a/dev-vcs/rsvndump/Manifest b/dev-vcs/rsvndump/Manifest
index 399e9b5efe6b..bbaa06398f06 100644
--- a/dev-vcs/rsvndump/Manifest
+++ b/dev-vcs/rsvndump/Manifest
@@ -1,3 +1,6 @@
+AUX rsvndump-0.6-asciidoc-9.patch 1245 BLAKE2B ddfeb84964f0d5f6403c2a4b91d4e0de4e0d6a8973c7560245adbfe7248e980143cd3dd6b33c44394f6ff1a5033493b20c28ae43f14f940e8852e7aa3fc9b9b0 SHA512 05a3cf888f8f0793a42c9321c2ff22c7cddc6aff9574642a05c07b6ae7a4673d4a5c50a1e60be7b3e9397baf87eacb3e8c138f272141cfbf3ac0fc7b1e8f8b2d
+AUX rsvndump-0.6-configure-ar.patch 536 BLAKE2B 7d5c4961ae636c4a7940e7c000ae44eb3342d412bcae01209bb7dd4b7512abad7ffdf958401468e278fe4e8a7d59cd3a631cc98684190ca4d1a422caf023a182 SHA512 a3d00bd5b1a40ce5861532f97053084dcd979990e90e332aaf69325af4593c0c2d592ba707a54121e824926bccfce208ef7c41cfc62c5adbef5aba229086af77
 DIST rsvndump-0.6.tar.bz2 220891 BLAKE2B 97792a13beb0a37452df941599a753297f0322d04608e86da0740cb553a9da7d1a2f9b6e712c15698ae9d5f2c8d4911d8bed45e66c58ca46b2d1b0c29ec4f275 SHA512 cadb10b48e66be1ea562fa6b96460b5c864e2f16a1e0d5fbb4be4d31023b6d5dfa978634900b1649530a12335eb712032d9d9cc82f663737581521121d3b2120
+EBUILD rsvndump-0.6-r1.ebuild 764 BLAKE2B 277ac0a028ec18717d3e8509e29d2246d891ef113b3a6bfc6a65bd90efcb9686d99b19521c622a270296188299fea1d9a2d9004666326a84d92ba8bd0f65dcd7 SHA512 92723fdbbd804b61bae9bde2135220921e2462a869a82bdd89a2eb6641f9d8c49aed70d72f8ff7c07bb96b73fa412bc28b5a539f9145b5d3bef974b68eac0635
 EBUILD rsvndump-0.6.ebuild 608 BLAKE2B 43a8bdbf78d8501eb4c134d43e42ef66d9881559e9fb4b5d773600f315e8313528ddf47ab40f40419253bd2540f1e60f8a99145b155b417270c296a7e90dd398 SHA512 5a3a6b80f598568a6763d9be4138c77149e5803b0cc8adaf5f3421aab5d13a93fe1bb89db21038c8c57c6c3c0a88399bd6217ff835ab4ecd4ab3d85826f548fe
 MISC metadata.xml 327 BLAKE2B 0ca261a8df3086ea9173f80e74a58f39300002f01fe7202e6c354bc01c3beb91a0984e9151f4ac97fc3bf36db0f1281dab8fc38cee8134c93813eef2012bb3f6 SHA512 e2369924ca25cbb5c415f5aaabc86420e0a7d051a9409b9031a16bc489c3146b63d9e119b6128bb3cd82843bce740b32e9b4138a407330fc5059b4f5fe59aba2
diff --git a/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch b/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch
new file mode 100644
index 000000000000..1df1852ab91f
--- /dev/null
+++ b/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch
@@ -0,0 +1,35 @@
+From e0c9eba8c080cbbf773f0d540c8291ef486544c9 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 21 May 2020 01:56:54 +0200
+Subject: [PATCH] rsvndump_conf.m4: Fix detection of Asciidoc >=8.4.0 for 9.x.x
+
+---
+ m4/rsvndump_conf.m4 | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/m4/rsvndump_conf.m4 b/m4/rsvndump_conf.m4
+index c8a83ae..838f0f6 100644
+--- a/m4/rsvndump_conf.m4
++++ b/m4/rsvndump_conf.m4
+@@ -76,15 +76,9 @@ AC_DEFUN([RSVN_CHECK_MAN_PROGS], [
+ 	ver_maj=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\1/'`
+ 	ver_min=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\2/'`
+ 	ver_rev=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\3/'`
+-	prog_version_ok="yes"
+-	if test $ver_maj -lt 8; then
+-		prog_version_ok="no"
+-	fi
+-	if test $ver_min -lt 4; then
+-		prog_version_ok="no"
+-	fi
+-	if test $ver_rev -lt 0; then
+-		prog_version_ok="no"
++	prog_version_ok=no
++	if test $ver_maj -gt 8 -o \( $ver_maj -eq 8 -a $ver_min -ge 4 \); then
++		prog_version_ok=yes
+ 	fi
+ 	if test "$prog_version_ok" !=  "yes"; then
+ 		AC_MSG_ERROR([Asciidoc >= 8.4 is needed. Please upgrade your installation])
+-- 
+2.26.2
+
diff --git a/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch b/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch
new file mode 100644
index 000000000000..b82682008715
--- /dev/null
+++ b/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch
@@ -0,0 +1,24 @@
+From 69c66475d2887e50150ceb4481934749ad46feb6 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Thu, 21 May 2020 01:38:02 +0200
+Subject: [PATCH] Support the AR variable
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 2e2fcc3..897282e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,7 @@ fi
+ # Checks for programs.
+ AC_PROG_INSTALL
+ AC_PROG_CC
++AM_PROG_AR
+ AC_PROG_RANLIB
+ if test "$USE_MAN" = "yes"; then
+ 	RSVN_CHECK_MAN_PROGS
+-- 
+2.26.2
+
diff --git a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
new file mode 100644
index 000000000000..71017a0a6705
--- /dev/null
+++ b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Dump a remote Subversion repository"
+HOMEPAGE="http://rsvndump.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3+ BSD public-domain"  # rsvndump, snappy-c, critbit89
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+RDEPEND="dev-vcs/subversion
+	dev-libs/apr
+	dev-libs/apr-util
+	sys-devel/gettext"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto
+		>=app-text/asciidoc-8.4 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6-configure-ar.patch
+	"${FILESDIR}"/${PN}-0.6-asciidoc-9.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc man) \
+		$(use_enable debug)
+}