From b4fbd1b378656e6973ad0e7a28d26720d37a87e1 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <it@startux.de>
Date: Tue, 11 Feb 2020 10:33:45 +0000
Subject: [PATCH] Update xsecurelock to maintained version

---
 x11-misc/xsecurelock/Manifest                 |  3 +-
 x11-misc/xsecurelock/xsecurelock-1.7.0.ebuild | 73 +++++++++++++++++++
 x11-misc/xsecurelock/xsecurelock-9999.ebuild  | 52 -------------
 3 files changed, 75 insertions(+), 53 deletions(-)
 create mode 100644 x11-misc/xsecurelock/xsecurelock-1.7.0.ebuild
 delete mode 100644 x11-misc/xsecurelock/xsecurelock-9999.ebuild

diff --git a/x11-misc/xsecurelock/Manifest b/x11-misc/xsecurelock/Manifest
index c8d17b6..8fb286c 100644
--- a/x11-misc/xsecurelock/Manifest
+++ b/x11-misc/xsecurelock/Manifest
@@ -1 +1,2 @@
-EBUILD xsecurelock-9999.ebuild 896 SHA256 20952e3243c4c40de4d6a800c17b1bd2b395f9ca13b62b87c6caab6a74e7dc31 SHA512 d959256946ed58079a756e0fe8742be37b073cc0173b1e29836c5258fd2a8b5e2585370991c9c2ce1ba3d70a0615b7fa9b502c871ef85bccb65414aa9ce9289f WHIRLPOOL d7c83758373963d116ed9e1ac029f004033fd5b570dca0b07aac8da11fa16598fb9f18aae60e7dbe9d543d30669392532678cc135481fac54b4af9c29b640d6d
+DIST xsecurelock-1.7.0.tar.gz 219377 BLAKE2B 0f8db60fcb3efab101f026142b72687d61a084b000e9978d159f3d9a9d22be539591ca2a80b01ae3419315cc09dac1cb6d0002884f3c854f02882952e901ff6d SHA512 b3b5404199bed7f0470072c9341227536f8ebe593f288b4ffdb5f4e90e3854952bae150d449cca6628e255c05640b625b56f10266362c119d46d21d51e8880a6
+EBUILD xsecurelock-1.7.0.ebuild 1499 BLAKE2B 8efceb2c6c8761d484cdd697e4a94776f97015c0560a9a5e8831b4e752bdc5ef9dacfef796164a524e4449f45b7feee7aa700556aa73ff0ce4c23623b8d0e1a4 SHA512 bed0041e8018dfb4e4675ce439b921e95cd77051df180c0379c6d369fb07cb122819225e99526da172c2f3298545e35cde1a31d3c1a6f04dcad2cdf3015c94d0
diff --git a/x11-misc/xsecurelock/xsecurelock-1.7.0.ebuild b/x11-misc/xsecurelock/xsecurelock-1.7.0.ebuild
new file mode 100644
index 0000000..5a89cd4
--- /dev/null
+++ b/x11-misc/xsecurelock/xsecurelock-1.7.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="X11 screen lock utility with security in mind"
+HOMEPAGE="https://github.com/google/xsecurelock"
+SRC_URI="https://github.com/google/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="mpv xscreensaver"
+
+RDEPEND="
+	dev-libs/libbsd
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/util-linux
+	sys-libs/pam
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXmu
+	x11-libs/libXrandr
+	x11-libs/libXScrnSaver
+	x11-libs/libXxf86misc
+	xscreensaver? ( x11-misc/xscreensaver )
+	mpv? ( media-video/mpv )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"/usr
+		--with-default-auth-module=auth_x11
+		--with-default-authproto-module=authproto_pam
+		--without-htpasswd
+		--without-mplayer
+		--without-pamtester
+		--without-pandoc
+		--with-pam-service-name=system-auth
+	)
+	if not use mpv; then
+		myeconfargs+=(
+			--without-mpv
+		)
+	fi
+	if use xscreensaver; then
+		myeconfargs+=(
+			--with-default-saver-module=saver_xscreensaver
+			--with-xscreensaver="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver
+		)
+	else
+		myeconfargs+=(
+			--with-default-saver-module=saver_blank
+			--without-xscreensaver
+		)
+	fi
+	econf "${myeconfargs[@]}"
+}
diff --git a/x11-misc/xsecurelock/xsecurelock-9999.ebuild b/x11-misc/xsecurelock/xsecurelock-9999.ebuild
deleted file mode 100644
index fb84422..0000000
--- a/x11-misc/xsecurelock/xsecurelock-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools autotools-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-2
-fi
-
-DESCRIPTION="X11 screen lock utility with security in mind"
-HOMEPAGE="https://github.com/google/xsecurelock"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/google/${PN}"
-	EGIT_BOOTSTRAP=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-SLOT="0"
-LICENSE="Apache"
-RDEPEND="x11-libs/libX11
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	"
-
-src_prepare() {
-	eautoreconf
-}
-
-
-src_configure() {
-	local myeconfargs=(
-			--with-pam-service-name=system-auth
-			--prefix=/usr
-	)
-	autotools-utils_src_configure
-}
-
-
-src_compile() {
-	autotools-utils_src_compile
-}
-
-
-src_install() {
-	autotools-utils_src_install
-}