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 E38F3158087 for ; Wed, 12 Jan 2022 21:19:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABB132BC041; Wed, 12 Jan 2022 21:19:09 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E75632BC041 for ; Wed, 12 Jan 2022 21:19:07 +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 9652E3432C5 for ; Wed, 12 Jan 2022 21:19:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35B2F258 for ; Wed, 12 Jan 2022 21:19:03 +0000 (UTC) From: "Andrey Syutkin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Syutkin" Message-ID: <1642022329.4975b6805b692341863383a69e72d91cb10c1870.syutkin@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/far2l/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-misc/far2l/far2l-2.4.0_beta.ebuild app-misc/far2l/far2l-9999.ebuild X-VCS-Directories: app-misc/far2l/ X-VCS-Committer: syutkin X-VCS-Committer-Name: Andrey Syutkin X-VCS-Revision: 4975b6805b692341863383a69e72d91cb10c1870 X-VCS-Branch: dev Date: Wed, 12 Jan 2022 21:19:03 +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: c936147d-49c9-40bd-a8bd-8a3526ff1647 X-Archives-Hash: 1dcfbb983185439bbb20d4201a7e7d25 commit: 4975b6805b692341863383a69e72d91cb10c1870 Author: Andrey Syutkin gmail com> AuthorDate: Wed Jan 12 21:18:49 2022 +0000 Commit: Andrey Syutkin gmail com> CommitDate: Wed Jan 12 21:18:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4975b680 app-misc/far2l: Fix sed for hardcoded rm Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andrey Syutkin gmail.com> app-misc/far2l/far2l-2.4.0_beta.ebuild | 4 +--- app-misc/far2l/far2l-9999.ebuild | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app-misc/far2l/far2l-2.4.0_beta.ebuild b/app-misc/far2l/far2l-2.4.0_beta.ebuild index 1120beac3..699a53fdc 100644 --- a/app-misc/far2l/far2l-2.4.0_beta.ebuild +++ b/app-misc/far2l/far2l-2.4.0_beta.ebuild @@ -64,9 +64,7 @@ pkg_setup() { src_prepare() { sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt || die - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/farftp/plug/farftp.far-plug-mb && echo Removed existing farftp plugin)::" -i "${S}"/CMakeLists.txt || die - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python.far-plug-wide && echo Removed existing python plugin)::" -i "${S}"/CMakeLists.txt || die + sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND echo Python\: prepaing virtual environment)::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND \${PYTHON3} -m venv --system-site-packages \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python)::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND echo Python\: installing packages)::" -i "${S}"/CMakeLists.txt || die diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild index 1120beac3..699a53fdc 100644 --- a/app-misc/far2l/far2l-9999.ebuild +++ b/app-misc/far2l/far2l-9999.ebuild @@ -64,9 +64,7 @@ pkg_setup() { src_prepare() { sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt || die - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/farftp/plug/farftp.far-plug-mb && echo Removed existing farftp plugin)::" -i "${S}"/CMakeLists.txt || die - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python.far-plug-wide && echo Removed existing python plugin)::" -i "${S}"/CMakeLists.txt || die + sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/.*::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND echo Python\: prepaing virtual environment)::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND \${PYTHON3} -m venv --system-site-packages \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python)::" -i "${S}"/CMakeLists.txt || die sed -e "s:execute_process(COMMAND echo Python\: installing packages)::" -i "${S}"/CMakeLists.txt || die