1 |
commit: 079a52b67179ed58b9cdfa022179e36c7ae81cb9 |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 31 19:41:09 2021 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 19:41:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079a52b6 |
7 |
|
8 |
dev-vcs/rsvndump: Fix linking with lld for profile 17.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/739028 |
11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
12 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
13 |
|
14 |
dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild | 14 +++++++++++++- |
15 |
dev-vcs/rsvndump/rsvndump-0.6.ebuild | 27 --------------------------- |
16 |
2 files changed, 13 insertions(+), 28 deletions(-) |
17 |
|
18 |
diff --git a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild |
19 |
index 71017a0a670..f47e6734fe6 100644 |
20 |
--- a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild |
21 |
+++ b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild |
22 |
@@ -1,4 +1,4 @@ |
23 |
-# Copyright 1999-2020 Gentoo Authors |
24 |
+# Copyright 1999-2021 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
EAPI=7 |
28 |
@@ -29,6 +29,18 @@ PATCHES=( |
29 |
|
30 |
src_prepare() { |
31 |
default |
32 |
+ |
33 |
+ # We need to patch use of /usr/lib because it is a problem with |
34 |
+ # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/739028). |
35 |
+ # The grep sandwich acts as a regression test so that a future |
36 |
+ # version bump cannot break patching without noticing. |
37 |
+ grep -wq svn_prefix/lib m4/find_svn.m4 || die |
38 |
+ sed "s,svn_prefix/lib,svn_prefix/$(get_libdir)," -i m4/find_svn.m4 || die |
39 |
+ grep -w svn_prefix/lib m4/find_svn.m4 && die |
40 |
+ grep -wq SVN_PREFIX/lib configure.ac || die |
41 |
+ sed "s,SVN_PREFIX/lib,SVN_PREFIX/$(get_libdir)," -i configure.ac || die |
42 |
+ grep -w SVN_PREFIX/lib configure.ac && die |
43 |
+ |
44 |
eautoreconf |
45 |
} |
46 |
|
47 |
|
48 |
diff --git a/dev-vcs/rsvndump/rsvndump-0.6.ebuild b/dev-vcs/rsvndump/rsvndump-0.6.ebuild |
49 |
deleted file mode 100644 |
50 |
index 0fd269ce176..00000000000 |
51 |
--- a/dev-vcs/rsvndump/rsvndump-0.6.ebuild |
52 |
+++ /dev/null |
53 |
@@ -1,27 +0,0 @@ |
54 |
-# Copyright 1999-2018 Gentoo Foundation |
55 |
-# Distributed under the terms of the GNU General Public License v2 |
56 |
- |
57 |
-EAPI=7 |
58 |
- |
59 |
-DESCRIPTION="Dump a remote Subversion repository" |
60 |
-HOMEPAGE="http://rsvndump.sourceforge.net" |
61 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
62 |
- |
63 |
-LICENSE="GPL-3+ BSD public-domain" # rsvndump, snappy-c, critbit89 |
64 |
-SLOT="0" |
65 |
-KEYWORDS="~amd64 ~x86" |
66 |
-IUSE="debug doc" |
67 |
- |
68 |
-RDEPEND="dev-vcs/subversion |
69 |
- dev-libs/apr |
70 |
- dev-libs/apr-util |
71 |
- sys-devel/gettext" |
72 |
-DEPEND="${RDEPEND} |
73 |
- doc? ( app-text/xmlto |
74 |
- >=app-text/asciidoc-8.4 )" |
75 |
- |
76 |
-src_configure() { |
77 |
- econf \ |
78 |
- $(use_enable doc man) \ |
79 |
- $(use_enable debug) |
80 |
-} |