gentoo resync : 08.10.2021

3 files changed, 60 insertions, 4 deletions

diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
index 52a5060e572d..a90f3b40ae6a 100644
--- a/net-vpn/riseup-vpn/Manifest
+++ b/net-vpn/riseup-vpn/Manifest
@@ -1,4 +1,5 @@
 AUX riseup-vpn-ip-location.patch 445 BLAKE2B d1b43da1c39baad62bca64c922ec5c2666e7be38db6e5402bc616f02e7faef4f3884dc8141c40d25edb147c27c2234d1b90e116696eac022d95066b527222f8c SHA512 051ffb1107d5d4c7fe0be9a158d7b2b5d90ff3aad60918449c56671e541662dfd0163f1d62eb88ac95ae3aed88917efcbc085ae9a41d27706a154b51dc24e82d
+AUX riseup-vpn-parallel-make.patch 1556 BLAKE2B 9c7166ad5f00e565bc2fce21f5e4ca796d02003a14a4e51a0288a8aa2dbd9a1e38472b570b6f480c05d0be7c5b950bd0948b1e216722c26ef931ee550fb554de SHA512 0868fdfa2c8903f33fad4272f4701c63bb0b9b73d851d6e995f4fcc6685811e7de10f2f465bd485c4370bf6af799a2fe76f0eab9c850879a9ff8edb721b505c1
 AUX riseup-vpn-respect-AR.patch 1700 BLAKE2B ec94095cc7e239add206595d7861260026f00d1c42ab01f2d8093c5f33b9e66bf9923bb4f526deccf92c798a2d3b565bcf159c76192983cbe4d058fa927f6faf SHA512 88b449abff3a015f499ff69d595421aa9c58d51d21b739c6c0532f889b822a07ec506c94ef5d05cd25b0165ec2c1f0056549069c18c8fd6d997db32e1ae2dd44
 DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.mod 36 BLAKE2B 18848dd9ecba98ad55023c343e68149c2a86e1fb1cec95cfc36d58f304050b29c4a8a0b108392e8daca2f201b0a7bbc30b9e5f5ea54196433c9c6a37ed4c5522 SHA512 ce08c7ff89bfcf6d9e56cec299cb0befa012493384be6f1d6d6b0ab2875d91cce640cc8df51c660ab291cca52c53cbc98bfb465bf569fcad351fc5c126ccaa87
 DIST 0xacab.org%2Fleap%2Fshapeshifter%2F@v%2Fv0.0.0-20191029173606-85d3e8ac43e2.zip 2199 BLAKE2B 7b996b10c73fec0c9cb1c038245bb3bc04b297443b853df62b1ca910476162cd984d52b62b4b0c76c35bb69aab3129f880602fc726af78a75990b4444f61ead6 SHA512 3f9d68dfc635253670f55a36e2257956eaf08c186ef4aa768e7d0e445885070ad39461b97a3fcef276df8bac31867a733c690e4cb32f52f59d5ab365f0473e66
@@ -43,5 +44,5 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.zip 1916451 BLAKE2B da323af18ec6dbb2c7cfcc267ceaeddb5e452789f3ed5797345020ccbf118992e9972fc652b20d8cd5a023c96613d5a770f71e6384b6576a271bc322d02a450b SHA512 13fcebd117456775d53483f713e5a090321ab1159048b92252aee953c294dc174d7f5695e8d09f272203786143bdd6b15ff32c979aef5a30b442a56aa09d1a7d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST riseup-vpn-0.21.6.tar.gz 5404265 BLAKE2B 2dcae7aaa3659fe9e8b9910a6c085ec49389551a6d2e404fb5520622e22adff98277fe3962f1dfd3b44d23b8c687855105196e74b89d4bb9890202e97033c5d9 SHA512 074dadcd24c1ecaa21504a26406c5f8f3cdbbe8dffc3679e1c1b62d1978b51b20154edd54d8887868c7458e4c184b8f16aa6ff21e71890fe6b84c0eb2e008deb
-EBUILD riseup-vpn-0.21.6-r1.ebuild 4729 BLAKE2B 8ce437ecb9e9e09eec3410120fb570476424a73361371c06aa3ebf721bfe20d25b77d2a39360d2ecb4e563a195fb7d2181a44185c41c572983761a40ba97490c SHA512 91a0a27f33c47904fd557fc8da907060cfd1bd82df968d073d19f9de5389e96e6ceca5a99af5eb76ced43551956435d8b2c4330c2a99be2905e1d7d2e7e550a1
+EBUILD riseup-vpn-0.21.6-r1.ebuild 4758 BLAKE2B 232bd9c0149ed559ebd3f98371a48495f14c1779bea041e0ead313d36cb77dfa063a67c4cfca11e5953d992e5708455d49ac3e2680d2a26fad6f890c20f68cb7 SHA512 d34092842576ebf9c034a2ca1c93b49b4c34af8ef8e3d7384ef61c7adc3abac12b569b8c3bffb05dd5df8d61ba9f1630c115869fd39a3be523576c900cda2639
 MISC metadata.xml 1044 BLAKE2B 28fd241b8a0a7cf97f52b56f854a1337272ddb652ed782448ccd71a3be6df07e4791cf1fcf21ee1750f6b498e1d9cd30e35c778427c04af2e4f60b709de7c8a9 SHA512 fc8e0f86bfbb7dd808f145284c81de8670341ec1ca8ce62e8dc4b9ef3aff0a8ff5c1bc72ea6946b0ec742adbd49d977e9a442dd7f075b3649ddf5304fc7fc735
diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch b/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch
new file mode 100644
index 000000000000..2b0f188e4a57
--- /dev/null
+++ b/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch
@@ -0,0 +1,54 @@
+diff --git a/Makefile b/Makefile
+index b9ddda5..500adb7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -108,7 +108,7 @@ PKGFILES = $(shell find pkg -type f -name '*.go')
+ endif
+ 
+ lib/%.a: $(PKGFILES)
+-	@XBUILD=no ./gui/build.sh --just-golib
++	@XBUILD=no MAKE=${MAKE} ./gui/build.sh --just-golib
+ 
+ relink_vendor:
+ 	@echo "============RELINK VENDOR============="
+@@ -136,14 +136,14 @@ endif
+ 
+ build_golib: lib/libgoshim.a
+ 
+-build_gui: relink_vendor
++build_gui: build_golib relink_vendor
+ 	@echo "==============BUILD GUI==============="
+ 	@echo "TARGET: ${TARGET}"
+ 	@echo "VENDOR_PATH: ${VENDOR_PATH}"
+-	@XBUILD=no QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib
++	@XBUILD=no MAKE=${MAKE} QMAKE=${QMAKE} LRELEASE=${LRELEASE} TARGET=${TARGET} VENDOR_PATH=${VENDOR_PATH} gui/build.sh --skip-golib
+ 	@echo "============BUILD GUI================="
+ 
+-build: build_golib build_helper build_gui
++build: build_helper build_gui
+ 
+ build_helper:
+ ifeq ($(PLATFORM), linux)
+diff --git a/gui/build.sh b/gui/build.sh
+index 9e519a6..8aa0356 100755
+--- a/gui/build.sh
++++ b/gui/build.sh
+@@ -17,6 +17,7 @@ PROJECT=bitmask.pro
+ TARGET_GOLIB=lib/libgoshim.a
+ SOURCE_GOLIB=gui/backend.go
+ 
++MAKE=${MAKE:=make}
+ QTBUILD=build/qt
+ RELEASE=$QTBUILD/release
+ DEBUGP=$QTBUILD/debug
+@@ -114,8 +115,8 @@ function buildDefault {
+     fi
+     buildQmake
+ 
+-    make -C $QTBUILD clean
+-    make -C $QTBUILD $MAKEFLAGS all
++    $MAKE -C $QTBUILD clean
++    $MAKE -C $QTBUILD $MAKEFLAGS all
+ 
+     renameOutput
+     echo "[+] Done."
diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
index 91db3c978164..1f5d98d6c03e 100644
--- a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
+++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
@@ -94,6 +94,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-ip-location.patch"
 	"${FILESDIR}/${PN}-respect-AR.patch"
+	"${FILESDIR}/${PN}-parallel-make.patch"
 )
 
 S="${WORKDIR}/bitmask-vpn-${PV}"
@@ -112,13 +113,13 @@ src_prepare() {
 src_compile() {
 	# does not build with j>1
 	tc-export AR LD CC CXX
-	emake -j1 build
+	emake build
 	docs_compile
 }
 
 src_test() {
-	emake -j1 test
-	virtx emake -j1 test_ui
+	emake test
+	virtx emake test_ui
 }
 
 src_install() {