[gentoo-commits] repo/gentoo:master commit in: sys-libs/pam/

[Patrice Clement]

commit:     f33249bcab88984ef948ee475ebd47024c9c1733
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  9 19:25:09 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 22:22:10 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f33249bc

sys-libs/pam: remove app-vim/pam-syntax rependency.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-libs/pam/{pam-1.3.0.ebuild => pam-1.3.0-r2.ebuild} | 17 ++++++++++++-----
 sys-libs/pam/pam-1.3.0.ebuild                          |  8 +++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/sys-libs/pam/pam-1.3.0.ebuild b/sys-libs/pam/pam-1.3.0-r2.ebuild
similarity index 97%
copy from sys-libs/pam/pam-1.3.0.ebuild
copy to sys-libs/pam/pam-1.3.0-r2.ebuild
index 14a9ccc30e7..ee426cd8d88 100644
--- a/sys-libs/pam/pam-1.3.0.ebuild
+++ b/sys-libs/pam/pam-1.3.0-r2.ebuild
@@ -18,20 +18,27 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="audit berkdb cracklib debug nis nls +pie selinux test vim-syntax"
 
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+RDEPEND="
+       nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
        cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
        audit? ( >=sys-process/audit-2.2.2[${MULTILIB_USEDEP}] )
        selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
        berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
        nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
+
+DEPEND="
+       ${RDEPEND}
        >=sys-devel/libtool-2
        >=sys-devel/flex-2.5.39-r1[${MULTILIB_USEDEP}]
        nls? ( sys-devel/gettext )
        nis? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )"
-PDEPEND="sys-auth/pambase
-       vim-syntax? ( app-vim/pam-syntax )"
-RDEPEND="${RDEPEND}
+
+PDEPEND="
+       sys-auth/pambase
+       vim-syntax? ( app-editors/vim )"
+
+RDEPEND="
+       ${RDEPEND}
        !<sys-apps/openrc-0.11.8
        !sys-auth/openpam
        !sys-auth/pam_userdb"

diff --git a/sys-libs/pam/pam-1.3.0.ebuild b/sys-libs/pam/pam-1.3.0.ebuild
index 14a9ccc30e7..cacebd65431 100644
--- a/sys-libs/pam/pam-1.3.0.ebuild
+++ b/sys-libs/pam/pam-1.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="audit berkdb cracklib debug nis nls +pie selinux test vim-syntax"
+IUSE="audit berkdb cracklib debug nis nls +pie selinux test"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
        cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
@@ -24,13 +24,15 @@ RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
        selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
        berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
        nis? ( >=net-libs/libtirpc-0.2.4-r2[${MULTILIB_USEDEP}] )"
+
 DEPEND="${RDEPEND}
        >=sys-devel/libtool-2
        >=sys-devel/flex-2.5.39-r1[${MULTILIB_USEDEP}]
        nls? ( sys-devel/gettext )
        nis? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )"
-PDEPEND="sys-auth/pambase
-       vim-syntax? ( app-vim/pam-syntax )"
+
+PDEPEND="sys-auth/pambase"
+
 RDEPEND="${RDEPEND}
        !<sys-apps/openrc-0.11.8
        !sys-auth/openpam