gentoo resync : 20.12.2017

11 files changed, 25 insertions, 412 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 6938233cf7ac..ca277dbb7a74 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 2c578b660199..9173dd589b29 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -41,6 +41,6 @@ EBUILD glibc-2.22-r4.ebuild 5009 BLAKE2B c627e49eef4e48b62d1f2f464da61f9d77de1f3
 EBUILD glibc-2.23-r4.ebuild 5011 BLAKE2B 5b002c214f74b9eeb1c5898c32560bd7b8f865138fd7c4851887f3f81be98635285344eca8cb88264b3b527b8a3dd1f03008beb642461a8fcb98ea309c08ee3e SHA512 3695c8acea09838cc79c33379cfcaf0eb774759f3af5863892ff9c63732926764a8a5187ab9aaccdfd358d62c0884feab95a7055735c9295549d5c8f0c198221
 EBUILD glibc-2.24-r4.ebuild 5047 BLAKE2B 295eeb6cecff9f9b33d428a3f52d68a5af0c92ab239a6086164593b63338cf7a841f3cde2891cb108859ea41d2b9993884411d132a8db787d2cc06e9a7087cdf SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2
 EBUILD glibc-2.25-r9.ebuild 5039 BLAKE2B 0706fb07b8ebe4c746e0654274a7a7ee60e197e8765b8f78995af7b0ed11327628ccb5addfe423205e63f00990b19e1d1a6c22104ca437966d947ad2913354fb SHA512 bbcfc6992111c0b8a4638c0d1fe45c1f95f9f03a3db79afbd2a7a61f4736d38810f191bbb0cc4cecdedf4485c2586419f867587084575c5f50e5e7b7cea7228b
-EBUILD glibc-2.26-r3.ebuild 24943 BLAKE2B 42d1721d3cc9621368983e0933917c0ba7c67c1472d8cdac35112030d65c8dd4578a214d2546acb22c306ffcad29ba9c72c4d940f523578160c0b6ca35c9dbc8 SHA512 af5463d3757b70cbfffc3d2c7b82e30ada86de8d0aeb105dc3708d23bbd1beb444c0f0ceb948fd10594697e5a590085fac2dc8675fc856d93774d1d772bf65c5
+EBUILD glibc-2.26-r3.ebuild 25373 BLAKE2B b39fb75551e268f4942457d3aa8a06b7e707032ba68388d8303f43bb047299ce976844384d28c0de7d9a0947a769fe7f96beabb4a60c45790465a0fe4c92a556 SHA512 fb21295d3bc781df3882b3eabb1f3d95d7d1465bfd28a4bd45a79a593c3ad61f042d147c0d1dc835e206a3e0fff975724a1295725fbe81a8718307d315719ccd
 EBUILD glibc-9999.ebuild 25185 BLAKE2B e68de57a706879b932db7089c9981107bb9cac9056f1607800fa1f5e452cb4369f14d30596ea77adf92f562d3ef646600bdaa15515ade14fd85e11ff4063d8b4 SHA512 2f10ca2c5535a4c542ee4a8141841a501c738d07715da1e0e2f70da4cccb54ff28bee9f90917fa26ad32779f48f446c96d73e1601b037bad70a40665f1eaeafe
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild
index ceb5b6846859..b936a612e1fb 100644
--- a/sys-libs/glibc/glibc-2.26-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r3.ebuild
@@ -342,6 +342,17 @@ glibc_do_configure() {
 	esac
 	myconf+=( --enable-stackguard-randomization )
 
+	# Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+	# is not robust enough to detect proper support:
+	#    https://bugs.gentoo.org/641216
+	#    https://sourceware.org/PR22634#c0
+	case $(tc-arch ${CTARGET}) in
+		# Keep whitelist of targets where autodetection mostly works.
+		amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+		# Blacklist everywhere else
+		*) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+	esac
+
 	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
 
 	if [[ $1 == "nptl" ]] ; then
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index b616bce03f5a..9994020aa3c0 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,5 +1,5 @@
 DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
 DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3
