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 97245138351 for ; Tue, 14 Jan 2020 20:28:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92FA3E08AB; Tue, 14 Jan 2020 20:28:37 +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 789FFE08AB for ; Tue, 14 Jan 2020 20:28:37 +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 039C834E079 for ; Tue, 14 Jan 2020 20:28:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5DD5338 for ; Tue, 14 Jan 2020 20:28:33 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1579033589.3caa563c8fe02e52e7b68beac9ca8415442767a8.blueness@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-libs/pam/ X-VCS-Repository: proj/musl X-VCS-Files: sys-libs/pam/pam-1.3.1-r1.ebuild X-VCS-Directories: sys-libs/pam/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 3caa563c8fe02e52e7b68beac9ca8415442767a8 X-VCS-Branch: master Date: Tue, 14 Jan 2020 20:28:33 +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: ff49383a-1d54-4255-a66e-0c0e4d5abf6d X-Archives-Hash: 6482fefd402d2451725d01a1ef9e7138 commit: 3caa563c8fe02e52e7b68beac9ca8415442767a8 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Jan 14 20:26:29 2020 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Jan 14 20:26:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=3caa563c sys-libs/pam: sync with in tree version Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Anthony G. Basile gentoo.org> sys-libs/pam/pam-1.3.1-r1.ebuild | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/sys-libs/pam/pam-1.3.1-r1.ebuild b/sys-libs/pam/pam-1.3.1-r1.ebuild index 7b0d253..8f9f1d0 100644 --- a/sys-libs/pam/pam-1.3.1-r1.ebuild +++ b/sys-libs/pam/pam-1.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,6 +22,7 @@ BDEPEND="app-text/docbook-xml-dtd:4.1.2 sys-devel/flex virtual/pkgconfig[${MULTILIB_USEDEP}] nls? ( sys-devel/gettext )" + DEPEND=" audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] ) berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) @@ -29,9 +30,8 @@ DEPEND=" selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] ) nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - !sys-auth/openpam - !sys-auth/pam_userdb" + +RDEPEND="${DEPEND}" PDEPEND="sys-auth/pambase" @@ -87,21 +87,7 @@ multilib_src_install() { emake DESTDIR="${D}" install \ sepermitlockdir="${EPREFIX}/run/sepermit" - local prefix - if multilib_is_native_abi; then - prefix= - gen_usr_ldscript -a pam pamc pam_misc - else - prefix=/usr - fi - - # create extra symlinks just in case something depends on them... - local lib - for lib in pam pamc pam_misc; do - if ! [[ -f "${ED}"${prefix}/$(get_libdir)/lib${lib}$(get_libname) ]]; then - dosym lib${lib}$(get_libname 0) ${prefix}/$(get_libdir)/lib${lib}$(get_libname) - fi - done + gen_usr_ldscript -a pam pam_misc pamc } multilib_src_install_all() {