diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2020-12-18 09:51:04 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-12-18 09:52:51 +0000 |
commit | fbefa922cd8b49ea4ba4a9f2b27ecbd0eede1e18 (patch) | |
tree | 8e884520d32223db0d0962627aa99e65e961f002 /app-misc | |
parent | dev-util/edb-debugger: drop old (diff) | |
download | gentoo-fbefa922cd8b49ea4ba4a9f2b27ecbd0eede1e18.tar.gz gentoo-fbefa922cd8b49ea4ba4a9f2b27ecbd0eede1e18.tar.bz2 gentoo-fbefa922cd8b49ea4ba4a9f2b27ecbd0eede1e18.zip |
app-misc/mc: drop old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'app-misc')
-rw-r--r-- | app-misc/mc/Manifest | 1 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch | 84 | ||||
-rw-r--r-- | app-misc/mc/mc-4.8.24.ebuild | 108 |
3 files changed, 0 insertions, 193 deletions
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index b5f95b458333..f94aa2c85e28 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,2 +1 @@ -DIST mc-4.8.24.tar.xz 2434988 BLAKE2B 18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60 SHA512 ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc DIST mc-4.8.25.tar.xz 2488324 BLAKE2B 47047c85fbe3ce1c54b9a3477c35fb05d76b3688205bfd13db03844bb9d8b3e74498ef4d6b449cfcf79c0188687accd93602274b7e8c0cbffc5247d433e33272 SHA512 51913fd41df18b49498b97ad8e13aa4365cec24ab24169b1abe93209263e4cfea4b52e0faccaf934182c84e8eb5dc49336c885358b4b66c48d38900f890fde5e diff --git a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch b/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch deleted file mode 100644 index 8db6fdfb2ea3..000000000000 --- a/app-misc/mc/files/mc-4.8.24-mc-lib-twice-4070.patch +++ /dev/null @@ -1,84 +0,0 @@ -https://midnight-commander.org/ticket/4070 - -From 30fd157a73f148dbc150c18b206b85e1a4a93e9c Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Tue, 3 Mar 2020 09:26:12 +0000 -Subject: [PATCH] misc/Makefile.am: install 'mc.lib' only once (#4070) - -Before the change `mc.lib` was installed twice due to being -in two `_DATA` variables: - -``` -dist_pkgdata_DATA = \ - mc.lib - -pkgdata_DATA = \ - $(dist_pkgdata_DATA) \ - $(PKGDATA_OUT) -``` - -This causes occasional install failures when two parallel -`/usr/bin/install` calls race in installing the file: - -``` -$ make -j20 DESTDIR=/var/tmp/portage/app-misc/mc-4.8.24/image install -... - /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ - -c -m 644 mc.lib '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' - /usr/lib/portage/python3.6/ebuild-helpers/xattr/install \ - -c -m 644 mc.lib mc.charsets '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc' -... - /usr/bin/install: cannot create regular file - '/var/tmp/portage/app-misc/mc-4.8.24/image/usr/share/mc/mc.lib': File exists -``` - -After the change `mc.lib` is present only in `dist_pkgdata_DATA`. - -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - misc/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - ---- a/misc/Makefile.am -+++ b/misc/Makefile.am -@@ -17,7 +17,7 @@ dist_pkgdata_DATA = \ - mc.lib - - pkgdata_DATA = \ -- $(dist_pkgdata_DATA) \ -+ \ - $(PKGDATA_OUT) - - SCRIPTS_IN = \ -@@ -54,7 +53,7 @@ EXTRA_DIST = \ - $(LIBFILES_SCRIPT) \ - $(SCRIPTS_IN) \ - $(noinst_DATA) \ -- $(dist_pkgdata_DATA) \ -+ \ - $(PKGDATA_IN) - - install-data-hook: ---- a/misc/Makefile.in -+++ b/misc/Makefile.in -@@ -472,7 +473,7 @@ dist_pkgdata_DATA = \ - mc.lib - - pkgdata_DATA = \ -- $(dist_pkgdata_DATA) \ -+ \ - $(PKGDATA_OUT) - - SCRIPTS_IN = \ -@@ -508,7 +509,7 @@ EXTRA_DIST = \ - $(LIBFILES_SCRIPT) \ - $(SCRIPTS_IN) \ - $(noinst_DATA) \ -- $(dist_pkgdata_DATA) \ -+ \ - $(PKGDATA_IN) - - all: all-recursive --- -2.25.1 - diff --git a/app-misc/mc/mc-4.8.24.ebuild b/app-misc/mc/mc-4.8.24.ebuild deleted file mode 100644 index de7e49b86895..000000000000 --- a/app-misc/mc/mc-4.8.24.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -MY_P=${P/_/-} - -DESCRIPTION="GNU Midnight Commander is a text based file manager" -HOMEPAGE="https://www.midnight-commander.org" -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=">=dev-libs/glib-2.26.0:2 - gpm? ( sys-libs/gpm ) - kernel_linux? ( sys-fs/e2fsprogs ) - samba? ( net-fs/samba ) - sftp? ( net-libs/libssh2 ) - slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0=[unicode?] ) - spell? ( app-text/aspell ) - X? ( x11-libs/libX11 - x11-libs/libICE - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libSM )" -DEPEND="${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - nls? ( sys-devel/gettext ) - test? ( dev-libs/check ) - " - -RESTRICT="!test? ( test )" - -S=${WORKDIR}/${MY_P} - -PATCHES=("${FILESDIR}"/${P}-mc-lib-twice-4070.patch) - -pkg_pretend() { - if use slang && use unicode ; then - ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." - fi -} - -src_configure() { - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local myeconfargs=( - --enable-charset - --enable-vfs - --with-homedir=$(usex xdg 'XDG' '.mc') - --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 samba vfs-smb) - $(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() { - # 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 README NEWS - - # 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 - - if ! use xdg ; then - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die - fi -} - -pkg_postinst() { - elog "To enable exiting to latest working directory," - elog "put this into your ~/.bashrc:" - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh" -} |