commit: fb73b27b2ab4c8ff6cfff0c761cbcf09c7ad2cf4
Author: Andrey Syutkin <syutkin <AT> gmail <DOT> com>
AuthorDate: Mon Nov 18 09:47:59 2024 +0000
Commit: Andrey Syutkin <syutkin <AT> gmail <DOT> com>
CommitDate: Mon Nov 18 10:01:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fb73b27b
app-misc/far2l: version bump
Signed-off-by: Andrey Syutkin <syutkin <AT> gmail.com>
app-misc/far2l/Manifest | 2 +-
app-misc/far2l/far2l-2.6.3_beta.ebuild | 9 +++--
...l-2.5.3_beta.ebuild => far2l-2.6.4_beta.ebuild} | 40 ++++++++++++----------
app-misc/far2l/far2l-9999.ebuild | 4 +--
4 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest
index 1002b51cd..4f3f5d728 100644
--- a/app-misc/far2l/Manifest
+++ b/app-misc/far2l/Manifest
@@ -1,2 +1,2 @@
-DIST v_2.5.3.tar.gz 6529657 BLAKE2B
fe0a1fad689594c1f472301b1f39e813fc7a5d949a99db38120f4beb4d703854ce0e6fc844e881623cf3a255357ec3680a9efbc78090a800c4c6d3455d6eafea
SHA512
a4569511428f7d1465554e9c8075b9481be73f5383831b46e1c5e6ab25e5672585dbbe96bbf22c6dd5115c38e62916f0eef8206718374110b78389fde54086bd
DIST v_2.6.3.tar.gz 6730071 BLAKE2B
09e629c4bc77a93acdbe92a455355cb09ef54eb025c824fbf829db093f6d5b5a9491023aec80b050667aeeca910dbe82183d542268b0f722c83aa81e3278ade8
SHA512
9d35cae6bbc55058b4926026f73d8f368d8c78669493a67ab0901a3b044b27db87297715d763116fd3460f3a76dc890dbede09e24c3eae8354ac005d8f1c8bd7
+DIST v_2.6.4.tar.gz 6854330 BLAKE2B
577de3d07a40822c88358d267fa4be8b9ff68e4928218002a9cd45c9d3edd2e1faecbd8dec11d54aeeb6c49f087b8aff8d0fb0e22ffcc5fb0152b0d27774dc03
SHA512
87dfdbcecc0617d200288f113a7a59ae3192c9ab3f0e39fa1dac4992cedc9fdce2bf2bdc317446d37a078581c2c7dd5d7cf4fcb65e1577fafeec91974eb08a59
diff --git a/app-misc/far2l/far2l-2.6.3_beta.ebuild
b/app-misc/far2l/far2l-2.6.3_beta.ebuild
index 7f902db40..aea5ff8c0 100644
--- a/app-misc/far2l/far2l-2.6.3_beta.ebuild
+++ b/app-misc/far2l/far2l-2.6.3_beta.ebuild
@@ -54,9 +54,12 @@ 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/.*::" -i "${S}"/CMakeLists.txt || die
+ 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
cmake_src_prepare
}
diff --git a/app-misc/far2l/far2l-2.5.3_beta.ebuild
b/app-misc/far2l/far2l-2.6.4_beta.ebuild
similarity index 77%
rename from app-misc/far2l/far2l-2.5.3_beta.ebuild
rename to app-misc/far2l/far2l-2.6.4_beta.ebuild
index 9a8b9b390..8fafefc45 100644
--- a/app-misc/far2l/far2l-2.5.3_beta.ebuild
+++ b/app-misc/far2l/far2l-2.6.4_beta.ebuild
@@ -3,7 +3,9 @@
EAPI=8
-WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{10..13} )
+
+WX_GTK_VER="3.2-gtk3"
inherit cmake xdg wxwidgets
@@ -24,24 +26,26 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets"
+IUSE="+archive +chardet +colorer nfs samba sftp +ssl webdav wxwidgets X"
RESTRICT="mirror"
-BDEPEND="sys-devel/m4"
-
-RDEPEND="dev-libs/xerces-c
- dev-libs/spdlog
- app-i18n/uchardet
+RDEPEND="
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 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXi
+ )
archive? (
dev-libs/libpcre2
app-arch/libarchive
- )"
+ )
+ chardet? ( app-i18n/uchardet )
+ colorer? ( dev-libs/libxml2 )
+ nfs? ( net-fs/libnfs )
+ samba? ( net-fs/samba )
+ sftp? ( net-libs/libssh[sftp] )
+ ssl? ( dev-libs/openssl )
+ webdav? ( net-libs/neon )"
DEPEND="${RDEPEND}"
@@ -54,11 +58,9 @@ pkg_setup() {
}
src_prepare() {
- p=/lib/far2l/far2l
-
- sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l
\${CMAKE_INSTALL_PREFIX}\${p}_askpass)::" \
+ 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}\${p}_sudoapp)::" \
+ 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
@@ -68,8 +70,8 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DUSEWX="$(usex wxwidgets)"
-# FIXME: add python plugins support
-# We need pcpp for this
+ -DUSEUCD=$"$(usex chardet)"
+ -DCOLORER="$(usex colorer)"
# -DPYTHON="$(usex python)"
-DBUILD_SHARED_LIBS=OFF
)
diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild
index d297445e3..8fafefc45 100644
--- a/app-misc/far2l/far2l-9999.ebuild
+++ b/app-misc/far2l/far2l-9999.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+PYTHON_COMPAT=( python3_{10..13} )
+
WX_GTK_VER="3.2-gtk3"
inherit cmake xdg wxwidgets
@@ -70,8 +72,6 @@ src_configure() {
-DUSEWX="$(usex wxwidgets)"
-DUSEUCD=$"$(usex chardet)"
-DCOLORER="$(usex colorer)"
-# FIXME: add python plugins support
-# We need pcpp for this
# -DPYTHON="$(usex python)"
-DBUILD_SHARED_LIBS=OFF
)
