From b23261c2dc1e48a168109493e682ac6d5db8b093 Mon Sep 17 00:00:00 2001 From: gryf Date: Mon, 31 Mar 2025 14:44:13 +0200 Subject: [PATCH] MC version bump --- app-misc/mc/Manifest | 5 ++- app-misc/mc/files/mc-4.8.30-musl-tests.patch | 15 --------- ...4.8.32-r10.ebuild => mc-4.8.33-r10.ebuild} | 31 +++++-------------- 3 files changed, 9 insertions(+), 42 deletions(-) delete mode 100644 app-misc/mc/files/mc-4.8.30-musl-tests.patch rename app-misc/mc/{mc-4.8.32-r10.ebuild => mc-4.8.33-r10.ebuild} (83%) diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 319adf2..afa3e15 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,7 +1,6 @@ AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406 AUX mc-4.8.29-gentoo-tools.patch 413 BLAKE2B 53e3f8e5e711374bbc5e3bb868df5e3345eed8f8de4ec3cac486b63c210bb10e6832b60292c614b4bd5c65ae750c5b2c38430ac1da2c9f6febb2b686199463ff SHA512 38598f57f4905659bc5d69f4ae19510ce35e76c8e33fc5262c5c8d17742483ebd5aa61ddac29a5811e111fe8ca66e6418fa4d48567e3a4e7ec4406916834c6fa -AUX mc-4.8.30-musl-tests.patch 300 BLAKE2B 52dff36517ccd7643cf594e556b0f315081ed39d01735f6da351bdf3dadc70ce1b14e8320b5edb08a8ae1a2db533f1bea60ef6bb1c37bc24a80a0c671384349d SHA512 73b32f64c5976a1b4518d2cdb8c802d9a93c71aab3781c6edfc731d7088ac67e3a09687bc1cce8a3597117b333e13ba96c50c4b26a21f5ad4c81aa76f03cfb41 -DIST mc-4.8.32.tar.xz 2385648 BLAKE2B eb2ac2474c86dbcfe43b4f229cdc458bdfc9de2acf1d0206198721b56ec188010aba24063c1fc079ada295c73ab915786749be1ead599a582832ca649b9a8347 SHA512 f7f46e4f065331ede638a79c821ab5ef65952ba99cf71710d4282efa9ed7de75f06c786a8f8feb27d487417f438a48959439b40bb6456eb64796d46518a3f4a8 +DIST mc-4.8.33.tar.xz 2424476 BLAKE2B abfe493006930e7de7f7242308309382cf28c6b7f41967cf151e6507b081149322217f5a10a8e2c98c2bc39b8053a4e51443c956ec93e7850a00f8d19e7c1266 SHA512 3eb857af2fa689e9458aeef6d3b236fb92684e05c0e3e78e7e5a5fa5dba6431cae39bec51bc84598b0bb60579cb0a0679dcdc6e9f7d88ca85dc37ace251c8632 DIST uc1541 20829 BLAKE2B c94bd39cc6d9ffe2b4f8c2ae45b864609776538f75e30c38c1ccd7c34ca348c8898b2d2e1924a1cd2c4c942e448165e365a43a7467c83053ef85b9ee34922c0e SHA512 d043293031cc0e71f36c6948e645e222f01408eafb728cd89c526afb114a13493ea551144d6c8e0572f23119659572b1e9cace73f9d536c722324c1626dbab7d DIST ulha 5392 BLAKE2B def48a21baa3a977bb2c417de7ab2d5882485bef66a31308a445bbf64adfe901414294b713d77a5db318391ce10b40fd9e82eb47e0749d0a853cc40197cd1e17 SHA512 b679ace38da80e887f1ca3d424db2174472b6aa31eda963181c578b57f9fa89219c93e515ef3b74547519d90840604c7a91a95b7bfc34cbae5c17d700ff88ed5 -EBUILD mc-4.8.32-r10.ebuild 3694 BLAKE2B db1429fe8734f19f78461500ab7cfb0f20250daf75e6386eee59f9009eeb9a13e9dc0b303ffb32f4e467cd7abf8df9cf3d053e9df9278ed25ad5e41296b4d725 SHA512 7e8fac780ffaf6a141076ff50c29fe13e9b0d86fbe80011815a3c537cfa28e9ed2a1e6ee9ca61c8e49f39a0c10c0ce0c09f8621f08f2379564ad8b423b0fa403 +EBUILD mc-4.8.33-r10.ebuild 3444 BLAKE2B ea7a73dc7ec8c871b171d67ce8b47de1ec818d63e5d56ca664ecdea9ab59108fdaa3fb65e6fb37642d16532411230b41ba530ce3ed5ce46e58ec027bfef2c135 SHA512 b6e6205f2ad402dd66b3ee8b1a7e70f5c1073e0268f441603920a9bce3f6d975e1a94af91505040e721d0022fa5eb4489b2912e3a2b713a6d422de180eb4eeda diff --git a/app-misc/mc/files/mc-4.8.30-musl-tests.patch b/app-misc/mc/files/mc-4.8.30-musl-tests.patch deleted file mode 100644 index 0e8ea32..0000000 --- a/app-misc/mc/files/mc-4.8.30-musl-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/tests/lib/vfs/path_len.c -+++ b/tests/lib/vfs/path_len.c -@@ -89,12 +89,6 @@ - "/тестовый/путь", - 26 - }, --#ifdef HAVE_CHARSET -- { /* 3. */ -- "/#enc:KOI8-R/тестовый/путь", -- 38 -- }, --#endif /* HAVE_CHARSET */ - }; - /* *INDENT-ON* */ - diff --git a/app-misc/mc/mc-4.8.32-r10.ebuild b/app-misc/mc/mc-4.8.33-r10.ebuild similarity index 83% rename from app-misc/mc/mc-4.8.32-r10.ebuild rename to app-misc/mc/mc-4.8.33-r10.ebuild index 92f96c8..caad8fa 100644 --- a/app-misc/mc/mc-4.8.32-r10.ebuild +++ b/app-misc/mc/mc-4.8.33-r10.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools flag-o-matic +inherit flag-o-matic MY_P="${P/_/-}" DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="https://midnight-commander.org" +HOMEPAGE="https://midnight-commander.org https://github.com/MidnightCommander/mc" SRC_URI=" - http://ftp.midnight-commander.org/${MY_P}.tar.xz + https://ftp.osuosl.org/pub/midnightcommander/${MY_P}.tar.xz https://raw.githubusercontent.com/gryf/uc1541/master/uc1541 https://raw.githubusercontent.com/gryf/mc_ulha/master/ulha " @@ -68,18 +68,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( statvfs64 ) -src_prepare() { - default - - # Bug #906194, #922483 - if use elibc_musl; then - eapply "${FILESDIR}"/${PN}-4.8.30-musl-tests.patch - eapply "${FILESDIR}"/${PN}-4.8.31-musl-tests.patch - fi - - eautoreconf -} - src_configure() { [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" @@ -105,23 +93,18 @@ src_configure() { } src_test() { - # Bug #759466 + # Bug #759466 - tracked upstream at https://github.com/MidnightCommander/mc/issues/4643 if [[ ${EUID} == 0 ]] ; then ewarn "You are emerging ${PN} as root with 'userpriv' disabled." ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!" fi - # CK_FORK=no to avoid using fork() in check library - # as mc mocks fork() itself: bug #644462. - # - # VERBOSE=1 to make test failures contain detailed - # information. - CK_FORK=no emake check VERBOSE=1 + emake check VERBOSE=1 } src_install() { emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README + dodoc AUTHORS doc/{NEWS,README,TODO,FAQ} # fix bug #334383 if use kernel_linux && [[ ${EUID} == 0 ]] ; then