gentoo resync : 02.03.2018

4 files changed, 26 insertions, 28 deletions

diff --git a/sys-auth/openpam/Manifest b/sys-auth/openpam/Manifest
index d456ac97cbe2..9228bcdf3292 100644
--- a/sys-auth/openpam/Manifest
+++ b/sys-auth/openpam/Manifest
@@ -1,7 +1,7 @@
 AUX openpam-20130907-gentoo.patch 5832 BLAKE2B 994af413f1c2811ec09069f67ad2450a8bce721c1676905e83c15652c7e859022250404f2ae81b278df2fa08bc0610d3bc00cff3fb9dade94c37fd0edcf931cb SHA512 f4e8baefaa2113f6e864eebf6e9c596b229a06ea4038c4cf6f9ba96fd8347df7a7cbff691d54da0710b35440a766f0f2d411ccf19f66201508c227f6a4238cef
-AUX openpam-20130907-module-dir.patch 507 BLAKE2B af0b160ddbd380078f98c5deb443cd21ef39dacc8d61588512df11a2d26d04b788b3b0fcda7c3f4d36ccd87884863155140de5e68d8722f08f4c1fe319dcd2e3 SHA512 724af899dddc1932e841aba2f0fe94c18a1d944e5da35d0ff01438ebecb59888db0dbe66f3882aaca2b56661fd7a07afa5438c009baa704fc9e4534854e5c7bb
+AUX openpam-20130907-module-dir.patch 473 BLAKE2B 16537688c32fb31973195090505a897b4399edf3b43a39c92a62325df7ed1e0954cda4a3fcb12003590e0fb97f7060f143b3d68615ca23feea5eb882f7b41899 SHA512 03ba9ec79191bf248b65a50db75eaba52a5eb3a9c99fa2b64c02d5531910f90d1cbbbc274fd2bf3e6deabbcfc0239fad0d2cbadbec336794c0aba4078cee86a1
 AUX openpam-20130907-nbsd.patch 463 BLAKE2B ae2d50ba4569abbed0fdb127508b0571659a0fd545edafaef396abb74516e4176e42e2893770030424c584cd340d13338828997f0430bd9f7646c169166ff6d5 SHA512 8b9f8729830d47b47972ed3c7cbfca0c9bd5b87a245e0fb3e37594a247c89780f481ec3480285a829c1f86a90d591dc9778f6b2e2a57f718a5ec85d74a21af08
 DIST openpam-20140912.tar.gz 457600 BLAKE2B 8c963d9447c55a4f181e2524f9846d92038b3a5172e14ff0bad15ad7e595455896946f0dcf1d8f6dfcbc571ad01b8565447938a0fe9c001da39611d1d265f58a SHA512 c6cfbd669fe1b67af43a33c33bf2587e1512c27f1b96b9b38df37b81ecc4999d85e04b361b19a7265dbf271ebd3de3bd55342ee4fdbee9c68836b69714706423
-EBUILD openpam-20140912-r1.ebuild 1017 BLAKE2B b67e38340a4edef4b4ecf7aeb630fab475b29d51229297cf3e76a1a01b10251568f54abbeda44263c8c0401d9bd2582e1cd37dfa99b0cb8a021bdb235af89ca1 SHA512 3051b2ebf950039cd4b504d5d6fcb91847b7a945c395bdfc3e17b9c3e6c68ebb5d0b3a80bbd75037af141ce9dc0817f94c538d19a42b55c5167abd8310372d41
-EBUILD openpam-20140912.ebuild 1013 BLAKE2B 78fd65e4faf3d6b9c77aa7b53684cb160e0e11d36f09e727bd383caf5497e134e8bf741991b885241d092e0ee8da5e735cbaa1bfc5a1e3a85934296ebb98feb5 SHA512 0b6fa63fa8560fe8c7c7c52b4ca1fe66c6cb260d3936d7fa5ea5eed73df485b742f0a569a443964bdad8834dc11243ac057beaa8088423385cdc9a2c34749f42
+EBUILD openpam-20140912-r1.ebuild 970 BLAKE2B 5ae94a9dc3ef286cac9c3fa53138b1e6c94e38372387876fb396952eb3a5fabb368b7d366674e4f68032a064d238c4e7d5e334cde9a89d8107d797634dcd3468 SHA512 6e09d0eba5641053063c5c61950965fbced4b95cb7b511930f8a55f4d27a9654b24696bebe85f3ff5a58a6c6a5f51cfd31530f1969bc0e2f8035d51bbe65a4b2
+EBUILD openpam-20140912-r2.ebuild 914 BLAKE2B 094c8fa95d82b01e0b06b752ffd1938b2976ac524c1015447fbe1baba9a0bf6b81f40541f614fb8cfc73af0fda50f5dfe00ce02516be4d2f2259411588e72757 SHA512 92b9e073cc810382c302c201a37f89ccf154c7cf1fa9cd0bbd025f48b4293a1d3cdd6e334f4f93711d07c617e10a05a9ebee32793ee3cc5ac8d827aacbe70571
 MISC metadata.xml 319 BLAKE2B cd7e77def6913851b7c1ef25c47fe3e3548c076e5cb8f86a72886936b4f4601a70fe756f107433cddc1c2a26a0d826bd7e167d875b07003af54623bb4e0eadaf SHA512 e15befc8be39bc70ef094473b9e5fb9d2a504abf27b4217431c0ec707665b62e6a582876abaf280aa074e9f71637e792e9ce7e31d09d9d540502900e6a518975
