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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 76E1E158086 for ; Tue, 23 Nov 2021 12:53:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C3E3E0845; Tue, 23 Nov 2021 12:53:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76CB5E0845 for ; Tue, 23 Nov 2021 12:53:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F488342CDD for ; Tue, 23 Nov 2021 12:53:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EA718E for ; Tue, 23 Nov 2021 12:53:20 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1637671985.17a2413ac177eb44ec991ba0007bb28227c7ddc9.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/yubioath-desktop/files/, app-crypt/yubioath-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild X-VCS-Directories: app-crypt/yubioath-desktop/files/ app-crypt/yubioath-desktop/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 17a2413ac177eb44ec991ba0007bb28227c7ddc9 X-VCS-Branch: master Date: Tue, 23 Nov 2021 12:53:20 +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: bf77cd46-4acb-4a98-9607-81b44cd98fff X-Archives-Hash: d683bf846c64a8fdbfbede67ff88e1ee commit: 17a2413ac177eb44ec991ba0007bb28227c7ddc9 Author: David Seifert gentoo org> AuthorDate: Tue Nov 23 12:53:05 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Nov 23 12:53:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a2413a app-crypt/yubioath-desktop: fix install location Closes: https://bugs.gentoo.org/825390 Signed-off-by: David Seifert gentoo.org> .../yubioath-desktop-5.1.0-bin-installdir.patch | 22 ++++++++++++++++++++++ ...1.0.ebuild => yubioath-desktop-5.1.0-r1.ebuild} | 6 ++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch new file mode 100644 index 000000000000..749533ba31ba --- /dev/null +++ b/app-crypt/yubioath-desktop/files/yubioath-desktop-5.1.0-bin-installdir.patch @@ -0,0 +1,22 @@ +From 9ae1ef710d5b070e128597a0fad3bd4ffa94b0aa Mon Sep 17 00:00:00 2001 +From: Dennis Fokin +Date: Thu, 7 Oct 2021 10:18:33 +0200 +Subject: [PATCH] Set correct install path + +--- + yubioath-desktop.pro | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/yubioath-desktop.pro b/yubioath-desktop.pro +index 551416ae..c0ef9bb1 100644 +--- a/yubioath-desktop.pro ++++ b/yubioath-desktop.pro +@@ -75,6 +75,8 @@ lupdate_only { + qml/slot/*.qml + } + ++# Set correct install path ++target.path = $$PREFIX/bin + + DISTFILES += \ + py/* \ diff --git a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild similarity index 92% rename from app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild rename to app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild index e2f85896c574..c2f7b927166a 100644 --- a/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0.ebuild +++ b/app-crypt/yubioath-desktop/yubioath-desktop-5.1.0-r1.ebuild @@ -34,12 +34,10 @@ RDEPEND="${DEPEND} $(python_gen_cond_dep '>=app-crypt/yubikey-manager-4.0.0[${PYTHON_USEDEP}]') dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]" +PATCHES=( "${FILESDIR}"/${P}-bin-installdir.patch ) + src_prepare() { default - sed -i \ - -e "s:python build_qrc.py:${PYTHON} build_qrc.py:" \ - yubioath-desktop.pro || die - python_fix_shebang "${S}" }