gentoo resync : 25.01.2018

5 files changed, 6 insertions, 80 deletions

diff --git a/sys-freebsd/freebsd-pam-modules/Manifest b/sys-freebsd/freebsd-pam-modules/Manifest
index 20ec95d71ac5..eef5f851d1a8 100644
--- a/sys-freebsd/freebsd-pam-modules/Manifest
+++ b/sys-freebsd/freebsd-pam-modules/Manifest
@@ -1,10 +1,7 @@
 AUX README.pamd 2840 BLAKE2B 06d8f86b6db63a0b401627a8e2cff0dcb7daa2b567b2d7f97f196db263956b95516495b3acc806cfaca448509638235a874845c088b898033e858e835c46fcba SHA512 7188bbb741bacbd2c826976f7f3b3150036f0855514ead679f56f0a4ab70fd6657fd38a33215cd883264ca2e801b7b2f3d7b73c40e04adc685e5fa6385c49357
-AUX freebsd-pam-modules-6.0-gentoo.patch 701 BLAKE2B dc275160427933eb9d84faef0665f56b6f3f934aa7fa7a31e4a7b94a985f88a92b85d025eb9cb7aa8f044fb373f39bbcb2c05357eeb70481e0a1dea26e865bd6 SHA512 7adba1261547c11bb1a0b0d3c8cc800bba9aca4a878c9fa63f8b68e270a3a0d54388eb1e156aadcba54d9dd23a2817232b3f287522d820da15abb7dd9c8cd995
 AUX freebsd-pam-modules-9.0-gentoo.patch 622 BLAKE2B 10d9b14b96d777d8b9e6294b74a42f579a894053047391db79beab6aa9e413059c5f6ad217cc8c80573ac6bc836329aefd17bdd0a8f22b06422b78d0d3e815f4 SHA512 752b593a8bea623110683a181deefd7126eaded7bf94973bcd994b2415db5739cd69a125ee9bd0c960fd5a3e30e3a2eaf8c711893f94966a9cc5a9b0c3191af0
-DIST freebsd-lib-8.2.tar.bz2 3323878 BLAKE2B b8c75ad89eddf68c611705302c6a66953e604743be4582badeea7817edc93d877dc5aba206fa437b46e82a0b4d27d3672efea7977b3abe461f90d3a7326fc0c1 SHA512 c059cfdd1099bb519b2a5c43fb7e7104c500ef8906229ed7eb9e420cb3a217cdaf8655e9e7a9f45cfadc5491f8115e0e738fd49251d9f0c3a83780845b09f007
 DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-EBUILD freebsd-pam-modules-11.1.ebuild 1035 BLAKE2B 6dfe4a5fc5b8dd5e982db7fd5e5da872e2d4df83e1eb0c0b454d2e80b5d216d77dd094d1472eca7cf9244db9d50a93dad30a8c1d6eb9da86093473218a0526a1 SHA512 150ba570785b63e2fea121de424a7a8a5c0e6a74c4d498f743d4b7377d55f3eef7db10cfb5b0ded06f39913d32eb68565f17043863d16097ec9ce9f4cc5a04e2
-EBUILD freebsd-pam-modules-8.2.ebuild 1123 BLAKE2B cf201d16028e3ee682279b33fbb22a92bdf567b28ad907478d6c533322116f7d32bb9bf58c144c2cf7f39e9201fd93e8dc0237ac558a926bcbe4898e4e2f1b62 SHA512 134d96116953ec37a82d8ca96673c9a83191c8cb6d5564800292f311fdd3d2f7c5b827bb7727855e6cad764850573345d88764a0b985704c2987cb58caa680f1
-EBUILD freebsd-pam-modules-9.1-r1.ebuild 1072 BLAKE2B e050425fd980a9ae6aeb1f6513a66e4ad2bf96e05c728a490ab5e00cf2ba89c8716726ff676b4e8f2c93e4b795a841fd828dc8763923177e85ee1d43afcd73d0 SHA512 d5a4f80a980481f368e99c319b81a548fbfa20ea72b3044755a1065b09dbf63519f412328e4eaac8752de593a9e01b07eca0f0187e98e588cf5f38c04d528273
+EBUILD freebsd-pam-modules-11.1.ebuild 1023 BLAKE2B 0f3e81814eff77c96b6ffb6d6469fb3bb63ca97b5d31125ca14cbca595809bd4015213bde430be10b41d7995f91f3ff35f1218be7bc43ff87b5669444abb4d6c SHA512 f2fdb23d324125a06535dab07d753878ebbeb561e3e6a0f9d5ea0cc94664199675a7c1b2410d21adad627440920813cff68fd4c09f043fcf6b09a4798f0b3710
+EBUILD freebsd-pam-modules-9.1-r1.ebuild 1060 BLAKE2B 63dd7114a3d63459d8760d496bc58c396989cbb2c3e8ddb6d1cad972ac931861ae9edc873fc5e5800cec2e4d3aa1a805950276d4f9abd13326c3d8c87c2fe2cf SHA512 a8dadd3c595ce8303592dfa81c7cbfe524a1b75183d66229b7c0948e5d7b49e5f7b82bad004e6478c94a67c2bcb998ad273b9ab7cf183276f6eb016cf45feb5a
 MISC metadata.xml 238 BLAKE2B 5d18b211ca67cdae4e0f4d6e1598b20b39a471aa07326791c53bb4e1013607b85bac28a64c1939e53b01228d0c9b7814314b95c0f76928de265d95ef7ee6cd45 SHA512 173efaa53a514acf1e2f0c6681c82a48ec16d505844f551d2cc823ee8685b27837c7461f7956c12182059ee7e83023e2f0bcd5d1afab74beeaf998487193656d
