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 82DCF1396D1 for ; Mon, 14 Aug 2017 13:36:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5D43E0DF9; Mon, 14 Aug 2017 13:36:25 +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 B425DE0DF9 for ; Mon, 14 Aug 2017 13:36:25 +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 A269D341801 for ; Mon, 14 Aug 2017 13:36:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D9447854 for ; Mon, 14 Aug 2017 13:36:20 +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: <1502717770.f917c3be712532a2d71a3ed79e0bac3e52162564.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: f917c3be712532a2d71a3ed79e0bac3e52162564 X-VCS-Branch: master Date: Mon, 14 Aug 2017 13:36:20 +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-Archives-Salt: f3347399-cf89-41d8-a47c-84566a133246 X-Archives-Hash: 449f0e731fa3017c1165fd1f3a60d4ae commit: f917c3be712532a2d71a3ed79e0bac3e52162564 Author: Lars Wendler gentoo org> AuthorDate: Mon Aug 14 13:18:58 2017 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Aug 14 13:36:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f917c3be sys-apps/util-linux: Synced live ebuild. Package-Manager: Portage-2.3.7, Repoman-2.3.3 sys-apps/util-linux/util-linux-9999.ebuild | 31 +++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index c86046927fc..c8d83a120f7 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ - python-single-r1 multilib-minimal systemd +inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + pam python-single-r1 multilib-minimal systemd -MY_PV=${PV/_/-} -MY_P=${PN}-${MY_PV} +MY_PV="${PV/_/-}" +MY_P="${PN}-${MY_PV}" if [[ ${PV} == 9999 ]] ; then - inherit git-2 autotools + inherit git-r3 autotools EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" else [[ "${PV}" = *_rc* ]] || \ @@ -66,13 +66,18 @@ pkg_setup() { } src_prepare() { + default + if [[ ${PV} == 9999 ]] ; then po/update-potfiles eautoreconf fi + # Undo bad ncurses handling by upstream. #601530 + sed -i -E \ + -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ + -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ + configure || die elibtoolize - - epatch_user } lfs_fallocate_test() { @@ -113,7 +118,7 @@ multilib_src_configure() { --enable-rename --enable-schedutils --with-bashcompletiondir="$(get_bashcompdir)" - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") $(multilib_native_use_enable caps setpriv) $(multilib_native_use_enable cramfs) $(multilib_native_use_enable fdformat) @@ -137,8 +142,7 @@ multilib_src_configure() { $(use_with selinux) $(usex ncurses '' '--without-tinfo') ) - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_compile() { @@ -178,6 +182,11 @@ multilib_src_install_all() { # e2fsprogs-libs didnt install .la files, and .pc work fine prune_libtool_files + + if use pam; then + newpamd "${FILESDIR}/runuser.pamd" runuser + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l + fi } pkg_postinst() {