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 45B651382C5 for ; Thu, 17 Jun 2021 16:55:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D5B3E0833; Thu, 17 Jun 2021 16:55:13 +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 63348E0833 for ; Thu, 17 Jun 2021 16:55:13 +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 B48A9335CD3 for ; Thu, 17 Jun 2021 16:55:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1CF7447 for ; Thu, 17 Jun 2021 16:55:10 +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: <1623948908.f974ebac64e3711521daeb72f68708950754507a.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/Manifest app-misc/far2l/far2l-2.3.20210419_alpha.ebuild app-misc/far2l/far2l-2.3.20210426_alpha.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: f974ebac64e3711521daeb72f68708950754507a X-VCS-Branch: dev Date: Thu, 17 Jun 2021 16:55:10 +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: cd4fdfe6-dc31-4286-bb75-f24aef5047e6 X-Archives-Hash: 8bafba40076b3930cb2bad93e93405a2 commit: f974ebac64e3711521daeb72f68708950754507a Author: Andrey Syutkin gmail com> AuthorDate: Thu Jun 17 16:51:48 2021 +0000 Commit: Andrey Syutkin gmail com> CommitDate: Thu Jun 17 16:55:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f974ebac app-misc/far2l: add required python deps, drop 2.3.20210419 Signed-off-by: Andrey Syutkin gmail.com> app-misc/far2l/Manifest | 1 - app-misc/far2l/far2l-2.3.20210419_alpha.ebuild | 86 -------------------------- app-misc/far2l/far2l-2.3.20210426_alpha.ebuild | 4 +- app-misc/far2l/far2l-9999.ebuild | 5 +- 4 files changed, 6 insertions(+), 90 deletions(-) diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest index 1cc40960a..e073873f0 100644 --- a/app-misc/far2l/Manifest +++ b/app-misc/far2l/Manifest @@ -1,2 +1 @@ -DIST far2l-2.3.20210419_alpha.tar.gz 5441978 BLAKE2B d8878704d5928d5240e1cdcf32dc3e2bd298c3a283811ae29a9cff36c20d1ae8b655ea5355f7c41660eb91b6e53b6c26cf66e93f7d4fc59e12ad3ee1e2cac4b0 SHA512 99b98f5946ce93ddbd93a9d26ce4db22ee687e7c9cbaab53b0087896a9a8247041064614b489d5e6e0a0d4ead72057db5bcbdbf6b060e36b9eb4f61aa30dec38 DIST far2l-2.3.20210426_alpha.tar.gz 5441382 BLAKE2B d6f1c2611d4c149755bf7bf7b25428030489f56b3ff5a0f8a5d4703b2229c45a4d35ec6ce3b7b90681690135028678b29cd3062be5fe74eb5a4494edfe3a2b93 SHA512 28a4e819c36815d8e754ea04b57631ee61d5c48ecfe32ce7d7a45564d8f3e08dd8cdcc5a34d3c8c4abc45b143d819c286ad95cbdc281c6b94e8599ff3acdcec3 diff --git a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild deleted file mode 100644 index 85318fa2b..000000000 --- a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -WX_GTK_VER="3.0-gtk3" - -inherit cmake xdg wxwidgets python-r1 - -DESCRIPTION="Linux port of FAR Manager v2" -HOMEPAGE="https://github.com/elfmz/far2l" - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - SRC_URI="" - EGIT_REPO_URI="https://github.com/elfmz/far2l" - EGIT_BRANCH="master" -else - MY_PV="${PV:4:4}-${PV:8:2}-${PV:10:8}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND="sys-devel/m4" - -RDEPEND="dev-libs/xerces-c - dev-libs/spdlog - app-i18n/uchardet - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) - ssl? ( dev-libs/openssl ) - sftp? ( net-libs/libssh[sftp] ) - samba? ( net-fs/samba ) - nfs? ( net-fs/libnfs ) - webdav? ( net-libs/neon ) - archive? ( - dev-libs/libpcre2 - app-arch/libarchive ) - python? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') - )" - -DEPEND="${RDEPEND}" - -DOCS=( README.md ) - -pkg_setup() { - if use wxwidgets; then - setup-wxwidgets - fi -} - -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 - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DUSEWX="$(usex wxwidgets)" - -DPYTHON="$(usex python)" - -DBUILD_SHARED_LIBS=OFF - ) - - cmake_src_configure -} - -src_install(){ - cmake_src_install - einstalldocs - dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass" - dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp" -} diff --git a/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild index 85318fa2b..ea9fb3377 100644 --- a/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild +++ b/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) WX_GTK_VER="3.0-gtk3" @@ -46,6 +46,8 @@ RDEPEND="dev-libs/xerces-c app-arch/libarchive ) python? ( ${PYTHON_DEPS} + virtual/python-cffi + dev-python/debugpy $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') )" diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild index 85318fa2b..dd01ac84a 100644 --- a/app-misc/far2l/far2l-9999.ebuild +++ b/app-misc/far2l/far2l-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) WX_GTK_VER="3.0-gtk3" @@ -46,7 +46,8 @@ RDEPEND="dev-libs/xerces-c app-arch/libarchive ) python? ( ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') + virtual/python-cffi + dev-python/debugpy )" DEPEND="${RDEPEND}"