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 795161382C5 for ; Thu, 22 Apr 2021 22:11:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C6E5E0916; Thu, 22 Apr 2021 22:11:25 +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 5E8F2E0916 for ; Thu, 22 Apr 2021 22:11:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 90C4734138F for ; Thu, 22 Apr 2021 22:11:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 13CA6646 for ; Thu, 22 Apr 2021 22:11:22 +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: <1619129434.b4ad2d87cfb40746caa928be4639af8320032baa.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.3.20210419_alpha.ebuild app-misc/far2l/far2l-9999.ebuild app-misc/far2l/metadata.xml X-VCS-Directories: app-misc/far2l/ X-VCS-Committer: syutkin X-VCS-Committer-Name: Andrey Syutkin X-VCS-Revision: b4ad2d87cfb40746caa928be4639af8320032baa X-VCS-Branch: dev Date: Thu, 22 Apr 2021 22:11:22 +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: 0a388a26-c8f5-4650-8c86-ed5af0613144 X-Archives-Hash: a9e93b102d6f0f43b7ca38234f22830f commit: b4ad2d87cfb40746caa928be4639af8320032baa Author: Andrey Syutkin gmail com> AuthorDate: Thu Apr 22 22:10:34 2021 +0000 Commit: Andrey Syutkin gmail com> CommitDate: Thu Apr 22 22:10:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b4ad2d87 app-misc/far2l: various changes and cleanups Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Andrey Syutkin gmail.com> app-misc/far2l/far2l-2.3.20210419_alpha.ebuild | 41 +++++++++----------------- app-misc/far2l/far2l-9999.ebuild | 41 +++++++++----------------- app-misc/far2l/metadata.xml | 9 ++++++ 3 files changed, 37 insertions(+), 54 deletions(-) diff --git a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild index 46f3a6551..fd7b2a26c 100644 --- a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild +++ b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild @@ -5,13 +5,11 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_BUILD_TYPE="Release" WX_GTK_VER="3.0-gtk3" -inherit cmake xdg-utils wxwidgets python-r1 +inherit cmake xdg wxwidgets python-r1 -DESCRIPTION="Linux port of Far Manager" +DESCRIPTION="Linux port of FAR Manager v2" HOMEPAGE="https://github.com/elfmz/far2l" if [[ "${PV}" == "9999" ]] ; then @@ -29,21 +27,16 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs" +IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -BDEPEND=">=dev-util/cmake-3.2.2 - sys-devel/m4" +BDEPEND="sys-devel/m4" -RDEPEND="sys-apps/gawk - dev-libs/xerces-c +RDEPEND="dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) - ssl? ( - !libressl? ( dev-libs/openssl ) - libressl? ( dev-libs/libressl ) - ) + ssl? ( dev-libs/openssl ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) @@ -55,6 +48,8 @@ RDEPEND="sys-apps/gawk DEPEND="${RDEPEND}" +DOCS=( README.md ) + pkg_setup() { if use wxwidgets; then setup-wxwidgets @@ -62,11 +57,11 @@ 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 - sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt - 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 - 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 + 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 } @@ -74,7 +69,7 @@ src_configure() { local mycmakeargs=( -DUSEWX="$(usex wxwidgets)" -DPYTHON="$(usex python)" - -DBUILD_SHARED_LIBS="$(usex static-libs "no" "yes")" + -DBUILD_SHARED_LIBS=OFF ) cmake_src_configure @@ -86,11 +81,3 @@ src_install(){ dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass" dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp" } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild index 46f3a6551..fd7b2a26c 100644 --- a/app-misc/far2l/far2l-9999.ebuild +++ b/app-misc/far2l/far2l-9999.ebuild @@ -5,13 +5,11 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_BUILD_TYPE="Release" WX_GTK_VER="3.0-gtk3" -inherit cmake xdg-utils wxwidgets python-r1 +inherit cmake xdg wxwidgets python-r1 -DESCRIPTION="Linux port of Far Manager" +DESCRIPTION="Linux port of FAR Manager v2" HOMEPAGE="https://github.com/elfmz/far2l" if [[ "${PV}" == "9999" ]] ; then @@ -29,21 +27,16 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs" +IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -BDEPEND=">=dev-util/cmake-3.2.2 - sys-devel/m4" +BDEPEND="sys-devel/m4" -RDEPEND="sys-apps/gawk - dev-libs/xerces-c +RDEPEND="dev-libs/xerces-c dev-libs/spdlog app-i18n/uchardet wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) - ssl? ( - !libressl? ( dev-libs/openssl ) - libressl? ( dev-libs/libressl ) - ) + ssl? ( dev-libs/openssl ) sftp? ( net-libs/libssh[sftp] ) samba? ( net-fs/samba ) nfs? ( net-fs/libnfs ) @@ -55,6 +48,8 @@ RDEPEND="sys-apps/gawk DEPEND="${RDEPEND}" +DOCS=( README.md ) + pkg_setup() { if use wxwidgets; then setup-wxwidgets @@ -62,11 +57,11 @@ 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 - sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt - 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 - 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 + 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 } @@ -74,7 +69,7 @@ src_configure() { local mycmakeargs=( -DUSEWX="$(usex wxwidgets)" -DPYTHON="$(usex python)" - -DBUILD_SHARED_LIBS="$(usex static-libs "no" "yes")" + -DBUILD_SHARED_LIBS=OFF ) cmake_src_configure @@ -86,11 +81,3 @@ src_install(){ dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass" dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp" } - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-misc/far2l/metadata.xml b/app-misc/far2l/metadata.xml index fd703baf5..0c6a1eb9f 100644 --- a/app-misc/far2l/metadata.xml +++ b/app-misc/far2l/metadata.xml @@ -1,12 +1,21 @@ + + syutkin@gmail.com + Andrey Syutkin + + + elfmz/far2l + Multiarc extended archives support NFS support in NetRocks + Python scripting support SMB support in NetRocks SFTP support in NetRocks FTPS support in NetRocks WebDav support in NetRocks + GUI backend support