diff --git a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch b/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
deleted file mode 100644
index ce1a7fbff8c6..000000000000
--- a/sys-freebsd/freebsd-pam-modules/files/freebsd-pam-modules-6.0-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: fbsd-6.0/lib/libpam/modules/Makefile.inc
-===================================================================
---- fbsd-6.0.orig/lib/libpam/modules/Makefile.inc
-+++ fbsd-6.0/lib/libpam/modules/Makefile.inc
-@@ -5,18 +5,10 @@ PAMDIR=		${.CURDIR}/../../../../contrib/
- NO_INSTALLLIB=
- NO_PROFILE=
- 
--CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam
-+CFLAGS+= -I${.CURDIR}/../../libpam
- WARNS?=	4
- 
--# This is nasty.
--# For the static case, libpam.a depends on the modules.
--# For the dynamic case, the modules depend on libpam.so.N
--.if defined(_NO_LIBPAM_SO_YET)
--NO_PIC=
--.else
- SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
--DPADD+=		${LIBPAM}
- LDADD+=		-lpam
--.endif
- 
- .include "../Makefile.inc"
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
index 4c29c927a781..058bd4a6a812 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SLOT="0"
 IUSE="kerberos nis"
 
 if [[ ${PV} != *9999* ]]; then
-	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="~amd64-fbsd ~x86-fbsd"
 fi
 
 EXTRACTONLY="lib/"
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild
deleted file mode 100644
index a04f7b0eb72d..000000000000
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-8.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit bsdmk freebsd multilib pam
-
-DESCRIPTION="FreeBSD's PAM authentication modules"
-SLOT="0"
-KEYWORDS="~x86-fbsd ~sparc-fbsd"
-
-IUSE="kerberos nis"
-
-SRC_URI="mirror://gentoo/${LIB}.tar.bz2"
-
-RDEPEND=">=sys-auth/openpam-20050201-r1
-	kerberos? ( dev-libs/openssl
-		virtual/krb5 )"
-DEPEND="${RDEPEND}
-	=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-sources-${RV}*"
-
-S=${WORKDIR}/lib/libpam/modules
-
-pkg_setup() {
-	# Avoid installing pam_ssh as that has its own ebuild.
-	mymakeopts="${mymakeopts} NO_OPENSSH= "
-	use kerberos || mymakeopts="${mymakeopts} NO_KERBEROS= "
-	use nis || mymakeopts="${mymakeopts} NO_NIS= "
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}"/lib
-
-	for module in pam_deny pam_passwdqc pam_permit; do
-		sed -i -e "s:${module}::" "${S}"/modules.inc
-	done
-
-	# Avoid using static versions; use gentoo /lib/security dir
-	epatch "${FILESDIR}"/${PN}-6.0-gentoo.patch
-}
-
-src_install() {
-	mkinstall "LIBDIR=/$(get_libdir)/security" || die "install failed"
-
-	dodoc "${FILESDIR}/README.pamd"
-}
diff --git a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
index 0d4662e54e14..ec99d87c211d 100644
--- a/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
+++ b/sys-freebsd/freebsd-pam-modules/freebsd-pam-modules-9.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit bsdmk freebsd multilib pam
 
 DESCRIPTION="FreeBSD's PAM authentication modules"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~amd64-fbsd ~x86-fbsd"
 
 IUSE="kerberos nis"