From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 8 Jan 2021 11:28:34 +0000
Subject: gentoo resync : 08.01.2021

---
 app-backup/btrbk/Manifest                          |  3 ++-
 app-backup/btrbk/btrbk-0.30.0.ebuild               |  6 ++++-
 .../files/btrbk-0.30.0-make-install-race.patch     | 27 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 app-backup/btrbk/files/btrbk-0.30.0-make-install-race.patch

(limited to 'app-backup/btrbk')

diff --git a/app-backup/btrbk/Manifest b/app-backup/btrbk/Manifest
index 3b8963e7ff94..4ee65fb2bf7a 100644
--- a/app-backup/btrbk/Manifest
+++ b/app-backup/btrbk/Manifest
@@ -1,6 +1,7 @@
+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
 EBUILD btrbk-0.29.1.ebuild 2322 BLAKE2B afba2b06ace683bc10c725b5093d1f15183063405245117fcbcb14efe349c1c4cf1874bbacdea9120ed4fba2e36c7d65a7bcc6bf66afa301d636a3298d2acb19 SHA512 969f28f3ef93f08c7675b5b82a2b73a75a469d9f30c0e755924cfb0364ecfa8dae2cd9909767f0802d6ae6ec329dc79f3dd414b2fa27ec44c51ec3670e3686e7
-EBUILD btrbk-0.30.0.ebuild 2385 BLAKE2B 7733659ac5eb9e49a734802b9627726fa4367caef762d370df19f4ee3eecf166bac35e306f304becf112cdbeb8b89e9202fbd0d3f1f02b9f7a6e5e0e3e2d0795 SHA512 c80a94617c0b11519eca8165a696454cac9a8bdbbff75950b000329c546225e50d28256670f93b03123f66504cab5fd0f56da8e0ecd12294d2eb371401888cd0
+EBUILD btrbk-0.30.0.ebuild 2442 BLAKE2B 3b344a7d8c0a9e93308a533bc43e7b43c3701867e7d3db56bba6624afb65a51b7fd11ff5106fe0154334d068daf6ae9172b12bc21df0726614c20b8ca4352698 SHA512 b6a28a071172001ce01a60600899453e72b00fb16aab3173bcc3b07d5878b05c28ce146408adf842426d60cec5a16259df43a1b1a861bc274ea6133253850b14
 EBUILD btrbk-9999.ebuild 2378 BLAKE2B f09a3bc3cb7eebebeffd590f0cb0309e9c260c596bf6b7c3af19fca240a61233446bfa9c689a6c5ec27a8727f9977111dd1f63d76ed38973393491cd1b7e6f21 SHA512 b17e9102bda13b106bac86da01d012d49af6971932314b253966fd8ceb0953cd19da7043cdc60ec950830a36f5b91f73f2ff9110e55ef9db3a87153375e7f93c
 MISC metadata.xml 1049 BLAKE2B e47ff64c01332ae21819c07797a50835327aa113662bed85043abb179c30ede2a96fa944ecba889622190e441a5d1e5eb49724194643b026446fc6288a8140d3 SHA512 e8d0fcbf7baee25c842f284f72c8894cafe246ef3925a2e40754add811fc1bcd34e5358d39ccf2977f9f3d4515c98750b1d45e80b1fd447e47e13cb2bdae4d89
diff --git a/app-backup/btrbk/btrbk-0.30.0.ebuild b/app-backup/btrbk/btrbk-0.30.0.ebuild
index 11509324b00e..54cfb4dc81a1 100644
--- a/app-backup/btrbk/btrbk-0.30.0.ebuild
+++ b/app-backup/btrbk/btrbk-0.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,6 +27,10 @@ RDEPEND="dev-lang/perl
 	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
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
new file mode 100644
index 000000000000..518e7df61185
--- /dev/null
+++ b/app-backup/btrbk/files/btrbk-0.30.0-make-install-race.patch
@@ -0,0 +1,27 @@
+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"; \
-- 
cgit v1.2.3