diff --git a/app-misc/far2l/Manifest b/app-misc/far2l/Manifest index 7bffbb04e..ead90cca5 100644 --- a/app-misc/far2l/Manifest +++ b/app-misc/far2l/Manifest @@ -1,2 +1,2 @@ -DIST far2l-2.4.1.tar.gz 6322292 BLAKE2B eae7c0c6ae3671a5ee1978660a2ba6e5db0ea3f87c0f9d2a19e10d1b75c1f5a4dbc92bf95cf649a25ad05d78e7edddbfc8085db176fa3fefa38e56efdc1de435 SHA512 c837b22e7c2f1f58a86d38b845facbe821a71f29188260f728d2f961f6d2c1b42794dad3ef278a94c0bec89edf8a82416ef1ba6ee84e1cd64cb973e575610a7f DIST far2l-2.5.0.tar.gz 6431408 BLAKE2B bc9208f018b26c89038bdb9a1bef2de1bd398655b36023817d6ca498f705018abb462848fe988f7590d0141a66a5eb734e9c6c2d77db90dc3ba163bf1e3dde20 SHA512 0552b6946e771f9488b2c03c71507aea87d15f11b770c8b3adab3530fb830b408f1cc13245f6bde246ca95b6466866a5a7fcd132e03b06f6148c11f4e0182a1a +DIST far2l-2.5.1.tar.gz 6463768 BLAKE2B dc84cc7f37acb8e0c06589b6c0dc9914b589b22290d18f31db70318ec4668dbb663e865497659ded64618e9b81b4b07e35369a34775e0ec071b89b705718edfd SHA512 95ba3b39c5856de07bd06361b82cb89872a9102bc5a651a3003602cba76ec073f2705b3c610dd412ff076e419234aaea891e5243b48c191d0ee9be14cf1c2d52 diff --git a/app-misc/far2l/far2l-2.5.0.ebuild b/app-misc/far2l/far2l-2.5.0.ebuild index c0efdc2d1..d9bdfb67f 100644 --- a/app-misc/far2l/far2l-2.5.0.ebuild +++ b/app-misc/far2l/far2l-2.5.0.ebuild @@ -6,7 +6,7 @@ EAPI=8 #CMAKE_MAKEFILE_GENERATOR ?= ninja CMAKE_MAKEFILE_GENERATOR=emake CMAKE_IN_SOURCE_BUILD=1 -CMAKE_VERBOSE=ON +#CMAKE_VERBOSE=ON CMAKE_BUILD_TYPE=Release inherit cmake @@ -34,8 +34,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -#PATCHES=( "${FILESDIR}/cmakelist.patch" ) - S="${WORKDIR}/${PN}-v_${PV}" src_configure() { diff --git a/app-misc/far2l/far2l-2.4.1.ebuild b/app-misc/far2l/far2l-2.5.1.ebuild similarity index 83% rename from app-misc/far2l/far2l-2.4.1.ebuild rename to app-misc/far2l/far2l-2.5.1.ebuild index d3290d87d..1058d1436 100644 --- a/app-misc/far2l/far2l-2.4.1.ebuild +++ b/app-misc/far2l/far2l-2.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 #CMAKE_MAKEFILE_GENERATOR ?= ninja CMAKE_MAKEFILE_GENERATOR=emake CMAKE_IN_SOURCE_BUILD=1 -CMAKE_VERBOSE=ON +#CMAKE_VERBOSE=ON CMAKE_BUILD_TYPE=Release inherit cmake @@ -34,8 +34,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/cmakelist.patch" ) - S="${WORKDIR}/${PN}-v_${PV}" src_configure() { @@ -56,8 +54,9 @@ src_configure() { src_install() { emake DESTDIR="${D}" install - dosym "${EPREFIX}"/usr/bin/far2l /usr/lib/far2l/far2l_askpass - dosym "${EPREFIX}"/usr/bin/far2l /usr/lib/far2l/far2l_sudoapp +# FIXME: CMakeLists.txt might not support prefix (/usr/) properly +# dosym "${EPREFIX}"/usr/bin/far2l /usr/lib/far2l/far2l_askpass +# dosym "${EPREFIX}"/usr/bin/far2l /usr/lib/far2l/far2l_sudoapp newbin - far <<-EOF #!/bin/sh diff --git a/app-misc/far2l/files/cmakelist.patch b/app-misc/far2l/files/cmakelist.patch deleted file mode 100644 index 0a0408cb1..000000000 --- a/app-misc/far2l/files/cmakelist.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt.orig 2022-09-26 02:39:25.000000000 +0800 -+++ b/CMakeLists.txt 2022-11-18 00:44:34.271140903 +0800 -@@ -499,10 +499,3 @@ - PATTERN "*.broker" EXCLUDE - PATTERN "python/plug/python" EXCLUDE - PATTERN "*") -- --# setup some symlinks and remove deprecated stuff from previous installation --install(CODE " -- execute_process(COMMAND ln -sf ../../bin/far2l ${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_askpass) -- execute_process(COMMAND ln -sf ../../bin/far2l ${CMAKE_INSTALL_PREFIX}/lib/far2l/far2l_sudoapp) -- execute_process(COMMAND rm -f ${CMAKE_INSTALL_PREFIX}/lib/far2l/Plugins/objinfo/plug/objinfo.far-plug-mb) -- " COMPONENT system)