diff --git a/sys-auth/openpam/files/openpam-20130907-module-dir.patch b/sys-auth/openpam/files/openpam-20130907-module-dir.patch
index 01afadbbfb8d..28c4414f9120 100644
--- a/sys-auth/openpam/files/openpam-20130907-module-dir.patch
+++ b/sys-auth/openpam/files/openpam-20130907-module-dir.patch
@@ -1,7 +1,7 @@
 diff --git a/openpam-20130907/lib/libpam/openpam_constants.c b/openpam-20130907/lib/libpam/openpam_constants.c
 index 1cdd810..f66e469 100644
---- a/openpam-20130907/lib/libpam/openpam_constants.c
-+++ b/openpam-20130907/lib/libpam/openpam_constants.c
+--- a/lib/libpam/openpam_constants.c
++++ b/lib/libpam/openpam_constants.c
 @@ -135,8 +135,8 @@ const char *openpam_policy_path[] = {
  };
  
diff --git a/sys-auth/openpam/openpam-20140912-r1.ebuild b/sys-auth/openpam/openpam-20140912-r1.ebuild
index 287db3f24eb6..35d3e7c9ef80 100644
--- a/sys-auth/openpam/openpam-20140912-r1.ebuild
+++ b/sys-auth/openpam/openpam-20140912-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="debug vim-syntax"
+IUSE="debug"
 
 RDEPEND="!sys-libs/pam"
 DEPEND="
@@ -23,8 +23,7 @@ DEPEND="
 	dev-lang/perl"
 
 PDEPEND="
-	sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
+	sys-auth/pambase"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20130907-gentoo.patch"
diff --git a/sys-auth/openpam/openpam-20140912.ebuild b/sys-auth/openpam/openpam-20140912-r2.ebuild
index f32258087444..50de35c46fe7 100644
--- a/sys-auth/openpam/openpam-20140912.ebuild
+++ b/sys-auth/openpam/openpam-20140912-r2.ebuild
@@ -1,12 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-
-inherit multilib autotools-multilib
+inherit autotools multilib-minimal
 
 DESCRIPTION="Open source PAM library"
 HOMEPAGE="http://www.openpam.org/"
@@ -15,35 +12,37 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~x86-fbsd"
-IUSE="debug vim-syntax"
+IUSE=""
 
 RDEPEND="!sys-libs/pam"
-DEPEND="sys-devel/make
+DEPEND="
+	sys-devel/make
 	dev-lang/perl"
-PDEPEND="sys-auth/pambase
-	vim-syntax? ( app-vim/pam-syntax )"
+
+PDEPEND="
+	sys-auth/pambase"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20130907-gentoo.patch"
 	"${FILESDIR}/${PN}-20130907-nbsd.patch"
 	"${FILESDIR}/${PN}-20130907-module-dir.patch"
-	)
-
-DOCS=( CREDITS HISTORY RELNOTES README )
+)
 
 src_prepare() {
 	sed -i -e 's:-Werror::' "${S}/configure.ac"
-
-	autotools-multilib_src_prepare
+	default
+	eautoreconf
 }
 
-my_configure() {
-	local myeconfargs=(
+multilib_src_configure() {
+	local myconf=(
 		--with-modules-dir=/$(get_libdir)/security
-		)
-	autotools-utils_src_configure
+	)
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
 }
 
-src_configure() {
-	multilib_parallel_foreach_abi my_configure
+multilib_src_install_all() {
+	dodoc CREDITS HISTORY RELNOTES README
+	find "${D}" -name '*.la' -delete || die
 }