commit: ab338952fc2918ed6ab31f73c1e28a044109d416
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 12:21:45 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 8 12:22:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab338952
app-misc/mc: bump up to 4.8.17
Package-Manager: portage-2.2.28
app-misc/mc/Manifest | 1 +
app-misc/mc/{mc-9999.ebuild => mc-4.8.17.ebuild} | 36 +++++++++++-------------
app-misc/mc/mc-9999.ebuild | 8 ++----
3 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index b46b161..d22ff74 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,3 +1,4 @@
DIST mc-4.8.14.tar.xz 2305788 SHA256
6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512
656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724
WHIRLPOOL
6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa
DIST mc-4.8.15.tar.xz 2304812 SHA256
cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512
b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760
WHIRLPOOL
6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
DIST mc-4.8.16.tar.xz 2387724 SHA256
bbbcbe3097d3160f865d24aa38ff122f1c59752b5ef153ca4ade5ac0f82b7020 SHA512
209a4f92f493d1df5d9976bbd2547b92172270fd35c221e4d4d99630b3530a5cc849bfdff842b47f35e32d215d5af35aadd5cd02bd12567f3736ad4915abb944
WHIRLPOOL
88ec84c10c7f0137b799f7754f25beb372326856107b32fa80f5ecc73dcc9ce6249a8ddc528d2d3e6f723d396828c30dd056b5a3b9b79eb33a0230e9a0c79454
+DIST mc-4.8.17.tar.xz 2457156 SHA256
0447bdddc0baa81866e66f50f9a545d29d6eebb68b0ab46c98d8fddd2bf4e44d SHA512
e995e5b1eb0a5831fe567e4398c9a68fa610c8631f1f13fb277f67f709656bc97bd7b20f289bdace35276984556edd1aed324412d225698c5853809a6d128f72
WHIRLPOOL
ad36526d4961baafd35ed55c600c534826036afb1a7b14b81f9617ea766a6cc9100b317a49349428c36b091389e20fa4abd01c931e2e93d9028024857f2419c1
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-4.8.17.ebuild
similarity index 75%
copy from app-misc/mc/mc-9999.ebuild
copy to app-misc/mc/mc-4.8.17.ebuild
index 4720de0..afb0a8e 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-4.8.17.ebuild
@@ -1,29 +1,20 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://github.com/MidnightCommander/mc.git
https://github.com/MidnightCommander/mc.git
git://midnight-commander.org/git/mc.git"
- LIVE_ECLASSES="git-2 autotools"
- LIVE_EBUILD=yes
-fi
-
-inherit eutils flag-o-matic ${LIVE_ECLASSES}
+inherit autotools eutils flag-o-matic
MY_P=${P/_/-}
-if [[ -z ${LIVE_EBUILD} ]]; then
- SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz";
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~x86-fbsd ~x86-interix ~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="http://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 ~x86-interix ~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 )"
@@ -50,13 +41,20 @@ DEPEND="${RDEPEND}
[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for
SCM source tree (autopoint uses cvs)
-src_prepare() {
- epatch_user
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
+ "${FILESDIR}"/${PN}-4.8.15-ebuild_syntax_EAPI-6.patch
+)
+
+S=${WORKDIR}/${MY_P}
+src_prepare() {
[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-S=${WORKDIR}/${MY_P}
+ default
+
+ eautoreconf
+}
src_configure() {
local myscreen=ncurses
@@ -87,7 +85,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 4720de0..e21eaaa 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -2,11 +2,11 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://github.com/MidnightCommander/mc.git
https://github.com/MidnightCommander/mc.git
git://midnight-commander.org/git/mc.git"
- LIVE_ECLASSES="git-2 autotools"
+ LIVE_ECLASSES="git-r3 autotools"
LIVE_EBUILD=yes
fi
@@ -51,13 +51,11 @@ DEPEND="${RDEPEND}
[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for
SCM source tree (autopoint uses cvs)
src_prepare() {
- epatch_user
+ default
[[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
}
-S=${WORKDIR}/${MY_P}
-
src_configure() {
local myscreen=ncurses
use slang && myscreen=slang
