gentoo resync : 20.03.2022

3 files changed, 51 insertions, 3 deletions

diff --git a/dev-vcs/rsvndump/Manifest b/dev-vcs/rsvndump/Manifest
index c3262abdd20c..769abd66b8cc 100644
--- a/dev-vcs/rsvndump/Manifest
+++ b/dev-vcs/rsvndump/Manifest
@@ -1,5 +1,7 @@
 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.1.tar.bz2 233503 BLAKE2B eee3c0c61724544bc5b335d97eb76b0826cadaa883830f84e9be6fab4f901121d0cb2517633b5a53f2bc465d5ce384ce234d052860eadfd7c5237ac0192ab771 SHA512 3055070b8e128dad0ef099130d3ac7fe147a334b97c3db71354f37a00dfba3ec34194bf4dc5f1e31315852681501422986ac3d6b032fa4d6a6f9d87c45c5b391
 DIST rsvndump-0.6.tar.bz2 220891 BLAKE2B 97792a13beb0a37452df941599a753297f0322d04608e86da0740cb553a9da7d1a2f9b6e712c15698ae9d5f2c8d4911d8bed45e66c58ca46b2d1b0c29ec4f275 SHA512 cadb10b48e66be1ea562fa6b96460b5c864e2f16a1e0d5fbb4be4d31023b6d5dfa978634900b1649530a12335eb712032d9d9cc82f663737581521121d3b2120
-EBUILD rsvndump-0.6-r1.ebuild 1369 BLAKE2B 3b85a910516931392e22d54aae4c5bdde95cc524c4e603210087fe373274290c8e8c61ee3f85c03482b24b5f37f18b3e7d9e1baf23d6f5771d3de2b15b35b6c7 SHA512 68af6ef132bbca81f230bf7e84beaff3e815444df123f7ed5384f790befef50d6d611882e6535f99598dc7a44a1a15c05a1f5f647b9435009a90ea549e8faa9c
+EBUILD rsvndump-0.6-r1.ebuild 1360 BLAKE2B c5d3946bf7536ab27527afd7db2d9452de324d4b60eb050d06aa37b3b964219ae319f80b8855193e73e2182e66839af2727db61f62cf8ae51dd0fa2b0aa4c8da SHA512 c2a7fa299650db0ba3eff5575071414c89f17eb8d6d8741f75d3172235bdca8b0d9afc6ee9caa78c1940cd06d0cccdb14db82652df47c16cb0558cf9b8cee1f6
+EBUILD rsvndump-0.6.1.ebuild 1261 BLAKE2B e931294913bfa735e4a92aba8da0c0428150dda860f466aa90280b0df35aab17aa611c810bb32f518b5e147ab1f3b99648c92976a9d1805b11dbed0a063ca0f9 SHA512 987861ea17de808a025ea0cea866042c887fc335079d3cdb8023f49da0e9fbd55c90316983302e4273bb328d096cd9e4a783199248a6dc897c3a80b41119fa91
 MISC metadata.xml 328 BLAKE2B 61f20d9402fae8339c10e55d228dc822c9c4ea778be47c7d2b49a96f920e09cb7c4bb322e75813661bd27c71d91e8377bad14552587fedefb37fca89c7eb9c4e SHA512 fef92b57961bf9e0846f9d87c2f5944993c8e958bb183e659df4d271084816233a4bb3751365742cca0d6dd9f53b559a0b0423156c2aa871cbf456ce23c413b9
diff --git a/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6-r1.ebuild
index 33cdb2cc47d0..34783d203b02 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools multilib
+inherit autotools
 
 DESCRIPTION="Dump a remote Subversion repository"
 HOMEPAGE="http://rsvndump.sourceforge.net"
diff --git a/dev-vcs/rsvndump/rsvndump-0.6.1.ebuild b/dev-vcs/rsvndump/rsvndump-0.6.1.ebuild
new file mode 100644
index 000000000000..3fa33e50fb0d
--- /dev/null
+++ b/dev-vcs/rsvndump/rsvndump-0.6.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 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 )"
+
+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
+}
+
+src_configure() {
+	econf \
+		$(use_enable doc man) \
+		$(use_enable debug)
+}