gentoo resync : 27.03.2021

9 files changed, 66 insertions, 194 deletions

diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 7e2a23854b05..65eaf7f28a87 100644
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index ea3e257b4e70..d29f2e7c4f51 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,11 +1,6 @@
-AUX btrbk-0.30.0-make-install-race.patch 843 BLAKE2B d5e36a05c7f52a36265373800476538539463006da22b2904c1c60969ee8613c51c4fd1ba71522b4e3f25ebaee829febd49f6f5b10ce10713734d0816793e6c0 SHA512 094f08019dfcb7d6afd786a81c8ccc80ef69852f18fdba7008a16c04a9c4d855fa4e66973e37ac17f738959a07a96b267a952f1576cf0d492934cd533c6309e3
 DIST btrbk-0.29.1.tar.xz 98320 BLAKE2B f7e4939fec27cc85847d7cae8797de9c59040de641ed4c3c4dcd37102daad1d3910e2ef40c3ad486614a167a7d2206c92b961ba6e5d78e351dedb8de565e3172 SHA512 78bb24fff3606bcf5cb3f4b7e31c5423ca01208cf667efa6a67978696b06ffd4f368aed372d57372ef268ea9329d51f8abd7e2e9dc59dfb0d3133c992d1d788e
-DIST btrbk-0.30.0.tar.xz 101104 BLAKE2B f963fa64a409810552f1232e42d2d7ed740cbcf498098307ebff31a6e4db06d43a2c4fd5df6120847a009fd606ea4453ca93eaa6cf7a18744d557f94722876f8 SHA512 127d184fda13cb036c737f2cad428ef8313af46ceac0b6d273d670656f874d0e096bcd2daf96a2b6e7087a9985e47a99a905515376a9270171575166ca5d6449
-DIST btrbk-0.31.0.tar.xz 106064 BLAKE2B 4cac3502396debb97b6e842be75a643b6229209eb0a28a8fa8ee5ec9cb70621bd9e7f2ca5a06fda1e167d59ac1bbfef76ab00b6a2d041a5371b4286c76701df9 SHA512 df27c8e2785b1a49aae6031f1787a69d41b61cdab7e58b43bc87232c99e534b664b545121c909c0317fb9adfaee48085ba07be0a465dec05c4869ed620b8c94f
-DIST btrbk-0.31.1.tar.xz 106252 BLAKE2B 0e9b1acf5f784c28c3c80c9b391d69b619c0b2054ec9c73ed8425c8a0fe4211d1559bd399bb63f61937d4ba8cf94f10656a2863383688d00f737de403dedcebd SHA512 93c08bd2cd141aea37e56ecbd1396ebb2cf2a09a0132fc0b4462bc89fa9303f1a79b08a3a8b193709bc25b2473f329dacdd121760f916523c7be1133dcc30468
+DIST btrbk-0.31.2.tar.xz 107124 BLAKE2B a05ef8a665d50b0f9637b1bc7026f0ca0f8364377b4165dae09cd27790dc139aaea1096a54719d948adda5050f91580650bf58db70a086cfdd14b73559fad9f3 SHA512 f953fe1a231f7a28c2d98cf124e3d52cc6d0810e6cb1673b90f335e07cd7473d0302ec227361f902c40a36dab5c075c675d2ee0543a23c37cb1e4baaf74efea0
 EBUILD btrbk-0.29.1.ebuild 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
-EBUILD btrbk-0.30.0.ebuild 2442 BLAKE2B 3b344a7d8c0a9e93308a533bc43e7b43c3701867e7d3db56bba6624afb65a51b7fd11ff5106fe0154334d068daf6ae9172b12bc21df0726614c20b8ca4352698 SHA512 b6a28a071172001ce01a60600899453e72b00fb16aab3173bcc3b07d5878b05c28ce146408adf842426d60cec5a16259df43a1b1a861bc274ea6133253850b14
-EBUILD btrbk-0.31.0.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
-EBUILD btrbk-0.31.1.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
+EBUILD btrbk-0.31.2.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 EBUILD btrbk-9999.ebuild 2385 BLAKE2B 2aca46fa4c713bdf92f7bb24afc18bbf662e1118bc59afc430a8fc133fb7f9d08eb2b5c5ed2451347c4a2ab5eb6fddd9ab462ce688c5c28fbe8905f4e6c7201f SHA512 c5079950260f6b6411d3bcd66f6066874a7bcac22812989383d41b08f8e9fa2bb8f25becac65871322b063c8e2da3c80d443265357dad9485f41b24413329a40
 MISC metadata.xml 1063 BLAKE2B 3006f83965b390c29b40f43aa1e325d64982be982d80f5ac52d8e0c6bb52e595f36d3a623545a4710e53390e3a14acf170c00d8a37ce2fa092e869edfe3ed615 SHA512 aad705481fe86deb2434f4d36634d34301451c5508a5628c49cf17139d195caa938036f421479f0f89aaa3577c838af88e26be2ef0ac491bd4430b3610746db7
