From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0F8E61382C5 for ; Fri, 12 Mar 2021 15:14:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 64704E0B15; Fri, 12 Mar 2021 15:14:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A76CE0B13 for ; Fri, 12 Mar 2021 15:14:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18CD8340B9E for ; Fri, 12 Mar 2021 15:13:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C11E758F for ; Fri, 12 Mar 2021 15:13:57 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1615562025.2230fb36f9c66cddd5720c51f218335ebc841536.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-vpn/riseup-vpn/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild X-VCS-Directories: net-vpn/riseup-vpn/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2230fb36f9c66cddd5720c51f218335ebc841536 X-VCS-Branch: master Date: Fri, 12 Mar 2021 15:13:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a850c59e-55c2-4f61-ba79-ae976fe3c68d X-Archives-Hash: a74b55630ccce5df09cbc3e53cfbac01 commit: 2230fb36f9c66cddd5720c51f218335ebc841536 Author: Andrew Ammerlaan riseup net> AuthorDate: Fri Mar 12 15:13:45 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Fri Mar 12 15:13:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2230fb36 net-vpn/riseup-vpn: fix build, add keywords workaround is to create git repo *and* set tag to PV Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild | 63 ++++++++++++++++++----------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild index 39a538c8..39ff0fa8 100644 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild @@ -5,11 +5,11 @@ EAPI=7 DOCS_BUILDER="sphinx" DOCS_DIR="docs" -DOCS_AUTODOC=0 +DOCS_DEPEND="dev-python/alabaster" PYTHON_COMPAT=( python3_{7,8,9} ) -inherit desktop python-r1 docs go-module l10n xdg +inherit desktop python-r1 docs go-module l10n virtualx xdg EGO_SUM=( "0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2" @@ -64,21 +64,25 @@ SRC_URI="https://0xacab.org/leap/bitmask-vpn/-/archive/${PV}/bitmask-vpn-${PV}.t ${EGO_SUM_SRC_URI}" # Save a lot of Error 404's since this is not mirrored -# Tests require internet access to connect to Riseup Networks IUSE="test" -RESTRICT="mirror test" +RESTRICT="mirror !test? ( test )" # Generated with dev-go/golicense LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" SLOT="0" +# TODO: Get locales working, at the moment it failes +# to build because it wants to fetch things from the internet PLOCALES="ar bn br ca de el en-GB en-US en es-ES es eu fa-IR fr he hu it lt nl pl pt-BR pt-PT ro ru sk sv tr ug zh-TW zh" QA_PRESTRIPPED=" - /usr/bin/bitmask-vpn - /usr/bin/bitmask-helper - /usr/bin/bitmask-connect + /usr/bin/riseup-vpn +" + +BDEPEND=" + virtual/pkgconfig + test? ( dev-qt/qttest ) " DEPEND=" @@ -89,12 +93,6 @@ DEPEND=" x11-libs/gtk+:3 dev-qt/qtdeclarative[widgets] dev-qt/qtquickcontrols2[widgets] - doc? ( $(python_gen_any_dep 'dev-python/alabaster[${PYTHON_USEDEP}]') ) -" - -BDEPEND=" - virtual/pkgconfig - test? ( dev-qt/qttest ) " RDEPEND="${DEPEND} @@ -110,18 +108,40 @@ PATH="/usr/lib/go/bin:${PATH}" S="${WORKDIR}/bitmask-vpn-${PV}" +src_prepare() { + default + # build system calls git describe to get version number + # we need to init git and set a tag according to the PV + git init || die + git config user.email "larry@gentoo.org" || die + git config user.name "Larry the Cow" || die + git add . || die + git commit -m "init" || die + git tag -a "${PV}" -m "${PV}" || 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() { - emake build + # 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/bin/linux/bitmask-connect" dobin "build/bin/linux/bitmask-helper" - dobin "build/bin/linux/bitmask-vpn" - dosym "bitmask-vpn" "/usr/bin/riseup-vpn" + dobin "build/qt/release/riseup-vpn" python_scriptinto /usr/sbin python_foreach_impl python_doscript "helpers/bitmask-root" @@ -129,15 +149,10 @@ src_install() { insinto /usr/share/polkit-1/actions doins "helpers/se.leap.bitmask.policy" - newicon -s scalable "branding/assets/riseup/icon.svg" riseup.svg + newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg make_desktop_entry "${PN}" RiseupVPN riseup Network } -src_test() { - emake test - emake test_ui -} - pkg_postinst() { xdg_pkg_postinst go-module_pkg_postinst From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B59031382C5 for ; Fri, 12 Mar 2021 15:13:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18473E0B11; Fri, 12 Mar 2021 15:13:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00024E0B11 for ; Fri, 12 Mar 2021 15:13:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C3D6340C3F for ; Fri, 12 Mar 2021 15:13:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13CA1C3 for ; Fri, 12 Mar 2021 15:13:54 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1615562025.2230fb36f9c66cddd5720c51f218335ebc841536.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-vpn/riseup-vpn/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild X-VCS-Directories: net-vpn/riseup-vpn/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2230fb36f9c66cddd5720c51f218335ebc841536 X-VCS-Branch: dev Date: Fri, 12 Mar 2021 15:13:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1465ae8-5d54-4ac1-a535-e3448f71ecd2 X-Archives-Hash: 72375f26c54415bd3e770c830d46a148 Message-ID: <20210312151354.HpoJLfxpwwkvVizxqhnfEgtQFlvbA1i8GRoeBUJuPSA@z> commit: 2230fb36f9c66cddd5720c51f218335ebc841536 Author: Andrew Ammerlaan riseup net> AuthorDate: Fri Mar 12 15:13:45 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Fri Mar 12 15:13:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2230fb36 net-vpn/riseup-vpn: fix build, add keywords workaround is to create git repo *and* set tag to PV Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild | 63 ++++++++++++++++++----------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild index 39a538c8..39ff0fa8 100644 --- a/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild +++ b/net-vpn/riseup-vpn/riseup-vpn-0.21.2.ebuild @@ -5,11 +5,11 @@ EAPI=7 DOCS_BUILDER="sphinx" DOCS_DIR="docs" -DOCS_AUTODOC=0 +DOCS_DEPEND="dev-python/alabaster" PYTHON_COMPAT=( python3_{7,8,9} ) -inherit desktop python-r1 docs go-module l10n xdg +inherit desktop python-r1 docs go-module l10n virtualx xdg EGO_SUM=( "0xacab.org/leap/shapeshifter v0.0.0-20191029173606-85d3e8ac43e2" @@ -64,21 +64,25 @@ SRC_URI="https://0xacab.org/leap/bitmask-vpn/-/archive/${PV}/bitmask-vpn-${PV}.t ${EGO_SUM_SRC_URI}" # Save a lot of Error 404's since this is not mirrored -# Tests require internet access to connect to Riseup Networks IUSE="test" -RESTRICT="mirror test" +RESTRICT="mirror !test? ( test )" # Generated with dev-go/golicense LICENSE="GPL-3 BSD-2 CC0-1.0 MIT BSD" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" SLOT="0" +# TODO: Get locales working, at the moment it failes +# to build because it wants to fetch things from the internet PLOCALES="ar bn br ca de el en-GB en-US en es-ES es eu fa-IR fr he hu it lt nl pl pt-BR pt-PT ro ru sk sv tr ug zh-TW zh" QA_PRESTRIPPED=" - /usr/bin/bitmask-vpn - /usr/bin/bitmask-helper - /usr/bin/bitmask-connect + /usr/bin/riseup-vpn +" + +BDEPEND=" + virtual/pkgconfig + test? ( dev-qt/qttest ) " DEPEND=" @@ -89,12 +93,6 @@ DEPEND=" x11-libs/gtk+:3 dev-qt/qtdeclarative[widgets] dev-qt/qtquickcontrols2[widgets] - doc? ( $(python_gen_any_dep 'dev-python/alabaster[${PYTHON_USEDEP}]') ) -" - -BDEPEND=" - virtual/pkgconfig - test? ( dev-qt/qttest ) " RDEPEND="${DEPEND} @@ -110,18 +108,40 @@ PATH="/usr/lib/go/bin:${PATH}" S="${WORKDIR}/bitmask-vpn-${PV}" +src_prepare() { + default + # build system calls git describe to get version number + # we need to init git and set a tag according to the PV + git init || die + git config user.email "larry@gentoo.org" || die + git config user.name "Larry the Cow" || die + git add . || die + git commit -m "init" || die + git tag -a "${PV}" -m "${PV}" || 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() { - emake build + # 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/bin/linux/bitmask-connect" dobin "build/bin/linux/bitmask-helper" - dobin "build/bin/linux/bitmask-vpn" - dosym "bitmask-vpn" "/usr/bin/riseup-vpn" + dobin "build/qt/release/riseup-vpn" python_scriptinto /usr/sbin python_foreach_impl python_doscript "helpers/bitmask-root" @@ -129,15 +149,10 @@ src_install() { insinto /usr/share/polkit-1/actions doins "helpers/se.leap.bitmask.policy" - newicon -s scalable "branding/assets/riseup/icon.svg" riseup.svg + newicon -s scalable "providers/riseup/assets/icon.svg" riseup.svg make_desktop_entry "${PN}" RiseupVPN riseup Network } -src_test() { - emake test - emake test_ui -} - pkg_postinst() { xdg_pkg_postinst go-module_pkg_postinst