From 9e28266d859e2e4230470c527dfc8f28242da373 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azahi@teknik.io>
Date: Sat, 24 Oct 2020 20:42:12 +0300
Subject: x11-misc/sflock: Update build process and metadata

Package-Manager: Portage-3.0.8, Repoman-3.0.2
---
 x11-misc/sflock/metadata.xml          |  3 +++
 x11-misc/sflock/sflock-9999-r1.ebuild | 46 +++++++++++++++++++++++++++++++++++
 x11-misc/sflock/sflock-9999.ebuild    | 40 ------------------------------
 3 files changed, 49 insertions(+), 40 deletions(-)
 create mode 100644 x11-misc/sflock/sflock-9999-r1.ebuild
 delete mode 100644 x11-misc/sflock/sflock-9999.ebuild

diff --git a/x11-misc/sflock/metadata.xml b/x11-misc/sflock/metadata.xml
index 7869e07..8f5922b 100644
--- a/x11-misc/sflock/metadata.xml
+++ b/x11-misc/sflock/metadata.xml
@@ -5,4 +5,7 @@
 		<email>azahi@teknik.io</email>
 		<name>azahi</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">benruijl/sflock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/sflock/sflock-9999-r1.ebuild b/x11-misc/sflock/sflock-9999-r1.ebuild
new file mode 100644
index 0000000..94af0e3
--- /dev/null
+++ b/x11-misc/sflock/sflock-9999-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/benruijl/sflock.git"
+fi
+
+inherit toolchain-funcs ${SCM}
+
+DESCRIPTION="Simple X display locker, with basic user feedback"
+HOMEPAGE="https://github.com/benruijl/sflock"
+
+if [[ ${PV} == *9999 ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/benruijl/sflock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	sed -e "s/ -Os / ${CFLAGS} /" \
+		-e "s/ -s / ${LDFLAGS} /" \
+		-e "s/ cc/ $(tc-getCC)/" \
+		-i config.mk || die
+
+	default
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX="/usr"
+}
diff --git a/x11-misc/sflock/sflock-9999.ebuild b/x11-misc/sflock/sflock-9999.ebuild
deleted file mode 100644
index b09b8ba..0000000
--- a/x11-misc/sflock/sflock-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/benruijl/sflock.git"
-fi
-
-inherit eutils ${SCM}
-
-DESCRIPTION="focus the closest window in a given direction"
-HOMEPAGE="https://github.com/benruijl/sflock"
-
-if [[ ${PV} == *9999 ]]; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/benruijl/sflock/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-BDEPEND=""
-
-src_prepare() {
-	sed -e 's/-Os //' -i config.mk || die
-	sed -e 's/-s //' -i config.mk || die
-	default
-}
-
-src_install() {
-	emake PREFIX="/usr" DESTDIR="${D}" install
-}
-- 
cgit 1.4.1