[gentoo-commits] repo/gentoo:master commit in: net-vpn/riseup-vpn/, net-vpn/riseup-vpn/files/

[Andrew Ammerlaan]

commit:     0d8fe1f4a83838c5f6dfacc3657618b49df6d51a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 12:33:04 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 12:33:23 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d8fe1f4

net-vpn/riseup-vpn: drop version 0.21.6

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 net-vpn/riseup-vpn/Manifest                        |   1 -
 .../riseup-vpn/files/riseup-vpn-ip-location.patch  |  13 --
 .../files/riseup-vpn-parallel-make.patch           |  54 --------
 .../riseup-vpn/files/riseup-vpn-respect-AR.patch   |  38 ------
 net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild     | 142 ---------------------
 5 files changed, 248 deletions(-)

diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest
index 0c790cf213c1..fc1f230cdf2b 100644
--- a/net-vpn/riseup-vpn/Manifest
+++ b/net-vpn/riseup-vpn/Manifest
@@ -558,7 +558,6 @@ DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLA
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.1-2019.2.3.mod 300 BLAKE2B 3e3f5a2be0918cbaacd5e43e59fcc6c7c6999645f0c9214cd5a522c31d34b6d3dad61e3ddae8ccdb2f3f0d90b406c047802ee3d9d54dc40fe6eff9cd35620792 SHA512 0c8aa788d0c03d6d049f0dd7468d0f81ce2131ccedd5a5a3a18362b7d30eef7ef325277844eefe4b707b1ad71c6f83a44e110b7af7b98e05406d347237a7bafb
 DIST riseup-vpn-0.21.11.tar.gz 7595837 BLAKE2B a1cd09741f044d03577128ab88ba6e6d9961a1a39c0e6488d79e73ec9c94b7a0fa44463a07d2e2130fe4adf986d86a693cb3114bae99e4a4bb55d23b90f2c871 SHA512 b4fa6f57f97bfba364c7aa9b2a4fc08561c7753d5471424534884a3279e5ff2bd102cc254c4e15a99f6fa47ef16abf1c691d3d174eda27bbfdac61d192f6fbb1
-DIST riseup-vpn-0.21.6.tar.gz 5404265 BLAKE2B 2dcae7aaa3659fe9e8b9910a6c085ec49389551a6d2e404fb5520622e22adff98277fe3962f1dfd3b44d23b8c687855105196e74b89d4bb9890202e97033c5d9 SHA512 074dadcd24c1ecaa21504a26406c5f8f3cdbbe8dffc3679e1c1b62d1978b51b20154edd54d8887868c7458e4c184b8f16aa6ff21e71890fe6b84c0eb2e008deb
 DIST rsc.io%2Fpdf%2F@v%2Fv0.1.1.mod 18 BLAKE2B 02f32b5a77e5009f179cf1fdc9acbb977fe219698f19ef41acee8129e0de7ad93b0b39ce82ac1538c82a7cdd33776e270f0acec114716c791727b021a4d3e147 SHA512 f911a889614d9177295952c82f8b4a0942fcbb7b4fca7378c0b98a63ed0e37e1319d51905f906ad08144eb0f3f829a2ccc2af04c2147e60cc2ac1ea8d7dab16f
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282

diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch b/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch
deleted file mode 100644
index 99c7d5255962..000000000000
--- a/net-vpn/riseup-vpn/files/riseup-vpn-ip-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/helpers/bitmask-root b/helpers/bitmask-root
-index 13ba407..7c08b21 100644
---- a/helpers/bitmask-root
-+++ b/helpers/bitmask-root
-@@ -106,7 +106,7 @@ def swhich(binary):
- 
-     :rtype: str
-     """
--    for folder in ["/sbin", "/usr/sbin", "/usr/local/sbin"]:
-+    for folder in ["/bin", "/sbin", "/usr/sbin", "/usr/local/sbin"]:
-         path = os.path.join(folder, binary)
-         if os.path.isfile(path):
-             return path

diff --git a/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch b/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch
deleted file mode 100644
index 2b0f188e4a57..000000000000
--- a/net-vpn/riseup-vpn/files/riseup-vpn-parallel-make.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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/files/riseup-vpn-respect-AR.patch b/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
deleted file mode 100644
index 431ab1376c65..000000000000
--- a/net-vpn/riseup-vpn/files/riseup-vpn-respect-AR.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/gui/build.sh b/gui/build.sh
-index 56e3d66..9e519a6 100755
---- a/gui/build.sh
-+++ b/gui/build.sh
-@@ -63,13 +63,13 @@ function buildGoLib {
-     if [ "$XBUILD" == "no" ]
-     then
-         echo "[+] Building Go library with standard Go compiler"
--        CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
-+        CGO_ENABLED=1 GOOS=$GOOS CC=$CC CGO_CFLAGS=$CGO_CFLAGS CGO_LDFLAGS=$CGO_LDFLAGS go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB
-     fi
-     if [ "$XBUILD" == "$WIN64" ]
-     then
-         echo "[+] Building Go library with mxe"
-         echo "[+] Using cc:" $CC
--        CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -o $TARGET_GOLIB $SOURCE_GOLIB
-+        CC=$CC CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -buildmode=c-archive -ldflags="-extar=$AR -extld=$LD -extldflags=$LDFLAGS" -o $TARGET_GOLIB $SOURCE_GOLIB
-     fi
- }
- 
-@@ -77,7 +77,7 @@ function buildQmake {
-     echo "[+] Now building Qml app with Qt qmake"
-     echo "[+] Using qmake in:" $QMAKE
-     mkdir -p $QTBUILD
--    $QMAKE -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
-+    $QMAKE -early QMAKE_CC=$CC QMAKE_CXX=$CXX QMAKE_LINK=$CXX -o "$QTBUILD/Makefile" CONFIG+=release VENDOR_PATH=${VENDOR_PATH} $PROJECT
-     #CONFIG=+force_debug_info CONFIG+=debug CONFIG+=debug_and_release
- }
- 
-@@ -115,7 +115,7 @@ function buildDefault {
-     buildQmake
- 
-     make -C $QTBUILD clean
--    make -C $QTBUILD -j4 all
-+    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
deleted file mode 100644
index 1f5d98d6c03e..000000000000
--- a/net-vpn/riseup-vpn/riseup-vpn-0.21.6-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOCS_BUILDER="sphinx"
-DOCS_DIR="docs"
-DOCS_DEPEND="dev-python/alabaster"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit desktop python-single-r1 docs go-module virtualx toolchain-funcs xdg
-
-EGO_SUM=(
-	"0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2"
-	"0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2/go.mod"
-	"github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264"
-	"github.com/OperatorFoundation/obfs4 v0.0.0-20161108041644-17f2cb99c264/go.mod"
-	"github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0"
-	"github.com/OperatorFoundation/shapeshifter-ipc v0.0.0-20170814234159-11746ba927e0/go.mod"
-	"github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4"
-	"github.com/OperatorFoundation/shapeshifter-transports v0.0.0-20191101030951-7a751b0500f4/go.mod"
-	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a"
-	"github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412"
-	"github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod"
-	"github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2"
-	"github.com/apparentlymart/go-openvpn-mgmt v0.0.0-20161009010951-9a305aecd7f2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/dchest/siphash v1.2.1"
-	"github.com/dchest/siphash v1.2.1/go.mod"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
-	"github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19"
-	"github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/rakyll/statik v0.1.7"
-	"github.com/rakyll/statik v0.1.7/go.mod"
-	"github.com/sevlyar/go-daemon v0.1.5"
-	"github.com/sevlyar/go-daemon v0.1.5/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.3.0"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59"
-	"golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b"
-	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4"
-	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-)
-go-module_set_globals
-
-DESCRIPTION="Anonymous encrypted VPN client powered by Bitmask"
-HOMEPAGE="https://riseup.net/en/vpn https://0xacab.org/leap/bitmask-vpn https://bitmask.net"
-SRC_URI="https://0xacab.org/leap/bitmask-vpn/-/archive/${PV}/bitmask-vpn-${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-PROPERTIES="test_network"
-RESTRICT="test"
-# The tests require internet access to connect to Riseup Networks
-
-# Generated with dev-go/golicense
-LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-
-BDEPEND="
-	virtual/pkgconfig
-	dev-qt/linguist-tools
-	test? ( dev-qt/qttest:5 )
-"
-
-DEPEND="${PYTHON_DEPS}
-	dev-qt/qtdeclarative:5[widgets]
-	dev-qt/qtquickcontrols:5[widgets]
-	dev-qt/qtquickcontrols2:5[widgets]
-"
-
-RDEPEND="${DEPEND}
-	net-vpn/openvpn
-	sys-auth/polkit
-"
-
-# ip command is in bin instead of sbin on Gentoo
-PATCHES=(
-	"${FILESDIR}/${PN}-ip-location.patch"
-	"${FILESDIR}/${PN}-respect-AR.patch"
-	"${FILESDIR}/${PN}-parallel-make.patch"
-)
-
-S="${WORKDIR}/bitmask-vpn-${PV}"
-
-src_prepare() {
-	default
-
-	# do not pre-strip
-	sed -i -e '/strip $RELEASE\/$TARGET/d' gui/build.sh || die
-
-	# add autodoc to the extensions because this actually
-	# does require extra dependencies
-	sed -i -e "/^extensions = \[/a \ \ \ \ \'sphinx.ext.autodoc\'," docs/conf.py || die
-}
-
-src_compile() {
-	# does not build with j>1
-	tc-export AR LD CC CXX
-	emake build
-	docs_compile
-}
-
-src_test() {
-	emake test
-	virtx emake test_ui
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "build/qt/release/riseup-vpn"
-
-	python_scriptinto /usr/sbin
-	python_doscript "helpers/bitmask-root"
-
-	insinto /usr/share/polkit-1/actions
-	newins "helpers/se.leap.bitmask.policy" se.leap.bitmask.riseupvpn.policy
-
-	newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg
-	make_desktop_entry "${PN}" RiseupVPN riseup Network
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}