commit: 231822dc2b2d1576e68aaeb14ed9c973f6c9f374 Author: Andrey Syutkin <syutkin <AT> gmail <DOT> com> AuthorDate: Mon Jan 1 10:45:03 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Jan 1 10:45:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=231822dc
app-misc/far2l: version bump to 2.5.3_beta Drop python plugins support for now Signed-off-by: Andrey Syutkin <syutkin <AT> gmail.com> app-misc/far2l/Manifest | 3 +- app-misc/far2l/far2l-2.3.2_alpha.ebuild | 92 ---------------------- ...l-2.4.0_beta.ebuild => far2l-2.5.3_beta.ebuild} | 26 ++---- app-misc/far2l/far2l-9999.ebuild | 26 ++---- app-misc/far2l/metadata.xml | 3 +- 5 files changed, 18 insertions(+), 132 deletions(-) diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest index 7e9fdc0d6d..51138987f7 100644 --- a/app-misc/far2l/Manifest +++ b/app-misc/far2l/Manifest @@ -1,2 +1 @@ -DIST v_2.3.2.tar.gz 6232935 BLAKE2B ea146088c518bfeb0d935313a07f00a37fd2b6998388060514d144494946565661d3554e8ffb63b4bed8b9f1c3cea2ba4ec4c0787b0fa89df7f8d39720606b03 SHA512 e610a2b92ab3e7896f3aa5a59872cf273ab1c60ff6aac8e71d1d7152c2e8cb36fb8552167e13c8a4bcec9138052a3397c202cfa4b57cddf2053508421eb66799 -DIST v_2.4.0.tar.gz 6223889 BLAKE2B 25c13233dc53b4be7ba97eb20c6455cda2d1ffd332ece0c6869cd88f7af16b052fab13968a20bf12d6549e17b46fc894503d59f58a893e550808759fde974279 SHA512 096f7a755f71be2b5f80ad091ed4f796e064af6f91d7313bb3c898ea65cb743e406963df3c8b1a263df0d3b2a628f2f47653a14b8fe78a32ee9379ff424f9594 +DIST v_2.5.3.tar.gz 6529657 BLAKE2B fe0a1fad689594c1f472301b1f39e813fc7a5d949a99db38120f4beb4d703854ce0e6fc844e881623cf3a255357ec3680a9efbc78090a800c4c6d3455d6eafea SHA512 a4569511428f7d1465554e9c8075b9481be73f5383831b46e1c5e6ab25e5672585dbbe96bbf22c6dd5115c38e62916f0eef8206718374110b78389fde54086bd diff --git a/app-misc/far2l/far2l-2.3.2_alpha.ebuild b/app-misc/far2l/far2l-2.3.2_alpha.ebuild deleted file mode 100644 index f0d8a1521f..0000000000 --- a/app-misc/far2l/far2l-2.3.2_alpha.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_10 ) - -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="v_${PV/_alpha/}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/elfmz/far2l/archive/${MY_PV}.tar.gz"; - KEYWORDS="~amd64" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="mirror" - -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} - virtual/python-cffi - dev-python/debugpy - )" - -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 - 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 - sed -e "s:execute_process(COMMAND \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python/bin/python -m pip install cffi debugpy)::" -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.4.0_beta.ebuild b/app-misc/far2l/far2l-2.5.3_beta.ebuild similarity index 64% rename from app-misc/far2l/far2l-2.4.0_beta.ebuild rename to app-misc/far2l/far2l-2.5.3_beta.ebuild index 4742dd5ce4..7f902db401 100644 --- a/app-misc/far2l/far2l-2.4.0_beta.ebuild +++ b/app-misc/far2l/far2l-2.5.3_beta.ebuild @@ -1,20 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -PYTHON_COMPAT=( python3_10 ) +EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit cmake xdg wxwidgets python-r1 +inherit cmake xdg wxwidgets 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 @@ -27,8 +24,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets" RESTRICT="mirror" BDEPEND="sys-devel/m4" @@ -44,11 +40,7 @@ RDEPEND="dev-libs/xerces-c webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 - app-arch/libarchive ) - python? ( - ${PYTHON_DEPS} - virtual/python-cffi - dev-python/debugpy + app-arch/libarchive )" DEPEND="${RDEPEND}" @@ -65,17 +57,15 @@ 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/.*::" -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 - sed -e "s:execute_process(COMMAND \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python/bin/python -m pip install cffi debugpy)::" -i "${S}"/CMakeLists.txt || die cmake_src_prepare } src_configure() { local mycmakeargs=( -DUSEWX="$(usex wxwidgets)" - -DPYTHON="$(usex python)" +# FIXME: add python plugins support +# We need pcpp for this +# -DPYTHON="$(usex python)" -DBUILD_SHARED_LIBS=OFF ) diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild index 4742dd5ce4..7f902db401 100644 --- a/app-misc/far2l/far2l-9999.ebuild +++ b/app-misc/far2l/far2l-9999.ebuild @@ -1,20 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -PYTHON_COMPAT=( python3_10 ) +EAPI=8 WX_GTK_VER="3.0-gtk3" -inherit cmake xdg wxwidgets python-r1 +inherit cmake xdg wxwidgets 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 @@ -27,8 +24,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets" RESTRICT="mirror" BDEPEND="sys-devel/m4" @@ -44,11 +40,7 @@ RDEPEND="dev-libs/xerces-c webdav? ( net-libs/neon ) archive? ( dev-libs/libpcre2 - app-arch/libarchive ) - python? ( - ${PYTHON_DEPS} - virtual/python-cffi - dev-python/debugpy + app-arch/libarchive )" DEPEND="${RDEPEND}" @@ -65,17 +57,15 @@ 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/.*::" -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 - sed -e "s:execute_process(COMMAND \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/python/plug/python/bin/python -m pip install cffi debugpy)::" -i "${S}"/CMakeLists.txt || die cmake_src_prepare } src_configure() { local mycmakeargs=( -DUSEWX="$(usex wxwidgets)" - -DPYTHON="$(usex python)" +# FIXME: add python plugins support +# We need pcpp for this +# -DPYTHON="$(usex python)" -DBUILD_SHARED_LIBS=OFF ) diff --git a/app-misc/far2l/metadata.xml b/app-misc/far2l/metadata.xml index 231e890f0f..5995d0e6f7 100644 --- a/app-misc/far2l/metadata.xml +++ b/app-misc/far2l/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <maintainer type="person"> <email>[email protected]</email> @@ -11,7 +11,6 @@ <use> <flag name="archive">Multiarc extended archives support</flag> <flag name="nfs">NFS support in NetRocks</flag> - <flag name="python">Python scripting support</flag> <flag name="samba">SMB support in NetRocks</flag> <flag name="sftp">SFTP support in NetRocks</flag> <flag name="ssl">FTPS support in NetRocks</flag>
