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 514B8138334 for ; Thu, 1 Aug 2019 18:21:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AE5DE0815; Thu, 1 Aug 2019 18:21:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 28C4FE0819 for ; Thu, 1 Aug 2019 18:21:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 8E560349206 for ; Thu, 1 Aug 2019 18:21:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FFA473C for ; Thu, 1 Aug 2019 18:21:48 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1564683696.0ebd505af7440cd2a4b5b5861f674a964d43dccb.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/electrum/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/electrum/electrum-3.3.6-r3.ebuild X-VCS-Directories: net-misc/electrum/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0ebd505af7440cd2a4b5b5861f674a964d43dccb X-VCS-Branch: master Date: Thu, 1 Aug 2019 18:21:48 +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: 986467c4-4e58-4adb-b3b1-cee2355ce740 X-Archives-Hash: 044d8eb4309c16e3a3335a5b319d3343 commit: 0ebd505af7440cd2a4b5b5861f674a964d43dccb Author: Michał Górny gentoo org> AuthorDate: Thu Aug 1 17:19:06 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Aug 1 18:21:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebd505a net-misc/electrum: Remove plugin stripping Remove plugin stripping, and USE flags that controlled that only. This leaves only USE=qrcode that pulls in the needed dependency. Stripping breaks 3.3.8. Signed-off-by: Michał Górny gentoo.org> net-misc/electrum/electrum-3.3.6-r3.ebuild | 41 +++--------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/net-misc/electrum/electrum-3.3.6-r3.ebuild b/net-misc/electrum/electrum-3.3.6-r3.ebuild index 1cb1b8b2bba..67887803dc4 100644 --- a/net-misc/electrum/electrum-3.3.6-r3.ebuild +++ b/net-misc/electrum/electrum-3.3.6-r3.ebuild @@ -16,20 +16,9 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="audio_modem cli coldcard cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 safe_t sync revealer trustedcoin_com vkb" - -REQUIRED_USE=" - || ( cli ncurses qt5 ) - audio_modem? ( qt5 ) - cosign? ( qt5 ) - digitalbitbox? ( qt5 ) - email? ( qt5 ) - greenaddress_it? ( qt5 ) - qrcode? ( qt5 ) - sync? ( qt5 ) - trustedcoin_com? ( qt5 ) - vkb? ( qt5 ) -" +IUSE="cli ncurses qrcode +qt5" + +REQUIRED_USE="|| ( cli ncurses qt5 )" RDEPEND="${PYTHON_DEPS} dev-python/aiohttp-socks[${PYTHON_USEDEP}] @@ -92,30 +81,6 @@ src_prepare() { fi sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die - local plugin - # trezor requires python trezorlib module - # keepkey requires trezor - for plugin in \ - $(usex audio_modem '' audio_modem ) \ - $(usex coldcard '' coldcard ) \ - $(usex cosign '' cosigner_pool ) \ - $(usex digitalbitbox '' digitalbitbox ) \ - $(usex email '' email_requests ) \ - $(usex greenaddress_it '' greenaddress_instant ) \ - hw_wallet \ - ledger \ - keepkey \ - $(usex safe_t '' safe_t ) \ - $(usex sync '' labels ) \ - $(usex revealer '' revealer ) \ - trezor \ - $(usex trustedcoin_com '' trustedcoin ) \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm -r ${PN}/plugins/"${plugin}"* || die - sed -i "/${plugin}/d" setup.py || die - done - eapply_user xdg_environment_reset