summaryrefslogtreecommitdiff
path: root/dev-vcs/rsvndump
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-02-13 21:41:11 +0000
committerV3n3RiX <venerix@redcorelinux.org>2021-02-13 21:41:11 +0000
commitc8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch)
treec44943ee0563a3fa957716de909fed683117fcb9 /dev-vcs/rsvndump
parent69051588e2f955485fe5d45d45e616bc60a2de57 (diff)
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'dev-vcs/rsvndump')
-rw-r--r--dev-vcs/rsvndump/Manifest3
-rw-r--r--dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild16
-rw-r--r--dev-vcs/rsvndump/rsvndump-0.6.ebuild27
3 files changed, 15 insertions, 31 deletions
diff --git a/dev-vcs/rsvndump/Manifest b/dev-vcs/rsvndump/Manifest
index bbaa06398f06..ea25e32e0fc5 100644
--- a/dev-vcs/rsvndump/Manifest
+++ b/dev-vcs/rsvndump/Manifest
@@ -1,6 +1,5 @@
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
+EBUILD rsvndump-0.6-r1.ebuild 1369 BLAKE2B 3b85a910516931392e22d54aae4c5bdde95cc524c4e603210087fe373274290c8e8c61ee3f85c03482b24b5f37f18b3e7d9e1baf23d6f5771d3de2b15b35b6c7 SHA512 68af6ef132bbca81f230bf7e84beaff3e815444df123f7ed5384f790befef50d6d611882e6535f99598dc7a44a1a15c05a1f5f647b9435009a90ea549e8faa9c
MISC metadata.xml 327 BLAKE2B 0ca261a8df3086ea9173f80e74a58f39300002f01fe7202e6c354bc01c3beb91a0984e9151f4ac97fc3bf36db0f1281dab8fc38cee8134c93813eef2012bb3f6 SHA512 e2369924ca25cbb5c415f5aaabc86420e0a7d051a9409b9031a16bc489c3146b63d9e119b6128bb3cd82843bce740b32e9b4138a407330fc5059b4f5fe59aba2
diff --git a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
index 71017a0a6705..33cdb2cc47d0 100644
--- a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
+++ b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit autotools
+inherit autotools multilib
DESCRIPTION="Dump a remote Subversion repository"
HOMEPAGE="http://rsvndump.sourceforge.net"
@@ -29,6 +29,18 @@ PATCHES=(
src_prepare() {
default
+
+ # We need to patch use of /usr/lib because it is a problem with
+ # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/739028).
+ # The grep sandwich acts as a regression test so that a future
+ # version bump cannot break patching without noticing.
+ grep -wq svn_prefix/lib m4/find_svn.m4 || die
+ sed "s,svn_prefix/lib,svn_prefix/$(get_libdir)," -i m4/find_svn.m4 || die
+ grep -w svn_prefix/lib m4/find_svn.m4 && die
+ grep -wq SVN_PREFIX/lib configure.ac || die
+ sed "s,SVN_PREFIX/lib,SVN_PREFIX/$(get_libdir)," -i configure.ac || die
+ grep -w SVN_PREFIX/lib configure.ac && die
+
eautoreconf
}
diff --git a/dev-vcs/rsvndump/rsvndump-0.6.ebuild b/dev-vcs/rsvndump/rsvndump-0.6.ebuild
deleted file mode 100644
index 0fd269ce1768..000000000000
--- a/dev-vcs/rsvndump/rsvndump-0.6.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-src_configure() {
- econf \
- $(use_enable doc man) \
- $(use_enable debug)
-}