commit: 1077b8b1f31bae93efa1d3f5d0544d439461d8fc Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Thu May 21 00:00:40 2020 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Thu May 21 00:01:20 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1077b8b1
dev-vcs/rsvndump: Support AR variable and AsciiDoc 9 Closes: https://bugs.gentoo.org/724252 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-2.3.99, Repoman-2.3.22 .../rsvndump/files/rsvndump-0.6-asciidoc-9.patch | 35 +++++++++++++++++++ .../rsvndump/files/rsvndump-0.6-configure-ar.patch | 24 +++++++++++++ dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild | 39 ++++++++++++++++++++++ 3 files changed, 98 insertions(+) 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 00000000000..1df1852ab91 --- /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 <sebast...@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 00000000000..b8268200871 --- /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 <sebast...@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 00000000000..71017a0a670 --- /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) +}