diff --git a/app-backup/btrbk/btrbk-0.30.0.ebuild b/app-backup/btrbk/btrbk-0.30.0.ebuild
deleted file mode 100644
index 54cfb4dc81a1..000000000000
--- a/app-backup/btrbk/btrbk-0.30.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-PATCHES=(
-	"${FILESDIR}/${P}-make-install-race.patch"
-)
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.31.1.ebuild b/app-backup/btrbk/btrbk-0.31.1.ebuild
deleted file mode 100644
index f301c70cd559..000000000000
--- a/app-backup/btrbk/btrbk-0.31.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/digint/btrbk.git"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://digint.ch/download/btrbk/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="Tool for creating snapshots and remote backups of btrfs subvolumes"
-HOMEPAGE="https://digint.ch/btrbk/"
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+mbuffer +doc +lsbtr"
-
-DEPEND="doc? ( >=dev-ruby/asciidoctor-1.5.7 )"
-
-RDEPEND="dev-lang/perl
-	net-misc/openssh
-	mbuffer? ( >=sys-block/mbuffer-20180505 )
-	>=sys-fs/btrfs-progs-4.12"
-
-src_compile() {
-	emake clean
-	use doc && emake -C doc
-}
-src_install() {
-	local targets="install-bin install-etc install-share install-systemd"
-	use doc && targets="${targets} install-man install-doc"
-	use lsbtr && targets="${targets} install-bin-links"
-	emake \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}" \
-		SYSTEMDDIR="$(systemd_get_systemunitdir)" \
-		${targets}
-}
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.26.0" ; then
-		upgrade_0_26_0_warning="1"
-	fi
-	if has_version "<${CATEGORY}/${PN}-0.27.0" ; then
-		upgrade_0_27_0_warning="1"
-	fi
-}
-pkg_postinst() {
-	if [[ "${upgrade_0_26_0_warning}" == "1" ]]; then
-		ewarn "If you are using raw targets, make sure to run the"
-		ewarn "\"raw_suffix2sidecar\" utility in each target directory."
-	fi
-	if [[ "${upgrade_0_27_0_warning}" == "1" ]]; then
-		ewarn 'Due to a bugfix in the scheduler [1] [2], previously preserved'
-		ewarn 'monthly/yearly backups could get deleted when upgrading to'
-		ewarn 'btrbk-0.27.0.'
-		ewarn ''
-		ewarn 'Before upgrading to btrbk-0.27.0, make sure to stop all cron jobs'
-		ewarn 'or systemd timers calling btrbk.'
-		ewarn ''
-		ewarn 'After upgrading, run "btrbk prune --dry-run --print-schedule" and'
-		ewarn 'check if any snapshots/backups would get deleted. If you want to'
-		ewarn 'forcibly preserve a snapshot/backup forever, rename it:'
-		ewarn ''
-		ewarn '    mv mysubvol.YYYYMMDD mysubvol.YYYYMMDD.keep_forever'
-		ewarn ''
-		ewarn 'Note that btrbk ignores subvolumes with unknown naming scheme, e.g.'
-		ewarn '(".keep_forever" suffix in the example above).'
-		ewarn ''
-		ewarn '  [1] https://github.com/digint/btrbk/issues/217'
-		ewarn '  [2] https://github.com/digint/btrbk/commit/719fb5f'
-	fi
-}
diff --git a/app-backup/btrbk/btrbk-0.31.0.ebuild b/app-backup/btrbk/btrbk-0.31.2.ebuild
index f301c70cd559..f301c70cd559 100644
--- a/app-backup/btrbk/btrbk-0.31.0.ebuild
+++ b/app-backup/btrbk/btrbk-0.31.2.ebuild
diff --git a/app-backup/btrbk/files/btrbk-0.30.0-make-install-race.patch b/app-backup/btrbk/files/btrbk-0.30.0-make-install-race.patch
deleted file mode 100644
index 518e7df61185..000000000000
--- a/app-backup/btrbk/files/btrbk-0.30.0-make-install-race.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://github.com/digint/btrbk/pull/341
-
-From ec123405669762aefe813801e2c49183800cc3a9 Mon Sep 17 00:00:00 2001
-From: Xiretza <xiretza@xiretza.xyz>
-Date: Mon, 28 Sep 2020 16:49:19 +0200
-Subject: [PATCH] Fix race condition in `make install`
-
-If run with -j, it's possible for install-bin-links to run before
-install-bin and subsequently fail because $(BINDIR) hasn't been created
-yet.
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 030b577..44ab19f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -54,7 +54,7 @@ install-bin:
- 	install -d -m 755 "$(DESTDIR)$(BINDIR)"
- 	install -p -m 755 $(BIN) "$(DESTDIR)$(BINDIR)"
- 
--install-bin-links:
-+install-bin-links: install-bin
- 	@echo 'installing symlinks...'
- 	for name in $(BIN_LINKS); do \
- 		ln -s -n -f $(BIN) "$(DESTDIR)$(BINDIR)/$$name"; \
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index 33d61347c954..39b73336b3dd 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -1,3 +1,5 @@
 DIST fsarchiver-0.8.5.tar.gz 298502 BLAKE2B 434fbc945bb4999243fe2b6a212c6b04118ae37749b4b14b590cf8269e541a5b09954e75a898126c8a55b5b516f458a1cf1842b4a9f4ead2185c7b5e8c99343c SHA512 bf427dfcc5a73fc799710766dc1c1392ed379565ec68d7cef49e9391da749e08fb655f2b86b4ab4db7cacaf323286b4673a7c3fbebba81ac50d0b66c1f0b91ff
