From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- net-vpn/riseup-vpn/Manifest | 5 +- .../riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild | 143 --------------------- net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild | 137 ++++++++++++++++++++ 3 files changed, 139 insertions(+), 146 deletions(-) delete mode 100644 net-vpn/riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild create mode 100644 net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild (limited to 'net-vpn/riseup-vpn') diff --git a/net-vpn/riseup-vpn/Manifest b/net-vpn/riseup-vpn/Manifest index 9a9fa8fc3a23..b66d2d0ea8db 100644 --- a/net-vpn/riseup-vpn/Manifest +++ b/net-vpn/riseup-vpn/Manifest @@ -41,7 +41,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab 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 golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7 -DIST riseup-vpn-0.21.2_p20210517.tar.gz 5332313 BLAKE2B 0f9673ba0908c60c2c31c032d48a4b9b0c31e8a8e2621c84c673f006f43aa6d41d2b6f5567a0ee73ad74d8b7456618a00a177af9fc65b0bf28765983e96ef20a SHA512 88fd43e922500aaeebb80d7f4bf290f9511f60fa58c2a2b3ffd3930508630d2d8c5fb92ca5012689721545a6656135defe3ebe420c04defb53316cda93ddba6f -EBUILD riseup-vpn-0.21.2_p20210517.ebuild 4798 BLAKE2B 09d9745a7cb94aa977f11a2a6daa0e5f4584e22f6cb91df03e5c0f864c9029271a367ba75aa3d8bd2becbe82e9981061773505de2d099f33eafa8c97cb8e66ec SHA512 5efc73ed57f3863b427461fdcc668d4a27a90b0ac558a4c49e16db797a434295da51d400583dd6e9513163cbc3ab2d9d04326d2df1d52e30e1aa34926c0b6eab +DIST riseup-vpn-0.21.6.tar.gz 5404265 BLAKE2B 2dcae7aaa3659fe9e8b9910a6c085ec49389551a6d2e404fb5520622e22adff98277fe3962f1dfd3b44d23b8c687855105196e74b89d4bb9890202e97033c5d9 SHA512 074dadcd24c1ecaa21504a26406c5f8f3cdbbe8dffc3679e1c1b62d1978b51b20154edd54d8887868c7458e4c184b8f16aa6ff21e71890fe6b84c0eb2e008deb +EBUILD riseup-vpn-0.21.6.ebuild 4639 BLAKE2B f176edd095992c3490269883d27c5fc4c02bf61b4cb6a2171958e43c2d212f4094c8198b940a20da7aa22c37b071a91611f9ef7b0946bb714122f73c6e343239 SHA512 2c9a6456723913e906750843fcd729af6a7d6b2fd1eb146d02946fd65231ffc021596d1c33556d4f1da28783c69c0aad7c1430ac223904d1f1a456e6556739cb MISC metadata.xml 1043 BLAKE2B 342f9bcf0fc9a679dc7f42e0b61c8c2767ea99e72923e0431a091e97cee8a3e3252562394b471e0ab5bccf08faebaa98bd2409fb352b80f4caaea4c3f2ef65e7 SHA512 b9f4174bd7ad0212f0864eb369fb1df4fbc8c6a2e44b165187700e3bdbe8fd573b44e291b8ea283897b9fc9ed06ff12ef8f1666b7057a75507c1393a3beacb78 diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild deleted file mode 100644 index 6ab61fb41f19..000000000000 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.2_p20210517.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DOCS_BUILDER="sphinx" -DOCS_DIR="docs" -DOCS_DEPEND="dev-python/alabaster" - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit desktop python-r1 docs go-module virtualx 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" - "golang.org/x/text v0.3.0/go.mod" - ) -go-module_set_globals - -COMMIT="c6c0209ad45fb7d2e45370ee3a39f2dd437603b0" - -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/${COMMIT}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -# 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-libs/libappindicator:3 - sys-apps/fakeroot - x11-libs/gtk+:3 - dev-qt/qtdeclarative: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" ) - -S="${WORKDIR}/bitmask-vpn-${COMMIT}" - -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 - emake -j1 build - docs_compile -} - -src_test() { - # these tests require internet access to connect to Riseup Networks - # the UI tests do work though - #emake test - virtx emake test_ui -} - -src_install() { - einstalldocs - - dobin "build/qt/release/riseup-vpn" - - python_scriptinto /usr/sbin - python_foreach_impl 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 - go-module_pkg_postinst -} diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild new file mode 100644 index 000000000000..c2c5eb8da77d --- /dev/null +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.6.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 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/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" ) + +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 + emake -j1 build + docs_compile +} + +src_test() { + emake -j1 test + virtx emake -j1 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 + go-module_pkg_postinst +} -- cgit v1.2.3