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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB655138335 for ; Sun, 16 Jun 2019 23:27:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A06E6E08B1; Sun, 16 Jun 2019 23:27:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 76EAEE08B1 for ; Sun, 16 Jun 2019 23:27:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7724134627E for ; Sun, 16 Jun 2019 23:27:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5057B57E for ; Sun, 16 Jun 2019 23:27:08 +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: <1560727153.564494cb96413251d7cfe33fccec2593ead982f7.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 564494cb96413251d7cfe33fccec2593ead982f7 X-VCS-Branch: master Date: Sun, 16 Jun 2019 23:27:08 +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: 41896d57-b700-4a4a-94c4-418af5c5404c X-Archives-Hash: 979042285f66cc05ba5830a0a1263610 commit: 564494cb96413251d7cfe33fccec2593ead982f7 Author: Lars Wendler gentoo org> AuthorDate: Sun Jun 16 23:19:13 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sun Jun 16 23:19:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564494cb sys-apps/util-linux: Synced live ebuild Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Lars Wendler gentoo.org> sys-apps/util-linux/util-linux-9999.ebuild | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 6940636a7b1..efc59ae7357 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) @@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" fi @@ -25,11 +25,13 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/ LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" SLOT="0" -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" +IUSE="build caps +cramfs fdformat hardlink kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU" # Most lib deps here are related to programs rather than our libs, # so we rarely need to specify ${MULTILIB_USEDEP}. -RDEPEND="caps? ( sys-libs/libcap-ng ) +DEPEND=" + virtual/os-headers + caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib:= ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) @@ -40,12 +42,13 @@ RDEPEND="caps? ( sys-libs/libcap-ng ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= )" -DEPEND="${RDEPEND} +BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( sys-devel/bc ) - virtual/os-headers" -RDEPEND+=" +" +RDEPEND="${DEPEND} + hardlink? ( !app-arch/hardlink ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] @@ -172,6 +175,7 @@ multilib_src_configure() { $(use_enable caps setpriv) $(use_enable cramfs) $(use_enable fdformat) + $(use_enable hardlink) $(use_enable tty-helpers mesg) $(use_enable tty-helpers wall) $(use_enable tty-helpers write) @@ -258,7 +262,7 @@ multilib_src_install_all() { if ! use userland_GNU; then # manpage collisions # TODO: figure out a good way to keep them - rm "${ED%/}"/usr/share/man/man3/uuid* || die + rm "${ED}"/usr/share/man/man3/uuid* || die fi if use pam; then