From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- app-misc/mc/Manifest | 5 +- app-misc/mc/files/mc-4.8.28-tests.patch | 35 +++++++++ app-misc/mc/mc-4.8.28.ebuild | 125 ++++++++++++++++++++++++++++++++ app-misc/mc/mc-9999.ebuild | 4 +- 4 files changed, 166 insertions(+), 3 deletions(-) create mode 100644 app-misc/mc/files/mc-4.8.28-tests.patch create mode 100644 app-misc/mc/mc-4.8.28.ebuild (limited to 'app-misc/mc') diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 575874a83df3..864c88d83658 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,5 +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 DIST mc-4.8.27.tar.xz 2510296 BLAKE2B efb0f3a8beb7285a793085a8e3b3a49619d0f8a4babff7de90f7a462cf6c013bbc08b92bc48e2c2e2204799332cd0160a86e201d9368cabde78e653b4306763f SHA512 c955d66cee06e3a0e0c795f2f6b98b184762363390a903cf8ef83dc5e98e6e94d5a9c06c4788d9ff4b3ae111541df8c7dc0b864a5c21c40421a81cd8690e9a69 +DIST mc-4.8.28.tar.xz 2333072 BLAKE2B f4218e6c166df85b7b3736f0fd1414c9507c72074f06001f12b114ce6c6fbbf3688ab850aa70f5063eb3920736f878e113eb39a5d261ccfc3ffa9dab473a8436 SHA512 ca3b3a57281e9387cb52bf1fcfc3f39a4d5f438aafc256dc492c192678824f67c983a852c759664efc5bc6d0de471c9b3929834f8301f6302ca1ebeee513fdfd EBUILD mc-4.8.27.ebuild 3277 BLAKE2B f0ad166643a2f22cac89583cb6793e47462a96a9d5acef7870fec3598403cd356e2bdedab092601371f3aa18a3e76596caaae3fa48a454051aa5af39c6bbe6c3 SHA512 282ac6d42a7de75cc3973ffa4259d33ce32eb0b7f1714f136f2dd349f09481fbe6aad7086d0f5bb4d6a0a24389bae4bd7b0962c5c573718bd5019750d676b605 -EBUILD mc-9999.ebuild 3561 BLAKE2B 81d6dbc9ea9033e235a980b2d7a384eb52a76246d6c3cf63bd1cf742e54a46856f3e3c5f84824ad68f351b83c78cc14c76d8e6da0732a480ff38788713267349 SHA512 8b023194bb6d2054d2d5856d6f1c9c2b6df1b6c50c31681310d8489dc59f3ec4a81c8a06e22d055d2866fd06641cfa7e4d66d531557e5660e897f14ae87b94ac +EBUILD mc-4.8.28.ebuild 3276 BLAKE2B 465299020b14801c598da4fa1ec5ee33b07b4e0725ee17fd0a6f913072d8b638fe888fb45262fca3148261d0b0997f517ddcf58c750c0051ac22e7c5c42037af SHA512 013203b1821dc21d30a81c645d5f49cb3790f6644c55a16df68c765576ee482ac6d06a7a52dfe1f7bd59cd39fb0e2aaa9c03c68711eca7904194932e10dc18ad +EBUILD mc-9999.ebuild 3561 BLAKE2B 4c7bd6ec644bfbccd2585244d683edfeb4c5bdf023c6eb866424ae11bd9138a99af2ce4dad7bd512853f6ebf18520319019c213b1036d9935563c29de24820c8 SHA512 93485a23e82d8584de49c2b8abbd8bf1ddbf3c2d722742d01b820b31befef9829c6f3de0eb69d3005109ea7f03d5ace7eee0eece5ad89862030faadb2bfbd908 MISC metadata.xml 771 BLAKE2B 9680a9a9c9cdd9dd6c7972947f8d62eab08e14c8c1285009f4f55a90409bca51ea9bf72be913eb5812db7723230fa469acbc731a959b7caaa9473136b68115e4 SHA512 5c4dd207f8f3fc8c33bf571c78f50e51a4331ddddaa1b0cfdee93601b86d34a234482a1168ba021440fde04bcc4e034e223e89413a034ddf21faca08a112a9e9 diff --git a/app-misc/mc/files/mc-4.8.28-tests.patch b/app-misc/mc/files/mc-4.8.28-tests.patch new file mode 100644 index 000000000000..ccd9dc1addc9 --- /dev/null +++ b/app-misc/mc/files/mc-4.8.28-tests.patch @@ -0,0 +1,35 @@ +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/mc-4.8.28.ebuild b/app-misc/mc/mc-4.8.28.ebuild new file mode 100644 index 000000000000..c9ccfbc6bf8b --- /dev/null +++ b/app-misc/mc/mc-4.8.28.ebuild @@ -0,0 +1,125 @@ +# 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" +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-libs/glib-2.30.0:2 + gpm? ( sys-libs/gpm ) + kernel_linux? ( sys-fs/e2fsprogs ) + 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 +} + +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-9999.ebuild b/app-misc/mc/mc-9999.ebuild index efb7afe860f7..51b9527c8fb4 100644 --- a/app-misc/mc/mc-9999.ebuild +++ b/app-misc/mc/mc-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,7 @@ IUSE="+edit gpm nls sftp +slang spell test unicode X" REQUIRED_USE="spell? ( edit )" -RDEPEND=">=dev-libs/glib-2.26.0:2 +RDEPEND=">=dev-libs/glib-2.30.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) sftp? ( net-libs/libssh2 ) -- cgit v1.2.3