Merge branch 'pentoo:master' into master

This commit is contained in:
Volker Wegert 2022-11-17 20:35:44 +01:00 committed by GitHub
commit 6ba9caa25e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 84 additions and 8 deletions

1
app-misc/far2l/Manifest Normal file
View file

@ -0,0 +1 @@
DIST far2l-2.4.1.tar.gz 6322292 BLAKE2B eae7c0c6ae3671a5ee1978660a2ba6e5db0ea3f87c0f9d2a19e10d1b75c1f5a4dbc92bf95cf649a25ad05d78e7edddbfc8085db176fa3fefa38e56efdc1de435 SHA512 c837b22e7c2f1f58a86d38b845facbe821a71f29188260f728d2f961f6d2c1b42794dad3ef278a94c0bec89edf8a82416ef1ba6ee84e1cd64cb973e575610a7f

View file

@ -0,0 +1,62 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
#CMAKE_MAKEFILE_GENERATOR ?= ninja
CMAKE_MAKEFILE_GENERATOR=emake
CMAKE_IN_SOURCE_BUILD=1
CMAKE_VERBOSE=ON
CMAKE_BUILD_TYPE=Release
inherit cmake
DESCRIPTION="Linux port of FAR v2"
HOMEPAGE="https://github.com/elfmz/far2l/"
SRC_URI="https://github.com/elfmz/far2l/archive/refs/tags/v_${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 ~arm64 x86"
LICENSE="GPL-2"
SLOT="0"
IUSE="+uchardet X +ssh nfs +samba webdav"
DEPEND="
dev-libs/xerces-c
uchardet? ( app-i18n/uchardet )
dev-util/cmake
dev-libs/spdlog
X? ( x11-libs/wxGTK )
webdav? ( net-libs/neon )
ssh? ( net-libs/libssh )
nfs? ( net-fs/libnfs )
samba? ( net-fs/samba )
"
RDEPEND="${DEPEND}"
#BDEPEND=""
PATCHES=( "${FILESDIR}/cmakelist.patch" )
S="${WORKDIR}/${PN}-v_${PV}"
src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=OFF
-DUSEWX=$(usex X yes no)
# automatic charset detection
-DUSEUCD=$(usex uchardet yes no)
)
# -DPYTHON=yes
#ALIGN AUTOWRAP CALC COLORER COMPARE DRAWLINE EDITCASE EDITORCOMP FARFTP FILECASE INCSRCH INSIDE MULTIARC NETROCKS SIMPLEINDENT TMPPANEL
cmake_src_configure
}
#src_install() {
# emake DESTDIR="${D}" install
# FIXME: fix cmakefile, see https://github.com/elfmz/far2l/issues/819
#<------>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)
#}

View file

@ -0,0 +1,13 @@
--- 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)

View file

