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 03CF413933E for ; Thu, 22 Jul 2021 18:25:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22E2BE0C4B; Thu, 22 Jul 2021 18:25:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 F2C12E0C08 for ; Thu, 22 Jul 2021 18:25:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7D84B342A1E for ; Thu, 22 Jul 2021 18:25:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C33487DE for ; Thu, 22 Jul 2021 18:25:06 +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: <1626978297.dd1f25a19bdc00e0e2c3ad5a68a9f52d24a25ccf.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: dd1f25a19bdc00e0e2c3ad5a68a9f52d24a25ccf X-VCS-Branch: master Date: Thu, 22 Jul 2021 18:25:06 +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: 219cbfff-d28b-454c-a2c6-f0643fe5a603 X-Archives-Hash: d81810fd0ea098a3cc0c253cbe067379 commit: dd1f25a19bdc00e0e2c3ad5a68a9f52d24a25ccf Author: Lars Wendler gentoo org> AuthorDate: Thu Jul 22 18:20:38 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jul 22 18:24:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd1f25a1 sys-apps/util-linux: Synced live ebuild Signed-off-by: Lars Wendler gentoo.org> sys-apps/util-linux/util-linux-9999.ebuild | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index 58017396bb6..141bdf409cb 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -17,8 +17,7 @@ if [[ ${PV} == 9999 ]] ; then else [[ "${PV}" = *_rc* ]] || \ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz - https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" + SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" fi DESCRIPTION="Various useful Linux utilities" @@ -87,18 +86,6 @@ RESTRICT="!test? ( test )" S="${WORKDIR}/${MY_P}" -PATCHES=( -) - -rm_man() { - [[ -n $1 ]] || die - local el - for el in $1 ; do - find "${WORKDIR}/man" -type f -name "${el}.?" -delete \ - || die - done -} - src_prepare() { default @@ -117,14 +104,6 @@ src_prepare() { if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf - else - # Conditionally remove some man-pages - use hardlink || rm_man "hardlink" - use kill || rm_man "kill" - use logger || rm_man "logger" - use ncurses || rm_man "pg" - use su || rm_man "su" - use tty-helpers || rm_man "mesg wall write" fi elibtoolize @@ -320,10 +299,6 @@ multilib_src_install_all() { # e2fsprogs-libs didnt install .la files, and .pc work fine find "${ED}" -name "*.la" -delete || die - if [[ ${PV} != 9999 ]] ; then - doman "${WORKDIR}"/man/man*/* - fi - if ! use userland_GNU ; then # manpage collisions # TODO: figure out a good way to keep them