commit: 46db16b8927b8fc80ef20c917bd2322c312294c9
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 1 15:14:12 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jan 1 15:14:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46db16b8
app-misc/mc: bump up to 4.8.22
Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-misc/mc/Manifest | 1 +
app-misc/mc/{mc-9999.ebuild => mc-4.8.22.ebuild} | 31 +++++++-----------------
app-misc/mc/mc-9999.ebuild | 6 ++---
3 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 9967ef41480..1424ab6aa80 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,2 +1,3 @@
DIST mc-4.8.20.tar.xz 2529580 BLAKE2B
14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c
SHA512
c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
DIST mc-4.8.21.tar.xz 2528292 BLAKE2B
0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f
SHA512
db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
+DIST mc-4.8.22.tar.xz 2538524 BLAKE2B
f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30
SHA512
834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-4.8.22.ebuild
similarity index 74%
copy from app-misc/mc/mc-9999.ebuild
copy to app-misc/mc/mc-4.8.22.ebuild
index 3af128d35dc..d6f2ab5c567 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -1,28 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git";
- LIVE_ECLASSES="git-r3 autotools"
- LIVE_EBUILD=yes
-fi
-
-inherit flag-o-matic ${LIVE_ECLASSES}
+inherit flag-o-matic
MY_P=${P/_/-}
-if [[ -z ${LIVE_EBUILD} ]]; then
- SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x86-solaris"
-fi
-
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-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"
REQUIRED_USE="spell? ( edit )"
@@ -47,18 +38,14 @@ DEPEND="${RDEPEND}
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_prepare() {
- default
-
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
src_configure() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
@@ -68,7 +55,7 @@ src_configure() {
--enable-charset
--enable-vfs
--with-homedir=$(usex xdg 'XDG' '.mc')
- --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')")
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w'
'')")
$(use_enable kernel_linux vfs-undelfs)
$(use_enable mclib)
$(use_enable nls)
@@ -85,7 +72,7 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
- dodoc AUTHORS doc/{FAQ,NEWS,README}
+ dodoc AUTHORS README NEWS
# fix bug #334383
if use kernel_linux && [[ ${EUID} == 0 ]] ; then
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index 3af128d35dc..722ae657e0d 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git";
@@ -68,7 +68,7 @@ src_configure() {
--enable-charset
--enable-vfs
--with-homedir=$(usex xdg 'XDG' '.mc')
- --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')")
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w'
'')")
$(use_enable kernel_linux vfs-undelfs)
$(use_enable mclib)
$(use_enable nls)