@ -4,9 +4,9 @@ DIST genpatches-5.15-68.extras.tar.xz 3932 BLAKE2B 34fd77b8464322ad369de5b86dd8d
DIST genpatches-5.19-15.base.tar.xz 854856 BLAKE2B ef0a5d23b6020125e9ab82d5456c3638955943e7299db30e5891abbb6ac62fdf2593b9c3884ceef77b4df9457bbedba2971620603c8f05acb66872d758e99cac SHA512 0420721992c23da7792ffc4e2740432275efa0ef0efe5ca6ffd43c1afa7aab87823f565df9130dd739567e58bd69ab0c1933a7a9270d1ba0df6e596b3ba75c82
DIST genpatches-5.19-15.experimental.tar.xz 73236 BLAKE2B 1e24cf60a7c938e9869bd9dbc87fe7c8916789ed861267a9ee076d7e977916aab449e776c1d16922907dba30da68b8adda1954c3e4cc70d9665e4c1daf3d0119 SHA512 a6cd044f58069933cfa2bec9c68a9043d5ce7f9fe00c5ae7d8d488adecf88ebae52aa79fe713a66eacb86f1980ffe2c8c5b2193f03694bf925f40a5b06750577
DIST genpatches-5.19-15.extras.tar.xz 3804 BLAKE2B 4261193221cee786c6b8ab7a39111834d635a90caffd1c06989caa17d26bc07f1d146b61a323f200f2d9b9e2bac9db435a5a2da97342a069c6e3968fcfe08a37 SHA512 67fab772d739942d23191e11b939b2e6d0f86accb7925cddd6c8b6f485f33a20efe4a768a520c0e396272ce157ee64483a9c78f9ccbdfb08525b941ece827f33
DIST genpatches-6.0-6.base.tar.xz 307564 BLAKE2B 14e3d451ae6f21219ed86f8fea2cd8c4888e8b8d23e43d6d855ccb3e07346348aa267e0e20e65c0cb782c3fbb0adc98e3e6728dc83d58bb8dbbed656b3273076 SHA512 1ed76b47ee510074787be882b999dc60c108e1411f4704c9104936f808b12bb97700883f2eed9e41d6da6a0cb5fd00cdd47f267cff1c34173bed49e1379a8786
DIST genpatches-6.0-6.experimental.tar.xz 5404 BLAKE2B 9b39e4ad8cf965515a75b2b767be64c63985a64f599b4b7dc20644fb95d3a42be5a62bbcef9a3b1bc440625197acf43c4922b711639cac5e87b1694e2341547d SHA512 f893b8bbc614a9221ce989d573b4f86de5f383a3b962db70ab79dd925038b6972635fad1958dff7659552064a585b4ccaf2ba9c79e5794665e25960dd003d14e
DIST genpatches-6.0-6.extras.tar.xz 3804 BLAKE2B df263043bb2e5608eba21f3e3512628029043bbab7dc43c1190e341f66d74d7adabe224a7d726aaa23c7fb9290544419b10704e6697a45c39d1932acdc75627c SHA512 243a9810ff21706c2624a796f61690235c37faaa0b748a0c3e80bf4f7e3f6ed2285201a1f6510e03f3244adcbb3c58ecd90e6f0eed09fe06f469725792554be0
DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61 SHA512 6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
DIST genpatches-6.0-9.experimental.tar.xz 5404 BLAKE2B ea673454aa153f96a00be9327e073f92230c977f5439aac53d387859e219a07266f3de8c9db33af2d3062bc79fe95df80585c64fc9815e588eee232aa919c7f9 SHA512 f8f25b94d0d71702f292d5abcb88cc2809efc035f7396003c52ef6687e5b4c628034d552bb89e57ffa3b25cada440c153db07f27162c1ddfe9adcc7e97c5b98d
DIST genpatches-6.0-9.extras.tar.xz 3808 BLAKE2B cf37233fbfc631e8ec9d7c663e8982a3bfb154573fa84d13cbb3d67fa73ff38ce74b27bf6dbf827b311826d18c628ef2818a75975e068ce381bc1a46c4948075 SHA512 b4f5d0daae3120662fb79e9f53b7dfd0c15f0a2b7c77a32b7440cc7425b3df87107aabb2cd913a31b7014c9fd1c3c85ab2081839af652ae9d7e43352dcdda42f
DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.0.6-pentoo Kernel Configuration
# Linux/x86 6.0.9-pentoo Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 11.3.0 p4) 11.3.0"
CONFIG_CC_IS_GCC=y

View file

@ -1 +1 @@
config-amd64-6.0.6
config-amd64-6.0.9

View file

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/x86 6.0.6-pentoo Kernel Configuration
# Linux/x86 6.0.9-pentoo Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 11.3.0 p4) 11.3.0"
CONFIG_CC_IS_GCC=y

View file

@ -1 +1 @@
config-x86-6.0.6
config-x86-6.0.9

View file

@ -4,7 +4,7 @@
EAPI="8"
ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
K_GENPATCHES_VER="6"
K_GENPATCHES_VER="9"
inherit kernel-2
detect_version