-EBUILD libblockdev-2.14-r1.ebuild 1463 BLAKE2B 52be223fc58ef3941c633e088e52a4cf19385c4d87ddc4fb3c5557e84a2d98ca635719aa81e1b28b143dd5807a2433facdc499c8941fe0ea3bd042bfcc29daaf SHA512 c3538ca04a1c5f19eeece1b34b2dce5dd6f51d6512a1e0064c599650c2a0eccdae6a0c707ced729350d568cd2985fdbec236543a867947a49d2ed36fdc5fcb67
-EBUILD libblockdev-2.15-r1.ebuild 1465 BLAKE2B 1d92fb06dd31fed407d7fb81bc84e321a00a7b3fcff65357d8863cbcc8dc50cab22c2a24f5b2c7ef835d5ef33c3232a81f59372fa92ecf5b9767a6ed48f5cc72 SHA512 6c949c0ee8cdaa31089bbb3c2a534f41fd6b486e3d6ab27843744976fb8b450ee8852389fbae072fa70c95b1ef6fbb64c17f795a57e51aedb2299f160460beca
+EBUILD libblockdev-2.14-r1.ebuild 1477 BLAKE2B 683242711e05bea3fd429d2bbdbca4f3355331629d50843623be467105184e8c4588df743c7f11f955b0f48bfcb1a603773ee8bd90d78e8a25247a99ba39e5b1 SHA512 b863b56bed6b797ddded0706d06a22f3d6406f898787117b4a55b1db526877544dd5e42071c8ca8b28c04a97ee05106155d5eb6833aaa4f4c9be1b22d88c342d
+EBUILD libblockdev-2.15-r1.ebuild 1479 BLAKE2B 97b45c9326153dd6be11594b808f6c5304b273d92fc61c7f66d6d2a36ae920907e8c079e0008311dfdd2bd817412e98a50f88efc6931ba79d7fa41e12fc08bfb SHA512 a25739dd9021976e765e9d311a41b6303917bc8bb404f414187a139721790a1e9ad38a25c364a0c0aa68d103ed6c432d5094833f6fd9e85d0ac081a64f4c5db1
 MISC metadata.xml 778 BLAKE2B 947d9ebb0bc42060edb67afe6a1deeaf674fb6be53e8e0f53ba782e01b71e76451eae9a374f949b43f9f7894d560d253cb1d3e19bf3661ea141a7cc995a349f7 SHA512 9cb1e613e6ea196921ad0d047334e70c5a11fe819796cac97ec9bb89f30221c58134f3cc90d24fde1f0d22af8290b8f507bc8145a3e2ca0957603cb6cada6436
