commit: 6ef4f8fa1b9af1dbf9beefd23eecd25136064430
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 7 08:37:04 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 7 08:37:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef4f8fa
app-misc/mc: bump up to 4.8.25-rc1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-misc/mc/Manifest | 1 +
.../mc/{mc-9999.ebuild => mc-4.8.25_rc1.ebuild} | 27 +++++-----------------
app-misc/mc/mc-9999.ebuild | 4 +---
3 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 78cdde68001..bb187789095 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1 +1,2 @@
DIST mc-4.8.24.tar.xz 2434988 BLAKE2B
18bd730d5bfbad19fa5e70fb578cf587a3df8da33885543b3d316548ac0d29bd67e4683d32b2751471e148e89390c7658edb622fd741eae054b7fae774996b60
SHA512
ec9e40198455e7001bb1d06ea060b9b4c32ad3a3750d0cc9bac334b53eb666df1746335bfcd411213fa4386b23e516f6026fe3d74ad9119b2340b26c63ccd4fc
+DIST mc-4.8.25_rc1.tar.xz 2487732 BLAKE2B
18bbff9e44bdd2996e5e4dc44389167a90798bc03098850f3df70b8451951e95f66fdd58416e9f44289e072729d4217be7ecf20e65fb4f507e44669d76c13589
SHA512
61e21d905dd28ea732d62c75cb5a18e67f90c7c85376ceb2240089ff7b5d724bcf2cb7de4d89709a44b795cdcbbf123648a302552bd370972e23f0967a3a1353
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-4.8.25_rc1.ebuild
similarity index 81%
copy from app-misc/mc/mc-9999.ebuild
copy to app-misc/mc/mc-4.8.25_rc1.ebuild
index 35e12355b85..563e47b602e 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-4.8.25_rc1.ebuild
@@ -3,26 +3,16 @@
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}
-
-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
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
-fi
+inherit flag-o-matic vcs-snapshot
DESCRIPTION="GNU Midnight Commander is a text based file manager"
HOMEPAGE="https://www.midnight-commander.org";
+#SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz";
+SRC_URI="https://www.midnight-commander.org/nopaste/tarball/mc-4.8.24-163-g171957980.tar.xz
-> ${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 )"
@@ -55,12 +45,6 @@ pkg_pretend() {
fi
}
-src_prepare() {
- default
-
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
-}
-
src_configure() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
@@ -95,9 +79,10 @@ src_test() {
# information.
CK_FORK=no emake check VERBOSE=1
}
+
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 35e12355b85..1220ef65dda 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -11,10 +11,8 @@ fi
inherit flag-o-matic ${LIVE_ECLASSES}
-MY_P=${P/_/-}
-
if [[ -z ${LIVE_EBUILD} ]]; then
- SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz";
+ SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz";
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390
~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x86-solaris"
fi
