[gentoo-commits] repo/proj/guru:master commit in: app-misc/far2l/

[Florian Schmaus]

commit:     b54dac390a3d0fb904b61643be35cf2c7694ce7f
Author:     Andrey Syutkin <syutkin <AT> gmail <DOT> com>
AuthorDate: Sat Dec 25 17:57:46 2021 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 17:57:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b54dac39

app-misc/far2l: version bump to 2.3.2_alpha

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrey Syutkin <syutkin <AT> gmail.com>

 app-misc/far2l/Manifest                            |  3 +-
 app-misc/far2l/far2l-2.3.20211204_alpha.ebuild     | 91 ----------------------
 ...10921_alpha.ebuild => far2l-2.3.2_alpha.ebuild} |  5 +-
 app-misc/far2l/far2l-9999.ebuild                   |  5 +-
 4 files changed, 7 insertions(+), 97 deletions(-)

diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest
index eb3e5ec71..7c65762de 100644
--- a/app-misc/far2l/Manifest
+++ b/app-misc/far2l/Manifest
@@ -1,2 +1 @@
-DIST far2l-2.3.20210921_alpha.tar.gz 5427544 BLAKE2B b206df5c148dfa937610cfcd38fcec93790a02a4f011b0c7573cf0bf2b2229196097e7cebbd7e163778c2e86a26d22c3dc7d7c32e8562fd540b1106da5210725 SHA512 7c17192464f2f6bebb72928f8f2159eb940afa6d549213716ffccb8dd858ce982ff57538377f90a5f1200e3e9b0c36f2cdf7f1e48a3d53f29458757b1c974260
-DIST far2l-2.3.20211204_alpha.tar.gz 5471538 BLAKE2B 3bfc3ce631132e162f513e4341c8ff55e08dc2a6fa20dba07b77366d0113004601fa718f51d58769599fee1c98d01f059669f7cba567d574b31f680cd765465b SHA512 69e2eb2148566e0f159e9577e00eb938c7f5a43ad8f04b99d9ceeeedc3abd20d36c5cd81bcff06f8d7f465201224d30ceede955199643426d4f6840d23b5c9e0
+DIST v_2.3.2.tar.gz 6232935 BLAKE2B ea146088c518bfeb0d935313a07f00a37fd2b6998388060514d144494946565661d3554e8ffb63b4bed8b9f1c3cea2ba4ec4c0787b0fa89df7f8d39720606b03 SHA512 e610a2b92ab3e7896f3aa5a59872cf273ab1c60ff6aac8e71d1d7152c2e8cb36fb8552167e13c8a4bcec9138052a3397c202cfa4b57cddf2053508421eb66799

diff --git a/app-misc/far2l/far2l-2.3.20211204_alpha.ebuild b/app-misc/far2l/far2l-2.3.20211204_alpha.ebuild
deleted file mode 100644
index f23f32656..000000000
--- a/app-misc/far2l/far2l-2.3.20211204_alpha.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..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="${PV:4:4}-${PV:8:2}-${PV:10:8}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.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} )"
-
-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.3.20210921_alpha.ebuild b/app-misc/far2l/far2l-2.3.2_alpha.ebuild
similarity index 95%
rename from app-misc/far2l/far2l-2.3.20210921_alpha.ebuild
rename to app-misc/far2l/far2l-2.3.2_alpha.ebuild
index f23f32656..10f77e4c5 100644
--- a/app-misc/far2l/far2l-2.3.20210921_alpha.ebuild
+++ b/app-misc/far2l/far2l-2.3.2_alpha.ebuild
@@ -18,10 +18,10 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/elfmz/far2l"
 	EGIT_BRANCH="master"
 else
-	MY_PV="${PV:4:4}-${PV:8:2}-${PV:10:8}"
+	MY_PV="v_${PV/_alpha/}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/elfmz/far2l/archive/${MY_PV}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -29,6 +29,7 @@ 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"
 

diff --git a/app-misc/far2l/far2l-9999.ebuild b/app-misc/far2l/far2l-9999.ebuild
index f23f32656..10f77e4c5 100644
--- a/app-misc/far2l/far2l-9999.ebuild
+++ b/app-misc/far2l/far2l-9999.ebuild
@@ -18,10 +18,10 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/elfmz/far2l"
 	EGIT_BRANCH="master"
 else
-	MY_PV="${PV:4:4}-${PV:8:2}-${PV:10:8}"
+	MY_PV="v_${PV/_alpha/}"
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/elfmz/far2l/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/elfmz/far2l/archive/${MY_PV}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -29,6 +29,7 @@ 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"