+DIST fsarchiver-0.8.6.tar.gz 273652 BLAKE2B 2f8d11bb721c4e5452f0bc62661bd254226d3d62b5d7bee0a8ccfd227bdc39dd0dd544e831888bbf39010341aaa0d74b2805ab580c79cc90e96a43be1676d86c SHA512 26a2d7a68d162aabb778b14f29c52cf8fbadb8147cf5eae592352a36fbf93cc45c08c241253bd8dfe8cd0b77d0f156afcc8d89e8d24a238fd4427cb479827f14
 EBUILD fsarchiver-0.8.5-r1.ebuild 1135 BLAKE2B fcfa6ddeee0d975f57a7adc5c957f80365a1b50408729bb13dc39f447df4e3f8386b157a743e011eaf0dc23336b270210f9c64e70a92789ff137b7615759e8e6 SHA512 b1e0febbdae240580c75a8138ece1997fdd561e26c321545d98a4a526314f348c766f9bdffdad3a5ad8f2e03f8bb16866eb33194f8aafdd74fb6a64e679ec31b
-MISC metadata.xml 305 BLAKE2B 43ce3a11f981c5fd75fe38ee853006fd250650c6ca8ab2c61dff97450d559d028ab8e5b8a32912263489ff5f4c03ed26665d146d92f7fcfa6eaad7bb56935b35 SHA512 2aec6650633f26c7241fa094cc5e5a77b9fac6adf6f762ad6b8806e9569a6efbd935d557b99fa7a2459582b06710c0c6714695ace701456a0a6773c5ee78895d
+EBUILD fsarchiver-0.8.6.ebuild 1386 BLAKE2B b1b5da78228c43abd25010f534cd149614df05fb7889116de046cd2a45f6cab37bff3a8adaa4f39caced30a250ad36068cda457046629a025ce74061c859d014 SHA512 6c757b66d6a3e96dec987c82831195b71b6306874025bf0873ff4da94c11163240eef935d6b3d147a7d036f3d489b9f4348fee2500a3887d7963e1945c2d0c5b
+MISC metadata.xml 382 BLAKE2B 891eee8fe94ac34a54fea42dbfe6ae6f136fce28cfd45e400d16d7aac3c163e41d92100d035657cc0ca3d2f3d4698a457a28f515af56cfbcb3cc06c33782060e SHA512 b7ec7dabd9c51139e7d669bac569eefcd460b880db50247f888c14be332d679fbd680c093dd7a04a3e91f75385772552af7d0f4398106ca753ca8e261154bb41
diff --git a/app-backup/fsarchiver/fsarchiver-0.8.6.ebuild b/app-backup/fsarchiver/fsarchiver-0.8.6.ebuild
new file mode 100644
index 000000000000..efdfa0a1b320
--- /dev/null
+++ b/app-backup/fsarchiver/fsarchiver-0.8.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
+HOMEPAGE="https://www.fsarchiver.org"
+SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug lz4 lzma lzo static +zstd"
+
+CDEPEND="dev-libs/libgcrypt:0=
+	>=sys-fs/e2fsprogs-1.41.4
+	lz4? ( app-arch/lz4 )
+	lzma? ( >=app-arch/xz-utils-4.999.9_beta )
+	lzo? ( >=dev-libs/lzo-2.02 )
+	zstd? ( app-arch/zstd )
+"
+DEPEND="${CDEPEND}
+	static? (
+		app-arch/bzip2[static-libs]
+		dev-libs/libgcrypt:0=[static-libs]
+		dev-libs/libgpg-error[static-libs]
+		sys-apps/util-linux[static-libs]
+		>=sys-fs/e2fsprogs-1.41.4[static-libs]
+		sys-libs/e2fsprogs-libs[static-libs]
+		sys-libs/zlib[static-libs]
+		lz4? ( app-arch/lz4[static-libs] )
+		lzma? ( app-arch/xz-utils[static-libs] )
+		lzo? ( dev-libs/lzo[static-libs] )
+		zstd? ( app-arch/zstd[static-libs] )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am \
+		|| die "seding failed"
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug devel)
+		$(use_enable lz4)
+		$(use_enable lzma)
+		$(use_enable lzo)
+		$(use_enable static)
+		$(use_enable zstd)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-backup/fsarchiver/metadata.xml b/app-backup/fsarchiver/metadata.xml
index aa5f1ad3b52d..655208bd2742 100644
--- a/app-backup/fsarchiver/metadata.xml
+++ b/app-backup/fsarchiver/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fsarchiver</remote-id>
 		<remote-id type="github">fdupoux/fsarchiver</remote-id>