gentoo resync : 04.05.2021

4 files changed, 11 insertions, 20 deletions

diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 351b11959617..1c27e07ae39c 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -3,7 +3,7 @@ AUX pam_mount-2.16-remove-obsolete-openssl-api.patch 518 BLAKE2B 06dcaf0237e5e89
 DIST pam_mount-2.16.tar.xz 312316 BLAKE2B 5954af8f8bf8b9cb47e1c07dc0d5fc5c4db099eeca5de90a3a53dc65aac0a2a6fba3f99c4d91d12f53b13abb5d3bae262b42536434553872a36ec108dc8d2c0c SHA512 3a579d7287cfcaef831d3e54d3e912407b65a966303e81c47f445d601f38f866ce04326e3d37a061f74f97b9cfb201e56109f57e55699d15d8f947ae2b91c8e3
 DIST pam_mount-2.17.tar.xz 326948 BLAKE2B b5d8c5701bfa4e3ce50ca71b1130d5f68655df12ac45cf554f38f2625b33fcece895d4b67d79cea2ad735c4994c779844dfc5266872e054a1e6d078632f3370c SHA512 d55d2a0e99d51ef649845548e4178b9b34db9c742c592e0ba97359646281af17795080e6ecb1a2a11bc680d31f2c77e69261f731de8f68e8602bcd838371927f
 DIST pam_mount-2.18.tar.xz 324524 BLAKE2B a3f29de8c0a348c98d3e73ac3568595083036fa704b5c34ed17c3660fcc8ff5f64195ad4158af6e351f79865a9128dbb773c7d18bbb07bdff1010e555803cfce SHA512 7f1e373fd7876eddd9226163602ba484ed8a7e1ce92ba6140c1f7603cb205190cb11ad75be41b54d2a6cd21602320d41a65714bfd0af8b5247850a3ef0fe3b22
-EBUILD pam_mount-2.16-r3.ebuild 1233 BLAKE2B cc7355b64c1770f7bbda48ad0bd3521da2e2513a1d57da02420ce4dbe64934f75e79d8bc9a81db85b25f93f06a424b868a8556b1820754ad4bd5d16910314c37 SHA512 2334795bd1742559f35d1b6ce1b75eac80fc0fad6ee036aad1cb9c54514e8162cd179b21de33373bfc30e124dff95492a7f0f36692622a69a0431569646d0df1
-EBUILD pam_mount-2.17.ebuild 1213 BLAKE2B a9045d907518c01aa6c045199cc809adbd03af4a085ef3aea45d6b981a16738c526b837e616f5d84c5a0b54b2271acd427c4ee0f5683891aabcfceef9e227457 SHA512 1c70e7416518be2c127ca6e2bfbded2c6e6101d270585fd684d1d7b6956c482524f9638503be76e1c23a0ce3479800f65e564c9b70edfa197f9f522ac61bb36b
-EBUILD pam_mount-2.18.ebuild 1213 BLAKE2B bbf1ac9b070ed1df5012b06d102895b6ca13e07a5ca05234243cab5ba097104217b022ac955c806fb62acf7e27d7aabbed4f97269c47da0c1be1ba6a714b35e3 SHA512 92d3637bf71f7b2c055e08d6a90374210fcaddfa8a7ba70e21eff8e5142b368d917331d959383da29f11267ea27170ea19f093c098599b30e3c0c55095f5ae54
+EBUILD pam_mount-2.16-r3.ebuild 1169 BLAKE2B 9935602981ab8dd7e27a967ea17795d5f03a8e3fe49cee4c55842a7a1235c98cbe0e2c1ad75af4ec1a439fa011d38c48746052156755c4cf6c997037cd63d292 SHA512 9d07ce402abc31c1d1c35e3f2d0c8600694d32bb663cc0d3b0418fe38657ccdf57ef52ccdeb31e388c14810e4ea0e16477521af1827ed689910247e20fbb7d48
+EBUILD pam_mount-2.17.ebuild 1149 BLAKE2B b418aa41aaed00c19021ad2a22efbcc14799889875a52bee2f25e8d77ebdfb11c499628b7971939899768f38a9c357a3eeb716211aab2da286ef2b9ddd72ba6b SHA512 6cf9d721a91790b9f723691753111896ba2c72b939a27ff5e8390b3905d2788702351538ddd6d16b206e3d58206f0cc06560a50667e3525a1c33683a11154362
+EBUILD pam_mount-2.18.ebuild 1149 BLAKE2B b418aa41aaed00c19021ad2a22efbcc14799889875a52bee2f25e8d77ebdfb11c499628b7971939899768f38a9c357a3eeb716211aab2da286ef2b9ddd72ba6b SHA512 6cf9d721a91790b9f723691753111896ba2c72b939a27ff5e8390b3905d2788702351538ddd6d16b206e3d58206f0cc06560a50667e3525a1c33683a11154362
 MISC metadata.xml 295 BLAKE2B 3515a0d8915e500cf61f87db50404f07374926445aea2dfa57b893c52dd43789bb4a8bde7b02d89827eee82f96a4f433e722de9236abc25f0fe1737b6d523134 SHA512 09cb4472c36f63fe3cd9178004905d5070428aa9b5e83e271f802d9a41685ca61a562b1f130a8f1313cda3dce4de0fa4e2cc5187bd98ca94284d2de58d701e5d
diff --git a/sys-auth/pam_mount/pam_mount-2.16-r3.ebuild b/sys-auth/pam_mount/pam_mount-2.16-r3.ebuild
index 597e2da7f05f..df0bd7fb125a 100644
--- a/sys-auth/pam_mount/pam_mount-2.16-r3.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.16-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,16 +11,13 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-IUSE="crypt libressl ssl selinux"
+IUSE="crypt ssl selinux"
 
 COMMON_DEPEND=">=sys-libs/pam-0.99
 	>=sys-libs/libhx-3.12.1:=
 	>=dev-libs/libxml2-2.6
 	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	selinux? ( sys-libs/libselinux )"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
diff --git a/sys-auth/pam_mount/pam_mount-2.17.ebuild b/sys-auth/pam_mount/pam_mount-2.17.ebuild
index 94b7039acb80..5e97bda985cd 100644
--- a/sys-auth/pam_mount/pam_mount-2.17.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="crypt libressl ssl selinux"
+IUSE="crypt ssl selinux"
 
 DEPEND="
 	>=sys-libs/pam-0.99
@@ -20,10 +20,7 @@ DEPEND="
 	>=dev-libs/libxml2-2.6:=
 	>=dev-libs/libpcre-7:=
 	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-auth/pam_mount/pam_mount-2.18.ebuild b/sys-auth/pam_mount/pam_mount-2.18.ebuild
index 751fa5a24f4c..5e97bda985cd 100644
--- a/sys-auth/pam_mount/pam_mount-2.18.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.18.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="crypt libressl ssl selinux"
+IUSE="crypt ssl selinux"
 
 DEPEND="
 	>=sys-libs/pam-0.99
@@ -20,10 +20,7 @@ DEPEND="
 	>=dev-libs/libxml2-2.6:=
 	>=dev-libs/libpcre-7:=
 	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	selinux? ( sys-libs/libselinux )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"