From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CC64A158003 for ; Fri, 5 Nov 2021 12:45:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7026E08F3; Fri, 5 Nov 2021 12:45:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F297E08F3 for ; Fri, 5 Nov 2021 12:45:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF5AD342B66 for ; Fri, 5 Nov 2021 12:45:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A870D1B0 for ; Fri, 5 Nov 2021 12:45:32 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1636116256.ea77f8244a04828ac242fcc6d0e17e02acd0bb7d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/mc/mc-9999.ebuild X-VCS-Directories: app-misc/mc/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: ea77f8244a04828ac242fcc6d0e17e02acd0bb7d X-VCS-Branch: master Date: Fri, 5 Nov 2021 12:45:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 93e13514-f33d-47c8-92e8-c7a0f76fe96f X-Archives-Hash: f75d9e6018d05d6e82ceffb95d90aff5 commit: ea77f8244a04828ac242fcc6d0e17e02acd0bb7d Author: Lars Wendler gentoo org> AuthorDate: Fri Nov 5 12:44:16 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Nov 5 12:44:16 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea77f824 app-misc/mc: live ebuild overhaul - EAPI-8 - Removed samba support (upstream removed it as well) - Synced with release ebuild Signed-off-by: Lars Wendler gentoo.org> app-misc/mc/mc-9999.ebuild | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild index 1d3a9867b94..efb7afe860f 100644 --- a/app-misc/mc/mc-9999.ebuild +++ b/app-misc/mc/mc-9999.ebuild @@ -1,18 +1,16 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +inherit flag-o-matic + +MY_P="${P/_/-}" if [[ ${PV} = *9999* ]]; then + inherit autotools git-r3 EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git" - LIVE_ECLASSES="git-r3 autotools" - LIVE_EBUILD=yes -fi - -inherit flag-o-matic ${LIVE_ECLASSES} - -if [[ -z ${LIVE_EBUILD} ]]; then - SRC_URI="http://ftp.midnight-commander.org/${P}.tar.xz" +else + SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" fi @@ -21,14 +19,13 @@ HOMEPAGE="https://midnight-commander.org" LICENSE="GPL-3" SLOT="0" -IUSE="+edit gpm nls samba sftp +slang spell test unicode X" +IUSE="+edit gpm nls sftp +slang spell test unicode X" 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:=[unicode(+)?] ) @@ -38,15 +35,18 @@ RDEPEND=">=dev-libs/glib-2.26.0:2 x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) - " +" RESTRICT="!test? ( test )" +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." @@ -56,7 +56,15 @@ pkg_pretend() { src_prepare() { default - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh + if [[ ${PV} == *9999* ]] ; then + eautoreconf + # taken from autogen.sh script + xgettext --keyword=_ --keyword=N_ --keyword=Q_ --output=- \ + $(find . -name '*.[ch]') | sed -ne '/^#:/{s/#://;s/:[0-9]*/\ + /g;s/ //g;p;}' | grep -v '^$' | sort | uniq > po/POTFILES.in \ + || die + ./version.sh ${S} || die + fi } src_configure() { @@ -73,7 +81,6 @@ src_configure() { # 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) $(use_enable spell aspell) $(use_enable test tests) @@ -85,6 +92,12 @@ src_configure() { } src_test() { + # Bug #759466 + if [[ ${EUID} == 0 ]] ; then + ewarn "You are emerging ${PN} as root with 'userpriv' disabled." + ewarn "Expect some test failures, or emerge with 'FEATURES=userpriv'!" + fi + # CK_FORK=no to avoid using fork() in check library # as mc mocks fork() itself: bug #644462. # @@ -94,7 +107,7 @@ src_test() { } src_install() { emake DESTDIR="${D}" install - dodoc AUTHORS doc/{FAQ,NEWS,README} + dodoc AUTHORS NEWS README # fix bug #334383 if use kernel_linux && [[ ${EUID} == 0 ]] ; then