From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- app-misc/mc/Manifest | 7 ++- app-misc/mc/mc-4.8.22.ebuild | 2 + app-misc/mc/mc-4.8.23-r1.ebuild | 2 + app-misc/mc/mc-4.8.23.ebuild | 106 ---------------------------------------- app-misc/mc/mc-9999.ebuild | 2 + 5 files changed, 9 insertions(+), 110 deletions(-) delete mode 100644 app-misc/mc/mc-4.8.23.ebuild (limited to 'app-misc/mc') diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 0de4dbaef40f..137971df238c 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -4,8 +4,7 @@ AUX mc-4.8.23-gettext-test.patch 2061 BLAKE2B a4381f4919cc48750994037daad17a3772 AUX mc-4.8.23-gettext.patch 2017 BLAKE2B 9d67398051f77e94d1b9932a89801335efef851b58471354c48d9c8289a4e4b4f3feb275b6c40e46d66a51a374e4a0712cbbce0d3e4f010b256c59930525a96f SHA512 60db8df34ff93d0ed30604bba1969b4b9832417b0b09fb0d0e86b53669c8349e9ab992d6b84cbe7f0c2d8d8a5ffc6ab9cef0a88a86066f36c0c5e45da79c57e5 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6 -EBUILD mc-4.8.22.ebuild 2832 BLAKE2B 848f4a579f0b0217742e3f6a7e0462851ad9dcf74c0bb1da65ceaf9adc1ab8be4e23e3ecc734ea0a55efcf7753f3536dd9de102830c817b013d33ebd4170ca9e SHA512 6bccc63cc5f6bc41c4592cef740908acaf8034f2ebb6e356ea4c61c987d07bcd3cdcf41d6f9136c35f89b7dc7f247892a1eda4e797e03877d8b1a0eba322b3a3 -EBUILD mc-4.8.23-r1.ebuild 3017 BLAKE2B e28e264661f3a35a67b80e3f144ad960cb84c1ddee69e2c3e5afa2f0fe190b10679f7f0712543caeb44f81b7576dd2304f8de97c6ca092cf0f56e9fc74c13aa0 SHA512 dde6d1972e25b623e05df245170a5fec0fc984a5be9c9b5889538458b230c42f6575798c2be2aef2eab86855978f7cafa87823ccc1a9f062a15eaf656130695d -EBUILD mc-4.8.23.ebuild 2842 BLAKE2B 3e411a758f272945d63219c02aeba93fba8bd1f0111cf69cb928514fd619d846b16de0ff1a553e298d2253ca64f721afbe7721e3af21168c58cdd0f0bab7f88a SHA512 8f60a7d096b874e129b7c35666641405deacc6da32cba5f8f88bcc7264cc525ed54850bfaedbf768302836aa7a3ac97667fbee5fab6d27fa89ad9c1d187873e8 -EBUILD mc-9999.ebuild 3101 BLAKE2B a0dece16076078127c94807575dd7edda7bbf2dccaaeb8821cd290ee56953bbb49d1f94bfb9551eaf570b7fbef58a4613551fc5b8d055a3c20cec6a3bd15a2cc SHA512 2dcd2f675359c72c43f7c4c9e4540e5d438e91abe6cf6c05ad12f9ec780e7e10ec0b72f0b9d83fd099960a63ad13a66c09a3ab709ef6774a3f7b0ea4ea983791 +EBUILD mc-4.8.22.ebuild 2860 BLAKE2B 89f2efd1f31ff3b4c50ff7d4e7c21db6605845cf668fa129e8e9a555d3cf1cbe24dce05b50b13141f310a4d16df5f51211acf8940fc46e31591fbade21eeda05 SHA512 3b458fc317e1a3e26e073ea3effb02c7b525cc9ba1ce19211453bb4b10b48ba94b4aefd0faafba42bb941b24f9e5b6ffefe155e1b8c857f2706ea2745978bd41 +EBUILD mc-4.8.23-r1.ebuild 3045 BLAKE2B ab1d575bb42bff712cd9b2bdb6e5308999005bd6dcb8ddb6bbd8d98cb03910755197cdea17a15246099e2127ec5e3382443b851cd7fcc6e8b890fcd40df5e805 SHA512 0f0e3d52d10ed69b27c73c51ea785d09b26c5124a552a48354cb9ff199ad719454148bdb5790fecebd0f558d0c0c416b495e7b9fc9e54d1450477348424a6d1d +EBUILD mc-9999.ebuild 3129 BLAKE2B 86eecca3b1675bfcfaaa8c36f2ca937541b9ab6bcc96d693cc686c5dcbd4e93bfd209e2b425c9d5edcb7b2db353d007a1b04ae94d04742fcf3cb3e789db4dbf0 SHA512 9815a1a8bec31b5d4e1ab03fa25aba3c8c75232c23fbeab0322a39317a46a355c5feb94fe37f4c5ff17661fcfec8fc786ada179559e4cd92153764f3166a3c40 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild index a246a79ffb5a..256d07fc143e 100644 --- a/app-misc/mc/mc-4.8.22.ebuild +++ b/app-misc/mc/mc-4.8.22.ebuild @@ -38,6 +38,8 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) " +RESTRICT="!test? ( test )" + S=${WORKDIR}/${MY_P} pkg_pretend() { diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild index 9f58fc202682..7791376a19da 100644 --- a/app-misc/mc/mc-4.8.23-r1.ebuild +++ b/app-misc/mc/mc-4.8.23-r1.ebuild @@ -38,6 +38,8 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) " +RESTRICT="!test? ( test )" + S=${WORKDIR}/${MY_P} PATCHES=( diff --git a/app-misc/mc/mc-4.8.23.ebuild b/app-misc/mc/mc-4.8.23.ebuild deleted file mode 100644 index 32597904a63f..000000000000 --- a/app-misc/mc/mc-4.8.23.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2019 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 ~sh ~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 ) - " - -S=${WORKDIR}/${MY_P} - -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=( - --disable-dependency-tracking - --disable-silent-rules - --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" -} diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild index 14377f18812e..336a555d2aba 100644 --- a/app-misc/mc/mc-9999.ebuild +++ b/app-misc/mc/mc-9999.ebuild @@ -47,6 +47,8 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) " +RESTRICT="!test? ( test )" + pkg_pretend() { if use slang && use unicode ; then ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." -- cgit v1.2.3