diff --git a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
index 97d5e9685f53..f6c6ea77308f 100644
--- a/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.14-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rhinstaller/libblockdev"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
@@ -25,7 +25,7 @@ CDEPEND="
 	cryptsetup? (
 		>=dev-libs/nss-3.18.0
 		dev-libs/volume_key
-		>=sys-fs/cryptsetup-1.6.7
+		>=sys-fs/cryptsetup-1.6.7:=
 	)
 	dmraid? (
 		sys-fs/dmraid
diff --git a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
index e4528c494496..ac5b3b314a1e 100644
--- a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rhinstaller/libblockdev"
 SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
 
 CDEPEND="
@@ -25,7 +25,7 @@ CDEPEND="
 	cryptsetup? (
 		>=dev-libs/nss-3.18.0
 		dev-libs/volume_key
-		>=sys-fs/cryptsetup-1.6.7
+		>=sys-fs/cryptsetup-1.6.7:=
 	)
 	dmraid? (
 		sys-fs/dmraid
diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index 143acc88ffce..5b69b47f328b 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -2,8 +2,6 @@ DIST Linux-PAM-1.2.0-docs.tar.bz2 490586 BLAKE2B 1b4b6a7a2988f3f3e9f74edab9a4713
 DIST Linux-PAM-1.2.1.tar.bz2 1279523 BLAKE2B 246f3742bcf1c6dc0fe0c3d203ec6262c59093b75170d1a376a6080540d638551bed2d7f6f193bb583c34f8fbc742d904dfc3e6f1776dc4479914485c6ce15d4 SHA512 4572aa1eaf5a1312410c74b5ed055b2592c5efe2bb82f59981da4e9e93555ad40aee3a89f446d9dc6c6af79efc04c33f739f66db9edc07e02479475a14e426da
 DIST Linux-PAM-1.3.0-docs.tar.bz2 492805 BLAKE2B 1dd48f65ae76e0d4d2c02664f9a2adac127604a7552ff70c378323a0de8141445332430205946823097170edf217122196ea03ae665284751fed3748d9f8ac3d SHA512 b6b8497e6a4307b3f9a2af1c74456a0577b848cbc5417fb88fabe305b67ca022a6bcf632d68faaaacc701cdcf6254ec196707551a1ea70985cdde6add68bbbfe
 DIST Linux-PAM-1.3.0.tar.bz2 1302820 BLAKE2B 0ed5553308e8bc4bef91746a1c79db41bf5f0a48a31796d5a13819387c0a04d553efa210435273ad8565d0a53f354817bc3e0f254e35a5e75b7b7b586cad5d16 SHA512 4a89ca4b6f4676107aca4018f7c11addf03495266b209cb11c913f8b5d191d9a1f72197715dcf2a69216b4036de88780bcbbb5a8652e386910d71ba1b6282e42
-EBUILD pam-1.2.1-r1.ebuild 6334 BLAKE2B 783466e7ccdefedbf9b2422ff1ad5e3c69e3772636effacc2ce547e8f5c768dfe856c32e96e54852e900d91e53c56a2dca0950ad64955b00f3c78eb51a4b6fc6 SHA512 32a6c36f328b7f51a297e6db24877b9e304696e94531aa08627b88997c2040fa7cd0359352b265cdefb44167e13c59c33c1598bc1808d2dc99f8a2173ea67e90
-EBUILD pam-1.2.1.ebuild 6096 BLAKE2B bc8c0cdf1904038c411b678e5b22f59a21ae52635b773c6abaa7f24f0adbf25b5415285f3f00f20a41f021e53df607dee65d4c6d9702d82f1d9790ab7cc2c9cd SHA512 0d3d9292c2eed4fd83076f4920588d69c411ec4d0ec1fbf714145f7a16895bb10659f4259706747f1f1c91efe6180a5a888ef8dc60612a00d409d5389a41a6e8
-EBUILD pam-1.3.0-r1.ebuild 6038 BLAKE2B 7d578c5e57995c43f041960e26dd447c67b5c80c5b5d401baffc02bec9ad79dfbe341e7af8e1f4176729f234f54c68d69d18a7733b22d336bd7c6196c948378b SHA512 6cd044b70f2952441015db1f156b9a5b132b25f9d61e2c2bda92eced9b9867993476f9c09682dbe7c7c2ad2b2067f0f4baf224deeeb5cc49c3726016e67d1755
-EBUILD pam-1.3.0.ebuild 6030 BLAKE2B 0b8da45dde209e46128a64baccaaa90a620a1935646db6bfa8656046511d6a5ceffd662e1ba568e3a221e8f96e10801468d7c276eed6a5c76d3f0d05bd726490 SHA512 13b3b4e1ea3eb8da2e58d1654b1ee60242abe029ca9f98b1169d9d11cef1c7a83ce5b41652f264d0b36f3345bd1ad3566b3066cefd39340b61abcc41b95d4e69
+EBUILD pam-1.2.1-r2.ebuild 6276 BLAKE2B b797e8ddcd6838861754d8fa60d35f4eb1f6997dc4945b53206bf75fd9fd6c0f883db9fc70d395a47bef792e9caa7a74f113919d17b1af096da6adec399c95ca SHA512 284415d23a27e861dc5a50e73ab45d3ad72fb4e8de522f0ccb866716ccd13ca6353814b33a866afc4cfe9b8fee574be7fdd8e7dc8dcc6ffb12fa51cfd8708474
+EBUILD pam-1.3.0-r2.ebuild 6038 BLAKE2B 7d578c5e57995c43f041960e26dd447c67b5c80c5b5d401baffc02bec9ad79dfbe341e7af8e1f4176729f234f54c68d69d18a7733b22d336bd7c6196c948378b SHA512 6cd044b70f2952441015db1f156b9a5b132b25f9d61e2c2bda92eced9b9867993476f9c09682dbe7c7c2ad2b2067f0f4baf224deeeb5cc49c3726016e67d1755
 MISC metadata.xml 1135 BLAKE2B 60f9755133a79fbab65834d70360b430c2e0ec097647d640ddbec0b74ee86fbba65eed8600c49386aa01d1a78d55dc3b47f58a97eb62572d2fabd6b18eb7868d SHA512 de2a617918085c4e6a7a1976447ed2c0bcdb8eb257d28351e095b29ea219382ce8964206ba0fcdefe9b69db9ab17a52556371cfbee3ed4d5c5293c8d21738d55
diff --git a/sys-libs/pam/pam-1.2.1-r1.ebuild b/sys-libs/pam/pam-1.2.1-r2.ebuild
index 65ce86df7cb5..d8857d6f1434 100644
--- a/sys-libs/pam/pam-1.2.1-r1.ebuild
+++ b/sys-libs/pam/pam-1.2.1-r2.ebuild
@@ -15,8 +15,8 @@ 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"
+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"
 
 RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
 	cracklib? ( >=sys-libs/cracklib-2.9.1-r1[${MULTILIB_USEDEP}] )
@@ -24,13 +24,14 @@ 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
diff --git a/sys-libs/pam/pam-1.2.1.ebuild b/sys-libs/pam/pam-1.2.1.ebuild
deleted file mode 100644
index e154b4c88b17..000000000000
--- a/sys-libs/pam/pam-1.2.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-HOMEPAGE="http://www.linux-pam.org/ https://fedorahosted.org/linux-pam/"
-SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
-	http://www.linux-pam.org/documentation/${MY_PN}-1.2.0-docs.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"
-
-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}
-	>=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}
-	!<sys-apps/openrc-0.11.8
-	!sys-auth/openpam
-	!sys-auth/pam_userdb
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20140508-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no longer supported, and since version"
-		eerror "0.99 is no longer installed, nor provided by any other package."
-		eerror "The package will be built (to allow binary package builds), but will"
-		eerror "not be installed."
-		eerror "Please replace pam_stack usage with proper include directive usage,"
-		eerror "following the PAM Upgrade guide at the following URL"
-		eerror "  https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99"
-		eerror ""
-
-		retval=1
-	fi
-
-	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then
-		eerror ""
-		eerror "Your current setup is using one or more of the following modules,"
-		eerror "that are not built or supported anymore:"
-		eerror "pam_pwdb, pam_console"
-		eerror "If you are in real need for these modules, please contact the maintainers"
-		eerror "of PAM through https://bugs.gentoo.org/ providing information about its"
-		eerror "use cases."
-		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
-		eerror "  https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99"
-		eerror ""
-
-		retval=1
-	fi
-
-	return ${retval}
-}
-
-pkg_pretend() {
-	# do not error out, this is just a warning, one could build a binpkg
-	# with old modules enabled.
-	check_old_modules
-}
-
-src_unpack() {
-	# Upstream didn't release a new doc tarball (since nothing changed?).
-	unpack ${MY_PN}-1.2.0-docs.tar.bz2
-	mv Linux-PAM-1.2.{0,1} || die
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Do not let user's BROWSER setting mess us up. #549684
-	unset BROWSER
-
-	# Disable automatic detection of libxcrypt; we _don't_ want the
-	# user to link libxcrypt in by default, since we won't track the
-	# dependency and allow to break PAM this way.
-	export ac_cv_header_xcrypt_h=no
-
-	local myconf=(
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
-		--libdir='$(prefix)'/$(get_libdir)
-		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
-		--enable-isadir='.' #464016
-		$(use_enable nls)
-		$(use_enable selinux)
-		$(use_enable cracklib)
-		$(use_enable audit)
-		$(use_enable debug)
-		$(use_enable berkdb db)
-		$(use_enable nis)
-		$(use_enable pie)
-		--with-db-uniquename=-$(db_findver sys-libs/db)
-		--disable-prelude
-		--disable-regenerate-docu
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake sepermitlockdir="${EPREFIX}/run/sepermit"
-}
-
-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
-}
-
-DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS )
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	# Need to be suid
-	fperms 4711 /sbin/unix_chkpwd
-
-	docinto modules
-	local dir
-	for dir in modules/pam_*; do
-		newdoc "${dir}"/README README."$(basename "${dir}")"
-	done
-
-	if use selinux; then
-		dodir /usr/lib/tmpfiles.d
-		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/sepermit 0755 root root
-EOF
-	fi
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}
-
-pkg_postinst() {
-	ewarn "Some software with pre-loaded PAM libraries might experience"
-	ewarn "warnings or failures related to missing symbols and/or versions"
-	ewarn "after any update. While unfortunate this is a limit of the"
-	ewarn "implementation of PAM and the software, and it requires you to"
-	ewarn "restart the software manually after the update."
-	ewarn ""
-	ewarn "You can get a list of such software running a command like"
-	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
-	ewarn ""
-	ewarn "Alternatively, simply reboot your system."
-	if [[ -x "${EROOT}"/var/log/tallylog ]] ; then
-		elog ""
-		elog "Because of a bug present up to version 1.1.1-r2, you have"
-		elog "an executable /var/log/tallylog file. You can safely"
-		elog "correct it by running the command"
-		elog "  chmod -x /var/log/tallylog"
-		elog ""
-	fi
-}
diff --git a/sys-libs/pam/pam-1.3.0-r1.ebuild b/sys-libs/pam/pam-1.3.0-r2.ebuild
index ee426cd8d88b..ee426cd8d88b 100644
--- a/sys-libs/pam/pam-1.3.0-r1.ebuild
+++ b/sys-libs/pam/pam-1.3.0-r2.ebuild
diff --git a/sys-libs/pam/pam-1.3.0.ebuild b/sys-libs/pam/pam-1.3.0.ebuild
deleted file mode 100644
index 14a9ccc30e79..000000000000
--- a/sys-libs/pam/pam-1.3.0.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit libtool multilib multilib-minimal eutils pam toolchain-funcs flag-o-matic db-use fcaps
-
-MY_PN="Linux-PAM"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Linux-PAM (Pluggable Authentication Modules)"
-HOMEPAGE="http://www.linux-pam.org/ https://fedorahosted.org/linux-pam/"
-SRC_URI="http://www.linux-pam.org/library/${MY_P}.tar.bz2
-	http://www.linux-pam.org/library/${MY_P}-docs.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"
-
-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}
-	>=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}
-	!<sys-apps/openrc-0.11.8
-	!sys-auth/openpam
-	!sys-auth/pam_userdb"
-
-S="${WORKDIR}/${MY_P}"
-
-check_old_modules() {
-	local retval="0"
-
-	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | fgrep -q pam_stack.so; then
-		eerror ""
-		eerror "Your current setup is using the pam_stack module."
-		eerror "This module is deprecated and no longer supported, and since version"
-		eerror "0.99 is no longer installed, nor provided by any other package."
-		eerror "The package will be built (to allow binary package builds), but will"
-		eerror "not be installed."
-		eerror "Please replace pam_stack usage with proper include directive usage,"
-		eerror "following the PAM Upgrade guide at the following URL"
-		eerror "  https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99"
-		eerror ""
-
-		retval=1
-	fi
-
-	if sed -e 's:#.*::' "${EROOT}"/etc/pam.d/* 2>/dev/null | egrep -q 'pam_(pwdb|console)'; then
-		eerror ""
-		eerror "Your current setup is using one or more of the following modules,"
-		eerror "that are not built or supported anymore:"
-		eerror "pam_pwdb, pam_console"
-		eerror "If you are in real need for these modules, please contact the maintainers"
-		eerror "of PAM through https://bugs.gentoo.org/ providing information about its"
-		eerror "use cases."
-		eerror "Please also make sure to read the PAM Upgrade guide at the following URL:"
-		eerror "  https://wiki.gentoo.org/wiki/Project:PAM/Upgrade_to_0.99"
-		eerror ""
-
-		retval=1
-	fi
-
-	return ${retval}
-}
-
-pkg_pretend() {
-	# do not error out, this is just a warning, one could build a binpkg
-	# with old modules enabled.
-	check_old_modules
-}
-
-src_prepare() {
-	# Fix non-POSIX shell code.
-	# https://fedorahosted.org/linux-pam/ticket/60
-	sed -i \
-		-e '/ test /s:==:=:' \
-		configure || die
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Do not let user's BROWSER setting mess us up. #549684
-	unset BROWSER
-
-	# Disable automatic detection of libxcrypt; we _don't_ want the
-	# user to link libxcrypt in by default, since we won't track the
-	# dependency and allow to break PAM this way.
-	export ac_cv_header_xcrypt_h=no
-
-	local myconf=(
-		--docdir='$(datarootdir)'/doc/${PF}
-		--htmldir='$(docdir)/html'
-		--libdir='$(prefix)'/$(get_libdir)
-		--enable-securedir="${EPREFIX}"/$(get_libdir)/security
-		--enable-isadir='.' #464016
-		$(use_enable nls)
-		$(use_enable selinux)
-		$(use_enable cracklib)
-		$(use_enable audit)
-		$(use_enable debug)
-		$(use_enable berkdb db)
-		$(use_enable nis)
-		$(use_enable pie)
-		--with-db-uniquename=-$(db_findver sys-libs/db)
-		--disable-prelude
-		--disable-regenerate-docu
-	)
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake sepermitlockdir="${EPREFIX}/run/sepermit"
-}
-
-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
-}
-
-DOCS=( CHANGELOG ChangeLog README AUTHORS Copyright NEWS )
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
-
-	docinto modules
-	local dir
-	for dir in modules/pam_*; do
-		newdoc "${dir}"/README README."$(basename "${dir}")"
-	done
-
-	if use selinux; then
-		dodir /usr/lib/tmpfiles.d
-		cat - > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<EOF
-d /run/sepermit 0755 root root
-EOF
-	fi
-}
-
-pkg_preinst() {
-	check_old_modules || die "deprecated PAM modules still used"
-}
-
-pkg_postinst() {
-	ewarn "Some software with pre-loaded PAM libraries might experience"
-	ewarn "warnings or failures related to missing symbols and/or versions"
-	ewarn "after any update. While unfortunate this is a limit of the"
-	ewarn "implementation of PAM and the software, and it requires you to"
-	ewarn "restart the software manually after the update."
-	ewarn ""
-	ewarn "You can get a list of such software running a command like"
-	ewarn "  lsof / | egrep -i 'del.*libpam\\.so'"
-	ewarn ""
-	ewarn "Alternatively, simply reboot your system."
-	if [[ -x "${EROOT}"/var/log/tallylog ]] ; then
-		elog ""
-		elog "Because of a bug present up to version 1.1.1-r2, you have"
-		elog "an executable /var/log/tallylog file. You can safely"
-		elog "correct it by running the command"
-		elog "  chmod -x /var/log/tallylog"
-		elog ""
-	fi
-
-	# The pam_unix module needs to check the password of the user which requires
-	# read access to /etc/shadow only.
-	fcaps cap_dac_override sbin/unix_chkpwd
-}