Gentoo Archives: gentoo-commits

From: Andrey Syutkin <syutkin@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/far2l/
Date: Thu, 22 Apr 2021 22:11:26
Message-Id: 1619129434.b4ad2d87cfb40746caa928be4639af8320032baa.syutkin@gentoo
1 commit: b4ad2d87cfb40746caa928be4639af8320032baa
2 Author: Andrey Syutkin <syutkin <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 22 22:10:34 2021 +0000
4 Commit: Andrey Syutkin <syutkin <AT> gmail <DOT> com>
5 CommitDate: Thu Apr 22 22:10:34 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b4ad2d87
7
8 app-misc/far2l: various changes and cleanups
9
10 Package-Manager: Portage-3.0.17, Repoman-3.0.2
11 Signed-off-by: Andrey Syutkin <syutkin <AT> gmail.com>
12
13 app-misc/far2l/far2l-2.3.20210419_alpha.ebuild | 41 +++++++++-----------------
14 app-misc/far2l/far2l-9999.ebuild | 41 +++++++++-----------------
15 app-misc/far2l/metadata.xml | 9 ++++++
16 3 files changed, 37 insertions(+), 54 deletions(-)
17
18 diff --git a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
19 index 46f3a6551..fd7b2a26c 100644
20 --- a/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
21 +++ b/app-misc/far2l/far2l-2.3.20210419_alpha.ebuild
22 @@ -5,13 +5,11 @@ EAPI=7
23
24 PYTHON_COMPAT=( python3_{7..9} )
25
26 -CMAKE_MAKEFILE_GENERATOR="emake"
27 -CMAKE_BUILD_TYPE="Release"
28 WX_GTK_VER="3.0-gtk3"
29
30 -inherit cmake xdg-utils wxwidgets python-r1
31 +inherit cmake xdg wxwidgets python-r1
32
33 -DESCRIPTION="Linux port of Far Manager"
34 +DESCRIPTION="Linux port of FAR Manager v2"
35 HOMEPAGE="https://github.com/elfmz/far2l"
36
37 if [[ "${PV}" == "9999" ]] ; then
38 @@ -29,21 +27,16 @@ fi
39
40 LICENSE="GPL-2"
41 SLOT="0"
42 -IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs"
43 +IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python"
44 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
45
46 -BDEPEND=">=dev-util/cmake-3.2.2
47 - sys-devel/m4"
48 +BDEPEND="sys-devel/m4"
49
50 -RDEPEND="sys-apps/gawk
51 - dev-libs/xerces-c
52 +RDEPEND="dev-libs/xerces-c
53 dev-libs/spdlog
54 app-i18n/uchardet
55 wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
56 - ssl? (
57 - !libressl? ( dev-libs/openssl )
58 - libressl? ( dev-libs/libressl )
59 - )
60 + ssl? ( dev-libs/openssl )
61 sftp? ( net-libs/libssh[sftp] )
62 samba? ( net-fs/samba )
63 nfs? ( net-fs/libnfs )
64 @@ -55,6 +48,8 @@ RDEPEND="sys-apps/gawk
65
66 DEPEND="${RDEPEND}"
67
68 +DOCS=( README.md )
69 +
70 pkg_setup() {
71 if use wxwidgets; then
72 setup-wxwidgets
73 @@ -62,11 +57,11 @@ pkg_setup() {
74 }
75
76 src_prepare() {
77 - sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt
78 - sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt
79 - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt
80 - 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
81 - 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
82 + sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt || die
83 + sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die
84 + 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
85 + 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
86 + 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
87 cmake_src_prepare
88 }
89
90 @@ -74,7 +69,7 @@ src_configure() {
91 local mycmakeargs=(
92 -DUSEWX="$(usex wxwidgets)"
93 -DPYTHON="$(usex python)"
94 - -DBUILD_SHARED_LIBS="$(usex static-libs "no" "yes")"
95 + -DBUILD_SHARED_LIBS=OFF
96 )
97
98 cmake_src_configure
99 @@ -86,11 +81,3 @@ src_install(){
100 dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass"
101 dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp"
102 }
103 -
104 -pkg_postinst() {
105 - xdg_icon_cache_update
106 -}
107 -
108 -pkg_postrm() {
109 - xdg_icon_cache_update
110 -}
111
112 diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild
113 index 46f3a6551..fd7b2a26c 100644
114 --- a/app-misc/far2l/far2l-9999.ebuild
115 +++ b/app-misc/far2l/far2l-9999.ebuild
116 @@ -5,13 +5,11 @@ EAPI=7
117
118 PYTHON_COMPAT=( python3_{7..9} )
119
120 -CMAKE_MAKEFILE_GENERATOR="emake"
121 -CMAKE_BUILD_TYPE="Release"
122 WX_GTK_VER="3.0-gtk3"
123
124 -inherit cmake xdg-utils wxwidgets python-r1
125 +inherit cmake xdg wxwidgets python-r1
126
127 -DESCRIPTION="Linux port of Far Manager"
128 +DESCRIPTION="Linux port of FAR Manager v2"
129 HOMEPAGE="https://github.com/elfmz/far2l"
130
131 if [[ "${PV}" == "9999" ]] ; then
132 @@ -29,21 +27,16 @@ fi
133
134 LICENSE="GPL-2"
135 SLOT="0"
136 -IUSE="+ssl libressl sftp samba nfs webdav +archive +wxwidgets python +static-libs"
137 +IUSE="+ssl sftp samba nfs webdav +archive +wxwidgets python"
138 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
139
140 -BDEPEND=">=dev-util/cmake-3.2.2
141 - sys-devel/m4"
142 +BDEPEND="sys-devel/m4"
143
144 -RDEPEND="sys-apps/gawk
145 - dev-libs/xerces-c
146 +RDEPEND="dev-libs/xerces-c
147 dev-libs/spdlog
148 app-i18n/uchardet
149 wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
150 - ssl? (
151 - !libressl? ( dev-libs/openssl )
152 - libressl? ( dev-libs/libressl )
153 - )
154 + ssl? ( dev-libs/openssl )
155 sftp? ( net-libs/libssh[sftp] )
156 samba? ( net-fs/samba )
157 nfs? ( net-fs/libnfs )
158 @@ -55,6 +48,8 @@ RDEPEND="sys-apps/gawk
159
160 DEPEND="${RDEPEND}"
161
162 +DOCS=( README.md )
163 +
164 pkg_setup() {
165 if use wxwidgets; then
166 setup-wxwidgets
167 @@ -62,11 +57,11 @@ pkg_setup() {
168 }
169
170 src_prepare() {
171 - sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt
172 - sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt
173 - sed -e "s:execute_process(COMMAND rm -f \${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb)::" -i "${S}"/CMakeLists.txt
174 - 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
175 - 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
176 + sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass)::" -i "${S}"/CMakeLists.txt || die
177 + sed -e "s:execute_process(COMMAND ln -sf \../../bin/far2l \${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp)::" -i "${S}"/CMakeLists.txt || die
178 + 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
179 + 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
180 + 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
181 cmake_src_prepare
182 }
183
184 @@ -74,7 +69,7 @@ src_configure() {
185 local mycmakeargs=(
186 -DUSEWX="$(usex wxwidgets)"
187 -DPYTHON="$(usex python)"
188 - -DBUILD_SHARED_LIBS="$(usex static-libs "no" "yes")"
189 + -DBUILD_SHARED_LIBS=OFF
190 )
191
192 cmake_src_configure
193 @@ -86,11 +81,3 @@ src_install(){
194 dosym "../../bin/far2l" "usr/lib/far2l/far2l_askpass"
195 dosym "../../bin/far2l" "usr/lib/far2l/far2l_sudoapp"
196 }
197 -
198 -pkg_postinst() {
199 - xdg_icon_cache_update
200 -}
201 -
202 -pkg_postrm() {
203 - xdg_icon_cache_update
204 -}
205
206 diff --git a/app-misc/far2l/metadata.xml b/app-misc/far2l/metadata.xml
207 index fd703baf5..0c6a1eb9f 100644
208 --- a/app-misc/far2l/metadata.xml
209 +++ b/app-misc/far2l/metadata.xml
210 @@ -1,12 +1,21 @@
211 <?xml version="1.0" encoding="UTF-8"?>
212 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
213 <pkgmetadata>
214 + <maintainer type="person">
215 + <email>syutkin@×××××.com</email>
216 + <name>Andrey Syutkin</name>
217 + </maintainer>
218 + <upstream>
219 + <remote-id type="github">elfmz/far2l</remote-id>
220 + </upstream>
221 <use>
222 <flag name="archive">Multiarc extended archives support</flag>
223 <flag name="nfs">NFS support in NetRocks</flag>
224 + <flag name="python">Python scripting support</flag>
225 <flag name="samba">SMB support in NetRocks</flag>
226 <flag name="sftp">SFTP support in NetRocks</flag>
227 <flag name="ssl">FTPS support in NetRocks</flag>
228 <flag name="webdav">WebDav support in NetRocks</flag>
229 + <flag name="wxwidgets">GUI backend support</flag>
230 </use>
231 </pkgmetadata>