Updating liguros repo21.1.1

4 files changed, 17 insertions, 78 deletions

diff --git a/sys-auth/oath-toolkit/Manifest b/sys-auth/oath-toolkit/Manifest
index e1ffec90d893..5869f860e046 100644
--- a/sys-auth/oath-toolkit/Manifest
+++ b/sys-auth/oath-toolkit/Manifest
@@ -1,2 +1 @@
-DIST oath-toolkit-2.6.1.tar.gz 4238966 BLAKE2B 7af4f4997b18278aa1903470c79e5a7734e9e97e62a2de4685eee58ead59e3294cef0d6da0147746932a2891f59648b5473f02b5edd6c4fd81b4a9c80d9bde60 SHA512 59feadbc06d11a52bf5879493227c40358fc1f4f17ec3ff92e3a313e47b92f3154396fa3ff38ef163852b32c8bfcef1f59753b614d0138478b8f7e7971f55e62
 DIST oath-toolkit-2.6.2.tar.gz 4295786 BLAKE2B 2b97ab73339647b560b46373922095f18655a167b613b15d4ee2fd507d430025628d20eb111ff1d8025e78646b1d61d9680a7082caba1c75d247bb1d8b9b99dd SHA512 201a702a05a2e9fb3a66d04750e1a34e293342126caf02c344954a0d9fd0daafe73ca7f1fe273be129ae555a29b82b72fa2b4770ea2ad10711924e1926ec2cfb
diff --git a/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild b/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild
deleted file mode 100644
index 39dc8de39188..000000000000
--- a/sys-auth/oath-toolkit/oath-toolkit-2.6.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit pam eutils autotools
-DESCRIPTION="Toolkit for using one-time password authentication with HOTP/TOTP algorithms"
-HOMEPAGE="https://www.nongnu.org/oath-toolkit/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pam pskc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	pam? ( sys-libs/pam )
-	pskc? ( dev-libs/xmlsec )"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/libxml2 )
-	dev-util/gtk-doc-am"
-
-src_prepare() {
-	# These tests need git/cvs and don't reflect anything in the final app
-	sed -i -r \
-		-e '/TESTS/s,test-vc-list-files-(git|cvs).sh,,g' \
-		gl/tests/Makefile.am
-	# disable portability warnings, caused by gtk-doc.make
-	sed -i \
-		-e '/AM_INIT_AUTOMAKE/ s:-Wall:\0 -Wno-portability:' \
-		{liboath,libpskc}/configure.ac
-	eautoreconf
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable test xmltest ) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable pskc)
-}
-
-src_install() {
-	default
-	if use pam; then
-		newdoc pam_oath/README README.pam
-	fi
-	if use pskc; then
-		doman pskctool/pskctool.1
-	fi
-}
-
-src_test() {
-	# without keep-going, it will bail out after the first testsuite failure,
-	# skipping the other testsuites. as they are mostly independant, this sucks.
-	emake --keep-going check
-	[ $? -ne 0 ] && die "At least one testsuite failed"
-}
diff --git a/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild b/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
index 10ada7c7d6ac..580da794b2ed 100644
--- a/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
+++ b/sys-auth/pam_blue/pam_blue-0.9.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit pam autotools multilib
+inherit autotools pam
 
 DESCRIPTION="PAM module providing ability to authenticate via a bluetooth compatible device"
 HOMEPAGE="https://pam.0xdef.net/"
@@ -12,7 +12,6 @@ SRC_URI="http://pam.0xdef.net/source/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="sys-libs/pam
 	net-wireless/bluez"
@@ -21,8 +20,9 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-char-locales.patch #412941
-	epatch "${FILESDIR}"/${P}-bad-log.patch
+	default
+	eapply "${FILESDIR}"/${P}-char-locales.patch #412941
+	eapply "${FILESDIR}"/${P}-bad-log.patch
 	mv configure.{in,ac} || die
 	eautoreconf
 }
diff --git a/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild b/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild
index 163c2bc1bf77..da150b938c04 100644
--- a/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild
+++ b/sys-auth/pam_dotfile/pam_dotfile-0.7-r2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils pam autotools autotools-utils
+inherit autotools pam
 
 MY_P="${P/_beta/beta}"
-S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="pam module to allow password-storing in \$HOME/dotfiles"
 HOMEPAGE="https://0pointer.de/lennart/projects/pam_dotfile/
@@ -18,14 +17,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
+BDEPEND="doc? ( www-client/lynx )"
 RDEPEND="sys-libs/pam"
-DEPEND="${RDEPEND}
-	doc? ( www-client/lynx )"
+DEPEND="${RDEPEND}"
 
-HTML_DOCS="doc"
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	default
+	eapply "${FILESDIR}"/${P}-gentoo.patch
 	eautoreconf
 }
 
@@ -34,12 +34,12 @@ src_configure() {
 		$(use_enable doc lynx)
 		--with-pammoddir=$(getpam_mod_dir)
 	)
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
 
 	# kill the libtool archives
-	rm -rf "${D}"/$(getpam_mod_dir)/*.la
+	rm -rf "${D}"/$(getpam_mod_dir)/*.la || die
 }