From d56038fd69602a2689c3273c4fada2f27a053fcf Mon Sep 17 00:00:00 2001 From: gryf Date: Sun, 15 Sep 2024 07:26:06 +0200 Subject: [PATCH] Remove old versions of mc --- app-misc/mc/Manifest | 6 - app-misc/mc/files/mc-4.8.28-tests.patch | 35 ----- .../mc/files/mc-4.8.29-autoconf-c99.patch | 24 ---- app-misc/mc/mc-4.8.28-r10.ebuild | 133 ------------------ app-misc/mc/mc-4.8.29-r10.ebuild | 128 ----------------- 5 files changed, 326 deletions(-) delete mode 100644 app-misc/mc/files/mc-4.8.28-tests.patch delete mode 100644 app-misc/mc/files/mc-4.8.29-autoconf-c99.patch delete mode 100644 app-misc/mc/mc-4.8.28-r10.ebuild delete mode 100644 app-misc/mc/mc-4.8.29-r10.ebuild diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index a841949..0d01cfa 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,14 +1,8 @@ AUX mc-4.8.26-ncurses-mouse.patch 612 BLAKE2B ba3324dfee320a6c08c65ec8bf7784075f8a36c111ffa75129251674152cea68cde87844d5849c82111d4fad779c1d13992a7d765c4bc48b39d865ab1f89cbb6 SHA512 f97025ad7b3719b372368028ad9428e0cac67069d04e70b2e2923dd998a9f687f0807254bdc859218869e1666db80807fd53c19291e2921b420bc357e79d9406 -AUX mc-4.8.28-tests.patch 1308 BLAKE2B 37f2d2a3264386d558212741d95c68c9362676d727d4d2b47a690dd6ad97c15ff943b3950cc28456ffceda78e88645bd6f73958a592f425594e727cc383721cf SHA512 41499d5ee4a7d0bf3e08c6fad56c2d46e3761f4f7359db1351c4ca1358a9ba33be7979df55d19263214acb3ea01271278efccff72d32ea3cf8a3cfb84a964f47 -AUX mc-4.8.29-autoconf-c99.patch 849 BLAKE2B 7d9eb9b7f046dac592dee09e3598620c61167365aefb41186f4d60b803f17cf151280b9bf5facef7101f5297d9faa3b269c9b759095ad6bd01f79b4a8ee38211 SHA512 983de54aa05b09c9510945f4c3b83231779ee24808ec2cbbb2ce0e2b5743bb120d85edf0e9bd0d78e5aafb42601272997c2bcef9fb606de9e043d9619eba4485 AUX mc-4.8.29-gentoo-tools.patch 413 BLAKE2B 53e3f8e5e711374bbc5e3bb868df5e3345eed8f8de4ec3cac486b63c210bb10e6832b60292c614b4bd5c65ae750c5b2c38430ac1da2c9f6febb2b686199463ff SHA512 38598f57f4905659bc5d69f4ae19510ce35e76c8e33fc5262c5c8d17742483ebd5aa61ddac29a5811e111fe8ca66e6418fa4d48567e3a4e7ec4406916834c6fa AUX mc-4.8.30-mcdiff-segfault.patch 1534 BLAKE2B ff3904f22a3f46251833f259255abd15015d47fed685447fb7f42b4d8adc042adb3104b4e41c2bedc0552335e681ca5df7404cd9cd0e4066a8a84714faa718c2 SHA512 41aa773416a3bd2f035ed584b6179f237b216010bd541b1a881f95f25eb5d05abbe721af2ae3c64dc39916525ff284cf0c5bf2ddde89e4bcf3647f7c5cad4e2d AUX mc-4.8.30-musl-tests.patch 300 BLAKE2B 52dff36517ccd7643cf594e556b0f315081ed39d01735f6da351bdf3dadc70ce1b14e8320b5edb08a8ae1a2db533f1bea60ef6bb1c37bc24a80a0c671384349d SHA512 73b32f64c5976a1b4518d2cdb8c802d9a93c71aab3781c6edfc731d7088ac67e3a09687bc1cce8a3597117b333e13ba96c50c4b26a21f5ad4c81aa76f03cfb41 -DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd -DIST mc-4.8.29.tar.xz 2368164 BLAKE2B 0ecddf33b4b7b32918484bc7efe15ef1c9dda094814c85ceabf1b4bd9343507a33932b8cd050fdae2e683f9815ab6dd802ff8eb8e2215c6264be073bc5ac7e4d SHA512 c7e219eda34197d0294748cf5fd1a5dcfedfc17c20cfcf94c4dad5170f87095845f4fc0065e2868342125039c13cc3ba617804df74186816828e93ed71c1e9a3 DIST mc-4.8.30.tar.xz 2380824 BLAKE2B 2bf759314abae39db7596426cba22f6eaac0efc58e7025f1a7ef1863496ea7a3c00d298d101123b9defb109e76e31fe988227fb5c1112e06051b3c7a5b3dc1b6 SHA512 f793f744eaff236c9952d477236dd775a24d9ddd7ff46940bfe2d06da5596bed91d6bd9c85250696da6dcdc0a1890dc01c736654df3f59039674eff38e12e68e DIST uc1541 20829 BLAKE2B c94bd39cc6d9ffe2b4f8c2ae45b864609776538f75e30c38c1ccd7c34ca348c8898b2d2e1924a1cd2c4c942e448165e365a43a7467c83053ef85b9ee34922c0e SHA512 d043293031cc0e71f36c6948e645e222f01408eafb728cd89c526afb114a13493ea551144d6c8e0572f23119659572b1e9cace73f9d536c722324c1626dbab7d DIST ulha 5392 BLAKE2B def48a21baa3a977bb2c417de7ab2d5882485bef66a31308a445bbf64adfe901414294b713d77a5db318391ce10b40fd9e82eb47e0749d0a853cc40197cd1e17 SHA512 b679ace38da80e887f1ca3d424db2174472b6aa31eda963181c578b57f9fa89219c93e515ef3b74547519d90840604c7a91a95b7bfc34cbae5c17d700ff88ed5 -EBUILD mc-4.8.28-r10.ebuild 3511 BLAKE2B 94f4ca7ac151d445700cdd40939b51d083f236565362c5358d9e262d44d326260eada5470e501491d1b75bf59555584cfdf143aed22fdaf71858e6d5676a2b53 SHA512 de180744ef6a6afb4a9c1d38d5c7702903456bc9126a43790371bed6cecc703ea4444705dfe68ae1cde651065769bb8370f9771a3b9b3c37984b8f588126b133 -EBUILD mc-4.8.29-r10.ebuild 3418 BLAKE2B 63a4ddaf5cfcd3443a72e519d75c52e4557374289c571971d6da2e2b9b1a74262b6125260717bfd3cd762daabde9f35d902d4d34c6b7af5c7654b518238e5ed6 SHA512 082ec71d5207692ce3fac652ee2270e9dc3b8d29293c8618dfe0d6e612fa7847bfad3676d882b78db5c2a47ae942c94cecec52b577d9168442d65ba875c754ba EBUILD mc-4.8.30-r10.ebuild 3464 BLAKE2B bf497f1d7d742c0f3238bcf0da18ee2ee056c1f5d3884ddd342d3fa5e8e774eb9258787a079331c11e56255ecd2a587d08fcabe5731dcef9b23c0a608f136b79 SHA512 80720a72c7d7765a828263242a6cf3b6ef0948a85c024dbaad5623cf0e93eaf8139c99b5b3511f4c6c585bc47be28fca4b3f3680404f46fe4f9f11a3be62b246 diff --git a/app-misc/mc/files/mc-4.8.28-tests.patch b/app-misc/mc/files/mc-4.8.28-tests.patch deleted file mode 100644 index ccd9dc1..0000000 --- a/app-misc/mc/files/mc-4.8.28-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -START_TEST uses the variable name _i, so GCC complains about redefining it with -a different type here. - ---- mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-20 10:02:47.000000000 +0000 -+++ mc-4.8.28/tests/lib/strutil/filevercmp.c 2022-03-27 15:31:19.812120141 +0100 -@@ -353,20 +353,20 @@ - START_TEST (filevercmp_test5) - /* *INDENT-ON* */ - { -- size_t _i; -+ size_t ii; - -- for (_i = 0; _i < filevercmp_test_ds5_len; _i++) -- for (; filevercmp_test_ds5[_i] != NULL; _i++) -+ for (ii = 0; ii < filevercmp_test_ds5_len; ii++) -+ for (; filevercmp_test_ds5[ii] != NULL; ii++) - { -- const char *i = filevercmp_test_ds5[_i]; -- size_t _j; -+ const char *i = filevercmp_test_ds5[ii]; -+ size_t jj; - -- for (_j = _i; filevercmp_test_ds5[_j] != NULL; _j++) -+ for (jj = ii; filevercmp_test_ds5[jj] != NULL; jj++) - { -- const char *j = filevercmp_test_ds5[_j]; -+ const char *j = filevercmp_test_ds5[jj]; - -- ck_assert_int_eq (test_filevercmp (i, j), 0); -- ck_assert_int_eq (test_filevercmp (j, i), 0); -+ ck_assert_int_eq (test_filevercmp (i, j), 0); -+ ck_assert_int_eq (test_filevercmp (j, i), 0); - } - } - } diff --git a/app-misc/mc/files/mc-4.8.29-autoconf-c99.patch b/app-misc/mc/files/mc-4.8.29-autoconf-c99.patch deleted file mode 100644 index f1577dd..0000000 --- a/app-misc/mc/files/mc-4.8.29-autoconf-c99.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a2dbad461b8a63630f9ad7cfa36b6613e85a91cb Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Sun, 5 Feb 2023 18:38:37 +0100 -Subject: [PATCH] autoconf: Fix C99 compatibility issue in mc_GET_FS_INFO check -Content-type: text/plain - -Include for the declaration of posix_fallocate. This -avoids an implicit function declaration and build issues with future -compilers. - -Signed-off-by: Florian Weimer ---- a/m4.include/mc-get-fs-info.m4 -+++ b/m4.include/mc-get-fs-info.m4 -@@ -8,6 +8,7 @@ AC_DEFUN([gl_POSIX_FALLOCATE], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #define _XOPEN_SOURCE 600 - #include -+ #include - #if defined(__GLIBC__) && (__GLIBC__ < 2 || __GLIBC_MINOR__ < 7) - possibly broken posix_fallocate - #endif --- -2.39.1 - diff --git a/app-misc/mc/mc-4.8.28-r10.ebuild b/app-misc/mc/mc-4.8.28-r10.ebuild deleted file mode 100644 index 45288de..0000000 --- a/app-misc/mc/mc-4.8.28-r10.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -MY_P="${P/_/-}" -SRC_URI=" - http://ftp.midnight-commander.org/${MY_P}.tar.xz - https://raw.githubusercontent.com/gryf/uc1541/master/uc1541 - https://raw.githubusercontent.com/gryf/mc_ulha/master/ulha -" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="https://midnight-commander.org" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+edit gpm nls sftp +slang spell test unicode X" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=" - dev-python/extfslib - >=dev-libs/glib-2.30.0:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs[tools(+)] ) - sftp? ( net-libs/libssh2 ) - slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:=[unicode(+)?] ) - spell? ( app-text/aspell ) - X? ( - x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-libs/check ) -" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch - "${FILESDIR}"/${P}-tests.patch #836812 -) - -pkg_pretend() { - if use slang && use unicode ; then - ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." - fi -} - -src_prepare() { - default - # patch touches configure.ac - eautoreconf -} - -src_configure() { - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local myeconfargs=( - --enable-charset - --enable-vfs - --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") - $(use_enable kernel_linux vfs-undelfs) - # Today mclib does not expose any headers and is linked to - # single 'mc' binary. Thus there is no advantage of having - # a library. Let's avoid shared library altogether - # as it also conflicts with sci-libs/mc: bug #685938 - --disable-mclib - $(use_enable nls) - $(use_enable sftp vfs-sftp) - $(use_enable spell aspell) - $(use_enable test tests) - $(use_with gpm gpm-mouse) - $(use_with X x) - $(use_with edit internal-edit) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # Bug #759466 - 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 -} -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README - - # fix bug #334383 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then - fowners root:tty /usr/libexec/mc/cons.saver - fperms g+s /usr/libexec/mc/cons.saver - fi - exeinto "/usr/libexec/mc/extfs.d/" - doexe "${DISTDIR}/ulha" - doexe "${DISTDIR}/uc1541" -} - -pkg_postinst() { - if use spell && ! has_version app-dicts/aspell-en ; then - elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed." - elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini" - elog "It has to be set to one of your installed aspell dictionaries or 'NONE'" - elog - fi - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -} diff --git a/app-misc/mc/mc-4.8.29-r10.ebuild b/app-misc/mc/mc-4.8.29-r10.ebuild deleted file mode 100644 index 3140952..0000000 --- a/app-misc/mc/mc-4.8.29-r10.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic - -MY_P="${P/_/-}" -SRC_URI=" - http://ftp.midnight-commander.org/${MY_P}.tar.xz - https://raw.githubusercontent.com/gryf/uc1541/master/uc1541 - https://raw.githubusercontent.com/gryf/mc_ulha/master/ulha -" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="https://midnight-commander.org" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+edit gpm nls sftp +slang spell test unicode X" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=" - dev-python/extfslib - >=dev-libs/glib-2.30.0:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs[tools(+)] ) - sftp? ( net-libs/libssh2 ) - slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:=[unicode(+)?] ) - spell? ( app-text/aspell ) - X? ( - x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-libs/check ) -" - -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.26-ncurses-mouse.patch - "${FILESDIR}"/${PN}-4.8.29-gentoo-tools.patch - "${FILESDIR}"/${PN}-4.8.29-autoconf-c99.patch -) - -src_prepare() { - default - # patch touches configure.ac - eautoreconf -} - -src_configure() { - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local myeconfargs=( - --enable-charset - --enable-vfs - --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") - $(use_enable kernel_linux vfs-undelfs) - # Today mclib does not expose any headers and is linked to - # single 'mc' binary. Thus there is no advantage of having - # a library. Let's avoid shared library altogether - # as it also conflicts with sci-libs/mc: bug #685938 - --disable-mclib - $(use_enable nls) - $(use_enable sftp vfs-sftp) - $(use_enable spell aspell) - $(use_enable test tests) - $(use_with gpm gpm-mouse) - $(use_with X x) - $(use_with edit internal-edit) - ) - econf "${myeconfargs[@]}" -} - -src_test() { - # Bug #759466 - 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 -} -src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS NEWS README - - # fix bug #334383 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then - fowners root:tty /usr/libexec/mc/cons.saver - fperms g+s /usr/libexec/mc/cons.saver - fi - exeinto "/usr/libexec/mc/extfs.d/" - doexe "${DISTDIR}/ulha" - doexe "${DISTDIR}/uc1541" -} - -pkg_postinst() { - if use spell && ! has_version app-dicts/aspell-en ; then - elog "'spell' USE flag is enabled however app-dicts/aspell-en is not installed." - elog "You should manually set 'spell_language' in the Misc section of ~/.config/mc/ini" - elog "It has to be set to one of your installed aspell dictionaries or 'NONE'" - elog - fi - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -}