gentoo resync : 25.11.2020

4 files changed, 3 insertions, 85 deletions

diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 81cdfd3b6eba..4b20aafd503d 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,7 +1,5 @@
 AUX pam_mount-2.16-crypto-Add-support-for-LUKS2.patch 1547 BLAKE2B f6c0ceba9ac683bd852606988688c18321b36192ea3e3d4b7443ac225b53446d594aafa78123a84847dd0b622cea54150a32a0852b572842f6f48fa7bf5e59e5 SHA512 7b37add4202fbbfef9ccbab10f4c3fc10da7dc976adab8c550ee2197b92e7f8f1db06186d155d0ae05b8c775d919d754071854a69c5d7f2a54c5b890f33bbc8f
 AUX pam_mount-2.16-remove-obsolete-openssl-api.patch 518 BLAKE2B 06dcaf0237e5e89549c1f1a6d6fef038785e9f170dc1065596b7ea2833a64d829ac762837cd0f1141db3f67571f4b43899ecc5b5e9a6ba093d9f55e8cdd7473f SHA512 362f44008810b4f9bd260cbbecba4f10b65bf7c98c77135eb5d365e91660d1fdd0c5dde65286f706c340b812e71f5f6cec85e8536263cce5e1c666068b27860c
 DIST pam_mount-2.16.tar.xz 312316 BLAKE2B 5954af8f8bf8b9cb47e1c07dc0d5fc5c4db099eeca5de90a3a53dc65aac0a2a6fba3f99c4d91d12f53b13abb5d3bae262b42536434553872a36ec108dc8d2c0c SHA512 3a579d7287cfcaef831d3e54d3e912407b65a966303e81c47f445d601f38f866ce04326e3d37a061f74f97b9cfb201e56109f57e55699d15d8f947ae2b91c8e3
-EBUILD pam_mount-2.16-r1.ebuild 961 BLAKE2B a0c8f006aae049f028a4ac968c9aa72f944174fa075681342fa6075cd71ef3a286683d300cda5b204145040f0aa41bb6bbcd0afee0a122ad2bffd76787d6ec9f SHA512 c931f62aec97428a8bc9eea02854021736da8a525b16454aa86e690225e74939958d2d2b17efa7586c6e3560f89e79445ceab20033f292b8097b1135533a9486
-EBUILD pam_mount-2.16-r2.ebuild 1234 BLAKE2B ad4df7502727a67ff6f73980df4ca625233d1694f020f7196c78e0fd773c89b60202f976430b3f70dc442912129ca93c748963dbe2a10f0c0da36d57a36f5d90 SHA512 a456634da4cf9b6ecf039136f676cec34e5f8a628944a8deecfd121775e52d48cb87606c24d133b7990ebafd9f2e007390bcf8f977b843b598c07c4e9b4123d6
-EBUILD pam_mount-2.16.ebuild 879 BLAKE2B f3bd44da6e9f928f2a66dd6b5c3ec1d57f4545bed909d2724e389203ee8db6f247d6d195014f4b64c4560b6a3848247c95a972508eb709b4c7b1f095362b83e6 SHA512 4be055ec65355fcf175b6f19613715ddb795342741f706e3983b0586898498d3b412f1d6f4b37d61f5faefc943487abb53187eb417cce188a655b6d89ca4644d
+EBUILD pam_mount-2.16-r3.ebuild 1233 BLAKE2B cc7355b64c1770f7bbda48ad0bd3521da2e2513a1d57da02420ce4dbe64934f75e79d8bc9a81db85b25f93f06a424b868a8556b1820754ad4bd5d16910314c37 SHA512 2334795bd1742559f35d1b6ce1b75eac80fc0fad6ee036aad1cb9c54514e8162cd179b21de33373bfc30e124dff95492a7f0f36692622a69a0431569646d0df1
 MISC metadata.xml 402 BLAKE2B 001c9702dee12640adcb05c6a6d9750e13ac0d45ebdb46859fc19e4071af76fcde847163f59b876992169968fefed8423352eec067ecf2ae6baa60dfdf412cc4 SHA512 546dd1bb071d1cc634250930b70328fc83f8bb4ac8a857fc3ccddadae5fcfb48d0a40adb0845e07535c63fd2dd2e6ef91779c0b48b6d147efa7aeb7fcde412e1
diff --git a/sys-auth/pam_mount/pam_mount-2.16-r1.ebuild b/sys-auth/pam_mount/pam_mount-2.16-r1.ebuild
deleted file mode 100644
index 4aa9be59ce6a..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.16-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-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? ( dev-libs/openssl:0= )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20"
-
-PATCHES=(
-		"${FILESDIR}"/pam_mount-2.16-crypto-Add-support-for-LUKS2.patch
-)
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" \
-			$(use_with crypt cryptsetup) \
-			$(use_with ssl crypto) \
-			$(use_with selinux)
-}
-
-src_install() {
-	default
-	use selinux || rm -r "${D}"/etc/selinux
-	dodoc doc/*.txt
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.16-r2.ebuild b/sys-auth/pam_mount/pam_mount-2.16-r3.ebuild
index 6ba3bfb73868..597e2da7f05f 100644
--- a/sys-auth/pam_mount/pam_mount-2.16-r2.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.16-r3.ebuild
@@ -9,12 +9,12 @@ SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE="crypt libressl ssl selinux"
 
 COMMON_DEPEND=">=sys-libs/pam-0.99
-	>=sys-libs/libhx-3.12.1
+	>=sys-libs/libhx-3.12.1:=
 	>=dev-libs/libxml2-2.6
 	crypt? ( >=sys-fs/cryptsetup-1.1.0:= )
 	ssl? (
diff --git a/sys-auth/pam_mount/pam_mount-2.16.ebuild b/sys-auth/pam_mount/pam_mount-2.16.ebuild
deleted file mode 100644
index 95e94fc71b07..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.16.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-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? ( dev-libs/openssl:0= )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.20"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" \
-			$(use_with crypt cryptsetup) \
-			$(use_with ssl crypto) \
-			$(use_with selinux)
-}
-
-src_install() {
-	default
-	use selinux || rm -r "${D}"/etc/selinux
-	dodoc doc/*.txt
-}