diff options
Diffstat (limited to 'app-misc/mc')
-rw-r--r-- | app-misc/mc/Manifest | 10 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.8.16-makedev.patch | 28 | ||||
-rw-r--r-- | app-misc/mc/files/mc-4.8.18-html.patch | 29 | ||||
-rw-r--r-- | app-misc/mc/mc-4.8.15.ebuild | 101 | ||||
-rw-r--r-- | app-misc/mc/mc-4.8.18-r1.ebuild | 103 | ||||
-rw-r--r-- | app-misc/mc/mc-4.8.21.ebuild (renamed from app-misc/mc/mc-4.8.19.ebuild) | 70 |
6 files changed, 30 insertions, 311 deletions
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest index b0f8a05c2ee8..35b1e498df4b 100644 --- a/app-misc/mc/Manifest +++ b/app-misc/mc/Manifest @@ -1,15 +1,9 @@ AUX mc-4.8.13-tinfo.patch 1742 BLAKE2B d9428200e62bbffd0cf056bd25b3cec9a3c4b83638f4e72379f8756e62376c61ef3375c9ede50deb52619ead78a39d49280f9a654e0d8877158b6ef4b8117556 SHA512 7714d42ece73fe6f044f5cc0f59ab5c23bedb820122291d1af581f5f7dd94d4410072868205e94419be459ed9769c8ed75dfb8ad5b945c8df820901f756e7c3c -AUX mc-4.8.16-makedev.patch 901 BLAKE2B 5980e0bc05ce34c6e33ade84bd0dd32816298d34c108cb6b603cb84c5a458f7d50f05c61a584bdda3991a4ae9274068f954ec4ea5a768f51600a32c0e9123f3f SHA512 dcc77b50bb6a23ca7c1ef3f4fd0dec4defd3b46b120d38cbb9737e9a1464cda4e7c972b6d74a50ae41fc6df845feaad6b865f3aecfc1195f6413baff157504a5 -AUX mc-4.8.18-html.patch 969 BLAKE2B dca7823453e5c85471ca2e2f7020920b4da2bc992f5fe238a0f86dd51d7a6486b368ba7cd28da866107631f8e542a70d1ac4dba53ceca836335c328fac638bcd SHA512 d3e97e0d5e5260cf1dfce8700aaf44c2f6998bbc37defe38f4fd18b5a28160d61b51fa8185e5cde257655d088b7b474604e4a7cd570c6982b3e7af5ef95f8cde AUX mc-4.8.19-selected-size.patch 988 BLAKE2B de407c64d1d7e2460f165ace967f6b83c50e45c6842a1d174928c872d4f6a9aff31939942f2896bb2f3d34f656fb2c1e262c35a7c72f1cb58256472d5cac7c19 SHA512 f7740ec01e38857b1e365737cc4e1cd41397e41aea9ef5aa121c6db2f11955980df949a440cce7bbf810b7b8a6f0c1c5e5090de3c5008dd6390ecee4c659d80c -DIST mc-4.8.15.tar.xz 2304812 BLAKE2B 33d8055316b4ae9d8b2385c3a439339fa635e3f145c9599ce937c596c6ae18225451568a2387074af8d9afc702a0ec8528e07b00b7805dd86af459612d7fd187 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 -DIST mc-4.8.18.tar.xz 2462080 BLAKE2B 10cd93cea439290922c0dc19e85b6c9456ce4266f35eeecbf2f40d99e3aae64465d9c427fa01d7d2c542e8bae9d2926e8ce42766c4c1656373905c3d871d71c0 SHA512 edd81f6ab50ca7bb3582064f6722e490d33ae9dfbef3835e26206089d3898420968da394780c594083fa17c01a85cda9068d9931199b8319bf6361f90e900eb8 -DIST mc-4.8.19.tar.xz 2521808 BLAKE2B b4712d833e8562b0f760b4558533ac338cf8875dc9034cbec2160444bbe3e9f4dc7fcec16835cabdd5cde6b02a7020162b3cd1693863775ee3494c9b4659a7aa SHA512 aec49f0da1fc69099ce9b0f71926d1e9ee6df0be12f53da94a8f5f4266612515031cd02f328a458bf78260c5efb1c8ca2c34c89e20a77567c8b987e43d446531 DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138 -EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c2009e149136ecda8b03cd1d9433ea8dcd1a3194e61e5380c81b905072f7c3e1688920e4dc57ceb3c270d41f SHA512 906e1842f664cff03939a0fed27aaa447abf92553916bedcdbe7c23aa65f704c2538ca5be666086dbe2ce3204bbdfc87854346f3894293ccef8ef5d8a2ae6e7f -EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505 -EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353 +DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf EBUILD mc-4.8.20-r1.ebuild 2482 BLAKE2B 1bf8934ae7f8d5478804017453efc0a8d16e1f6b2f8bedd8d878202df154fa01138e5284f18a4a5e3a7ca11b70785fcf250275b45941e4b411a045142a3e0705 SHA512 6345f42e21960543ccd50ee95790c017667f73a293386ad28a6107e4575e649902b8e26970185f3ef59d8ef23f4a45b02596d0f99156c704083ab15f54f87384 EBUILD mc-4.8.20-r2.ebuild 2619 BLAKE2B 818c6c1ab7b190d80566935453e3467479733e266683e17f02c397d6d55bc2ad3a9aeacad91e4c2ad7dd6e26e9a6319b1392726a097415d5302dc49a9daf7843 SHA512 50e29ca64ea1e6172653960220e8bee6b7a298792e7774971a7c3db6a3187646ae84a88291ba0deb898ca6294fd752b827b0213ea7d770a078edd9f506abd0cc +EBUILD mc-4.8.21.ebuild 2425 BLAKE2B c1fd699e82c24ac68898dbb3a67eb61c9a5bcc27f2c31a6cb2c76adaba25651f18f24eafc9434b36144cbec1fc4451d306cb8661cf433217f973ce5b24077317 SHA512 806b4dc06c0afcfecbd5a00469e85fbfb115b2645df2c504c79f8788fd6e0248155b0c8e728580b8b12ee74e091f8f8ade41bd57e5c2c8eb86abdb9318b1d928 EBUILD mc-9999.ebuild 2710 BLAKE2B acbcdaf95260df5b4f34ac03e19b2b674f65d3c95083e79eaf916cd62f99ea0d9008c94bb2c0e030bcd8face202c00a646eca1521461058ae009da1f17a4499e SHA512 0388200a8134818d797d79849bc618a222377c33fb1802dcbf2fdafcbc22d85888171fee546ff5a484aeb4d97074afa1fea23ea5ee2078182bf72277658b65bb MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed diff --git a/app-misc/mc/files/mc-4.8.16-makedev.patch b/app-misc/mc/files/mc-4.8.16-makedev.patch deleted file mode 100644 index 8e7fd0e0f1cb..000000000000 --- a/app-misc/mc/files/mc-4.8.16-makedev.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4ba3a1a92a59658bc9f5f9d0745db8bb829778cb Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Wed, 13 Apr 2016 23:38:47 +0100 -Subject: [PATCH] filemanager/mountlist.c: add makedev() declaration - -On glibc-2.23 link fails as - - $ mc-9999/src/filemanager/mountlist.c:750: undefined reference to `makedev' - -Reported-by: Thomas D. -Bug: https://bugs.gentoo.org/579858 -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> - -diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c -index 166b246..7d6e178 100644 ---- a/src/filemanager/mountlist.c -+++ b/src/filemanager/mountlist.c -@@ -186,6 +186,7 @@ - - #include "lib/global.h" - #include "lib/strutil.h" /* str_verscmp() */ -+#include "lib/unixcompat.h" /* makedev */ - #include "mountlist.h" - - /*** global variables ****************************************************************************/ --- -2.8.1 - diff --git a/app-misc/mc/files/mc-4.8.18-html.patch b/app-misc/mc/files/mc-4.8.18-html.patch deleted file mode 100644 index d8483446bfcd..000000000000 --- a/app-misc/mc/files/mc-4.8.18-html.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 6b656100ac907636f0b54b12921408260a9fd583 -Author: Raymond Jennings <shentino@gmail.com> -Date: Fri Oct 7 22:38:07 2016 +0200 - - mcedit: syntax: fix mismatched highlighting for <{o,u}l> HTML tags - - Signed-off-by: Raymond Jennings <shentino@gmail.com> - Signed-off-by: Yury V. Zaytsev <yury@shurup.com> - -diff --git a/misc/syntax/html.syntax b/misc/syntax/html.syntax -index 2b3afd30e..3adbe4d0b 100644 ---- a/misc/syntax/html.syntax -+++ b/misc/syntax/html.syntax -@@ -52,6 +52,7 @@ context default - keyword </SMALL> brightcyan/17 - keyword </SCRIPT> brightcyan/17 - keyword </META> brightcyan/17 -+ keyword </OL> brightcyan/17 - keyword </P> brightcyan/17 - keyword </TABLE> brightcyan/17 - keyword </TD> brightcyan/17 -@@ -59,6 +60,7 @@ context default - keyword </TR> brightcyan/17 - keyword </TT> brightcyan/17 - keyword </U> brightcyan/17 -+ keyword </UL> brightcyan/17 - - - context <A > brightcyan/17 diff --git a/app-misc/mc/mc-4.8.15.ebuild b/app-misc/mc/mc-4.8.15.ebuild deleted file mode 100644 index c01cae5c6123..000000000000 --- a/app-misc/mc/mc-4.8.15.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils 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://www.midnight-commander.org/downloads/${MY_P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm 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 X +xdg" - -REQUIRED_USE="spell? ( edit )" - -RDEPEND=">=dev-libs/glib-2.8: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= ) - 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 ) - " - -[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs) - -src_prepare() { - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - epatch "${FILESDIR}"/${PN}-4.8.13-tinfo.patch - epatch "${FILESDIR}"/${PN}-4.8.16-makedev.patch - epatch_user - eautoreconf -} - -S=${WORKDIR}/${MY_P} - -src_configure() { - local myscreen=ncurses - use slang && myscreen=slang - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local homedir=".mc" - use xdg && homedir="XDG" - - econf \ - --disable-silent-rules \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_enable sftp vfs-sftp) \ - $(use_enable spell aspell) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit internal-edit) \ - $(use_enable mclib) \ - $(use_enable test tests) \ - --with-homedir=${homedir} -} - -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-4.8.18-r1.ebuild b/app-misc/mc/mc-4.8.18-r1.ebuild deleted file mode 100644 index 024c7dcdd497..000000000000 --- a/app-misc/mc/mc-4.8.18-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils 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 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 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= ) - 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 ) - " - -PATCHES=( - "${FILESDIR}"/${PN}-4.8.13-tinfo.patch - "${FILESDIR}"/${P}-html.patch -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - default - - eautoreconf -} - -src_configure() { - local myscreen=ncurses - use slang && myscreen=slang - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - - local homedir=".mc" - use xdg && homedir="XDG" - - econf \ - --disable-silent-rules \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_enable sftp vfs-sftp) \ - $(use_enable spell aspell) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit internal-edit) \ - $(use_enable mclib) \ - $(use_enable test tests) \ - --with-homedir=${homedir} -} - -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-4.8.19.ebuild b/app-misc/mc/mc-4.8.21.ebuild index a494288fc52e..a7b19052bb2f 100644 --- a/app-misc/mc/mc-4.8.19.ebuild +++ b/app-misc/mc/mc-4.8.21.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit autotools eutils flag-o-matic +inherit flag-o-matic MY_P=${P/_/-} @@ -14,7 +14,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~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 X +xdg" +IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" REQUIRED_USE="spell? ( edit )" @@ -24,7 +24,7 @@ RDEPEND=">=dev-libs/glib-2.26.0:2 samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) - !slang? ( sys-libs/ncurses:0= ) + !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE @@ -38,50 +38,36 @@ DEPEND="${RDEPEND} test? ( dev-libs/check ) " -PATCHES=( - "${FILESDIR}"/${PN}-4.8.13-tinfo.patch -) - S=${WORKDIR}/${MY_P} -src_prepare() { - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh - - default - - # These tests fail, so disable them instead of disabling the entire - # test suite. Please check on each bump if this is still necessary. - # Next release will fix them: http://midnight-commander.org/ticket/3781 - rm tests/src/vfs/extfs/helpers-list/data/{rpm,u7z,urar}.* || die - - eautoreconf +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() { - local myscreen=ncurses - use slang && myscreen=slang [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" - local homedir=".mc" - use xdg && homedir="XDG" - - econf \ - --disable-silent-rules \ - --disable-dependency-tracking \ - $(use_enable nls) \ - --enable-vfs \ - $(use_enable kernel_linux vfs-undelfs) \ - --enable-charset \ - $(use_with X x) \ - $(use_enable samba vfs-smb) \ - $(use_enable sftp vfs-sftp) \ - $(use_enable spell aspell) \ - $(use_with gpm gpm-mouse) \ - --with-screen=${myscreen} \ - $(use_with edit internal-edit) \ - $(use_enable mclib) \ - $(use_enable test tests) \ - --with-homedir=${homedir} + 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) + $(use_enable 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_install() { @@ -96,7 +82,7 @@ src_install() { 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 + -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die fi } |