1 |
commit: f974ebac64e3711521daeb72f68708950754507a |
2 |
Author: Andrey Syutkin <syutkin <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Jun 17 16:51:48 2021 +0000 |
4 |
Commit: Andrey Syutkin <syutkin <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Jun 17 16:55:08 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f974ebac |
7 |
|
8 |
app-misc/far2l: add required python deps, drop 2.3.20210419 |
9 |
|
10 |
Signed-off-by: Andrey Syutkin <syutkin <AT> gmail.com> |
11 |
|
12 |
app-misc/far2l/Manifest | 1 - |
13 |
app-misc/far2l/far2l-2.3.20210419_alpha.ebuild | 86 -------------------------- |
14 |
app-misc/far2l/far2l-2.3.20210426_alpha.ebuild | 4 +- |
15 |
app-misc/far2l/far2l-9999.ebuild | 5 +- |
16 |
4 files changed, 6 insertions(+), 90 deletions(-) |
17 |
|
18 |
diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest |
19 |
index 1cc40960a..e073873f0 100644 |
20 |
--- a/app-misc/far2l/Manifest |
21 |
+++ b/app-misc/far2l/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST far2l-2.3.20210419_alpha.tar.gz 5441978 BLAKE2B d8878704d5928d5240e1cdcf32dc3e2bd298c3a283811ae29a9cff36c20d1ae8b655ea5355f7c41660eb91b6e53b6c26cf66e93f7d4fc59e12ad3ee1e2cac4b0 SHA512 99b98f5946ce93ddbd93a9d26ce4db22ee687e7c9cbaab53b0087896a9a8247041064614b489d5e6e0a0d4ead72057db5bcbdbf6b060e36b9eb4f61aa30dec38 |
24 |
DIST far2l-2.3.20210426_alpha.tar.gz 5441382 BLAKE2B d6f1c2611d4c149755bf7bf7b25428030489f56b3ff5a0f8a5d4703b2229c45a4d35ec6ce3b7b90681690135028678b29cd3062be5fe74eb5a4494edfe3a2b93 SHA512 28a4e819c36815d8e754ea04b57631ee61d5c48ecfe32ce7d7a45564d8f3e08dd8cdcc5a34d3c8c4abc45b143d819c286ad95cbdc281c6b94e8599ff3acdcec3 |
25 |
|
26 |
diff --git a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild |
27 |
deleted file mode 100644 |
28 |
index 85318fa2b..000000000 |
29 |
--- a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,86 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-PYTHON_COMPAT=( python3_{7..9} ) |
38 |
- |
39 |
-WX_GTK_VER="3.0-gtk3" |
40 |
- |
41 |
-inherit cmake xdg wxwidgets python-r1 |
42 |
- |
43 |
-DESCRIPTION="Linux port of FAR Manager v2" |
44 |
-HOMEPAGE="https://github.com/elfmz/far2l" |
45 |
- |
46 |
-if [[ "${PV}" == "9999" ]] ; then |
47 |
- inherit git-r3 |
48 |
- SRC_URI="" |
49 |
- EGIT_REPO_URI="https://github.com/elfmz/far2l" |
50 |
- EGIT_BRANCH="master" |
51 |
-else |
52 |
- MY_PV="${PV:4:4}-${PV:8:2}-${PV:10:8}" |
53 |
- MY_P="${PN}-${MY_PV}" |
54 |
- S="${WORKDIR}/${MY_P}" |
55 |
- SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" |
56 |
- KEYWORDS="~amd64 ~x86" |
57 |
-fi |
58 |
- |
59 |
-LICENSE="GPL-2" |
60 |
-SLOT="0" |
61 |
-IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python" |
62 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
63 |
- |
64 |
-BDEPEND="sys-devel/m4" |
65 |
- |
66 |
-RDEPEND="dev-libs/xerces-c |
67 |
- dev-libs/spdlog |
68 |
- app-i18n/uchardet |
69 |
- wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} ) |
70 |
- ssl? ( dev-libs/openssl ) |
71 |
- sftp? ( net-libs/libssh[sftp] ) |
72 |
- samba? ( net-fs/samba ) |
73 |
- nfs? ( net-fs/libnfs ) |
74 |
- webdav? ( net-libs/neon ) |
75 |
- archive? ( |
76 |
- dev-libs/libpcre2 |
77 |
- app-arch/libarchive ) |
78 |
- python? ( |
79 |
- ${PYTHON_DEPS} |
80 |
- $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') |
81 |
- )" |
82 |
- |
83 |
-DEPEND="${RDEPEND}" |
84 |
- |
85 |
-DOCS=( README.md ) |
86 |
- |
87 |
-pkg_setup() { |
88 |
- if use wxwidgets; then |
89 |
- setup-wxwidgets |
90 |
- fi |
91 |
-} |
92 |
- |
93 |
-src_prepare() { |
94 |
- sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt || die |
95 |
- sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die |
96 |
- 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 |
97 |
- 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 |
98 |
- 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 |
99 |
- cmake_src_prepare |
100 |
-} |
101 |
- |
102 |
-src_configure() { |
103 |
- local mycmakeargs=( |
104 |
- -DUSEWX="$(usex wxwidgets)" |
105 |
- -DPYTHON="$(usex python)" |
106 |
- -DBUILD_SHARED_LIBS=OFF |
107 |
- ) |
108 |
- |
109 |
- cmake_src_configure |
110 |
-} |
111 |
- |
112 |
-src_install(){ |
113 |
- cmake_src_install |
114 |
- einstalldocs |
115 |
- dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass" |
116 |
- dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp" |
117 |
-} |
118 |
|
119 |
diff --git a/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild |
120 |
index 85318fa2b..ea9fb3377 100644 |
121 |
--- a/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild |
122 |
+++ b/app-misc/far2l/far2l-2.3.20210426_alpha.ebuild |
123 |
@@ -3,7 +3,7 @@ |
124 |
|
125 |
EAPI=7 |
126 |
|
127 |
-PYTHON_COMPAT=( python3_{7..9} ) |
128 |
+PYTHON_COMPAT=( python3_{8..10} ) |
129 |
|
130 |
WX_GTK_VER="3.0-gtk3" |
131 |
|
132 |
@@ -46,6 +46,8 @@ RDEPEND="dev-libs/xerces-c |
133 |
app-arch/libarchive ) |
134 |
python? ( |
135 |
${PYTHON_DEPS} |
136 |
+ virtual/python-cffi |
137 |
+ dev-python/debugpy |
138 |
$(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') |
139 |
)" |
140 |
|
141 |
|
142 |
diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild |
143 |
index 85318fa2b..dd01ac84a 100644 |
144 |
--- a/app-misc/far2l/far2l-9999.ebuild |
145 |
+++ b/app-misc/far2l/far2l-9999.ebuild |
146 |
@@ -3,7 +3,7 @@ |
147 |
|
148 |
EAPI=7 |
149 |
|
150 |
-PYTHON_COMPAT=( python3_{7..9} ) |
151 |
+PYTHON_COMPAT=( python3_{8..10} ) |
152 |
|
153 |
WX_GTK_VER="3.0-gtk3" |
154 |
|
155 |
@@ -46,7 +46,8 @@ RDEPEND="dev-libs/xerces-c |
156 |
app-arch/libarchive ) |
157 |
python? ( |
158 |
${PYTHON_DEPS} |
159 |
- $(python_gen_any_dep 'dev-python/virtualenv[${PYTHON_USEDEP}]') |
160 |
+ virtual/python-cffi |
161 |
+ dev-python/debugpy |
162 |
)" |
163 |
|
164 |
DEPEND="${RDEPEND}" |