1 |
commit: 1077b8b1f31bae93efa1d3f5d0544d439461d8fc |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 21 00:00:40 2020 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 21 00:01:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1077b8b1 |
7 |
|
8 |
dev-vcs/rsvndump: Support AR variable and AsciiDoc 9 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/724252 |
11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
13 |
|
14 |
.../rsvndump/files/rsvndump-0.6-asciidoc-9.patch | 35 +++++++++++++++++++ |
15 |
.../rsvndump/files/rsvndump-0.6-configure-ar.patch | 24 +++++++++++++ |
16 |
dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild | 39 ++++++++++++++++++++++ |
17 |
3 files changed, 98 insertions(+) |
18 |
|
19 |
diff --git a/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch b/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..1df1852ab91 |
22 |
--- /dev/null |
23 |
+++ b/dev-vcs/rsvndump/files/rsvndump-0.6-asciidoc-9.patch |
24 |
@@ -0,0 +1,35 @@ |
25 |
+From e0c9eba8c080cbbf773f0d540c8291ef486544c9 Mon Sep 17 00:00:00 2001 |
26 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
27 |
+Date: Thu, 21 May 2020 01:56:54 +0200 |
28 |
+Subject: [PATCH] rsvndump_conf.m4: Fix detection of Asciidoc >=8.4.0 for 9.x.x |
29 |
+ |
30 |
+--- |
31 |
+ m4/rsvndump_conf.m4 | 12 +++--------- |
32 |
+ 1 file changed, 3 insertions(+), 9 deletions(-) |
33 |
+ |
34 |
+diff --git a/m4/rsvndump_conf.m4 b/m4/rsvndump_conf.m4 |
35 |
+index c8a83ae..838f0f6 100644 |
36 |
+--- a/m4/rsvndump_conf.m4 |
37 |
++++ b/m4/rsvndump_conf.m4 |
38 |
+@@ -76,15 +76,9 @@ AC_DEFUN([RSVN_CHECK_MAN_PROGS], [ |
39 |
+ ver_maj=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\1/'` |
40 |
+ ver_min=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\2/'` |
41 |
+ ver_rev=`echo $ver_info | sed 's/^.* \([[0-9]]\)*\.\([[0-9]]\)*\.\([[0-9]]*\).*$/\3/'` |
42 |
+- prog_version_ok="yes" |
43 |
+- if test $ver_maj -lt 8; then |
44 |
+- prog_version_ok="no" |
45 |
+- fi |
46 |
+- if test $ver_min -lt 4; then |
47 |
+- prog_version_ok="no" |
48 |
+- fi |
49 |
+- if test $ver_rev -lt 0; then |
50 |
+- prog_version_ok="no" |
51 |
++ prog_version_ok=no |
52 |
++ if test $ver_maj -gt 8 -o \( $ver_maj -eq 8 -a $ver_min -ge 4 \); then |
53 |
++ prog_version_ok=yes |
54 |
+ fi |
55 |
+ if test "$prog_version_ok" != "yes"; then |
56 |
+ AC_MSG_ERROR([Asciidoc >= 8.4 is needed. Please upgrade your installation]) |
57 |
+-- |
58 |
+2.26.2 |
59 |
+ |
60 |
|
61 |
diff --git a/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch b/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch |
62 |
new file mode 100644 |
63 |
index 00000000000..b8268200871 |
64 |
--- /dev/null |
65 |
+++ b/dev-vcs/rsvndump/files/rsvndump-0.6-configure-ar.patch |
66 |
@@ -0,0 +1,24 @@ |
67 |
+From 69c66475d2887e50150ceb4481934749ad46feb6 Mon Sep 17 00:00:00 2001 |
68 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
69 |
+Date: Thu, 21 May 2020 01:38:02 +0200 |
70 |
+Subject: [PATCH] Support the AR variable |
71 |
+ |
72 |
+--- |
73 |
+ configure.ac | 1 + |
74 |
+ 1 file changed, 1 insertion(+) |
75 |
+ |
76 |
+diff --git a/configure.ac b/configure.ac |
77 |
+index 2e2fcc3..897282e 100644 |
78 |
+--- a/configure.ac |
79 |
++++ b/configure.ac |
80 |
+@@ -30,6 +30,7 @@ fi |
81 |
+ # Checks for programs. |
82 |
+ AC_PROG_INSTALL |
83 |
+ AC_PROG_CC |
84 |
++AM_PROG_AR |
85 |
+ AC_PROG_RANLIB |
86 |
+ if test "$USE_MAN" = "yes"; then |
87 |
+ RSVN_CHECK_MAN_PROGS |
88 |
+-- |
89 |
+2.26.2 |
90 |
+ |
91 |
|
92 |
diff --git a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild |
93 |
new file mode 100644 |
94 |
index 00000000000..71017a0a670 |
95 |
--- /dev/null |
96 |
+++ b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild |
97 |
@@ -0,0 +1,39 @@ |
98 |
+# Copyright 1999-2020 Gentoo Authors |
99 |
+# Distributed under the terms of the GNU General Public License v2 |
100 |
+ |
101 |
+EAPI=7 |
102 |
+ |
103 |
+inherit autotools |
104 |
+ |
105 |
+DESCRIPTION="Dump a remote Subversion repository" |
106 |
+HOMEPAGE="http://rsvndump.sourceforge.net" |
107 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
108 |
+ |
109 |
+LICENSE="GPL-3+ BSD public-domain" # rsvndump, snappy-c, critbit89 |
110 |
+SLOT="0" |
111 |
+KEYWORDS="~amd64 ~x86" |
112 |
+IUSE="debug doc" |
113 |
+ |
114 |
+RDEPEND="dev-vcs/subversion |
115 |
+ dev-libs/apr |
116 |
+ dev-libs/apr-util |
117 |
+ sys-devel/gettext" |
118 |
+DEPEND="${RDEPEND} |
119 |
+ doc? ( app-text/xmlto |
120 |
+ >=app-text/asciidoc-8.4 )" |
121 |
+ |
122 |
+PATCHES=( |
123 |
+ "${FILESDIR}"/${PN}-0.6-configure-ar.patch |
124 |
+ "${FILESDIR}"/${PN}-0.6-asciidoc-9.patch |
125 |
+) |
126 |
+ |
127 |
+src_prepare() { |
128 |
+ default |
129 |
+ eautoreconf |
130 |
+} |
131 |
+ |
132 |
+src_configure() { |
133 |
+ econf \ |
134 |
+ $(use_enable doc man) \ |
135 |
+ $(use_enable debug) |
136 |
+} |