diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-18 00:10:51 +0100 |
| commit | eccb70a7f91b2d22582587f26d1a28bb31408b45 (patch) | |
| tree | 3223e1fd54201bcf4ebecac6fbe87361cbe643e2 /app-misc/mc | |
| parent | a2810985afabcc31d3eace5e61d8ea25b852ba17 (diff) | |
gentoo resync : 18.05.2019
Diffstat (limited to 'app-misc/mc')
| -rw-r--r-- | app-misc/mc/Manifest | 6 | ||||
| -rw-r--r-- | app-misc/mc/mc-4.8.22.ebuild | 8 | ||||
| -rw-r--r-- | app-misc/mc/mc-9999.ebuild | 8 | ||||
| -rw-r--r-- | app-misc/mc/metadata.xml | 1 |
4 files changed, 15 insertions, 8 deletions
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index 6683872a652f..5e355b44a066 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,4 +1,4 @@ DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed -EBUILD mc-4.8.22.ebuild 2636 BLAKE2B 635a57b5283e933974203bb812a58486468002c32eee42fc3db781b39d39375d21070e65eafc54ab240bb8f351869615b317d58dbd300094b735ddb990385a0f SHA512 29924f83e1d5ca88b01ec5c27755cb53ffbf950a573b7a34ae14989d02f56a581e7772a1c406bdb551ee689598e51c49e652438b1ae2239e9ecea95472320350 -EBUILD mc-9999.ebuild 2893 BLAKE2B 64978ade6c20ddf9babc40628bfd6ab1232e82ae2e2f508825d06c49f13a45d90dee7836849cd59fdc22b09bdb6d07f503af1bae46bdec1151b658a56fced071 SHA512 f8f59a611a500853882dd2baa0249d65a99c8ccdd042b756f9543219090485a152533acc412a08d25c4dc0ecde04b249664427a1ae5a0334eae9a8627dd1b29b -MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed +EBUILD mc-4.8.22.ebuild 2856 BLAKE2B 4690f984d23c2397b1934708b3fe03b357e6422516bc59ed50ff9e7a32988e6019ab69cecd7618ef4e60725f30367e76da3a249b4d5b04b7bec4f0346aedb977 SHA512 0976c89075f0dd7cb3028b2855824b441a74cdd981064a892d2446347484e9fbbba236705ee99f7b2b7163e6dd0769d902da85dfb0ae05a66667a82c9c6e911d +EBUILD mc-9999.ebuild 3113 BLAKE2B ec6b556a149078643e7dfd5a3fbd5bc43c174b1cfb5e2d05d578c7ac9dfe084347ee262100d5b2c6d5fe9bbc3feaed504e93252bbc01f8431d49d1794eb63425 SHA512 8693c20e841d2b3f83073a444cca6e8013046e1f7ac7007f12d11a384e2db691ac06930f782f3585e9d7441a964967b143b3bee740c6287d64ac2e04f6277c5e +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 f8cbc5a2c392..1e7d94b10815 100644 --- a/app-misc/mc/mc-4.8.22.ebuild +++ b/app-misc/mc/mc-4.8.22.ebuild @@ -14,7 +14,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" +IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg" REQUIRED_USE="spell? ( edit )" @@ -57,7 +57,11 @@ src_configure() { --with-homedir=$(usex xdg 'XDG' '.mc') --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") $(use_enable kernel_linux vfs-undelfs) - $(use_enable mclib) + # 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) diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild index d27af1106ec4..a8a30b230b1c 100644 --- a/app-misc/mc/mc-9999.ebuild +++ b/app-misc/mc/mc-9999.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="https://www.midnight-commander.org" LICENSE="GPL-3" SLOT="0" -IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" +IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg" REQUIRED_USE="spell? ( edit )" @@ -70,7 +70,11 @@ src_configure() { --with-homedir=$(usex xdg 'XDG' '.mc') --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") $(use_enable kernel_linux vfs-undelfs) - $(use_enable mclib) + # 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) diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml index 35fa1001c11e..5c99ff657dde 100644 --- a/app-misc/mc/metadata.xml +++ b/app-misc/mc/metadata.xml @@ -15,7 +15,6 @@ </maintainer> <use> <flag name="edit">Compile and install the mcedit application</flag> - <flag name="mclib">Compile and install the libmc.so shared library</flag> <flag name="sftp">Add support for sftp (uses <pkg>net-libs/libssh2</pkg> for it).</flag> <flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag> <flag name="xdg">Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc</flag> |