From 328f3a7a59dd22066b4787fecf447dd0ee5dfe6e Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sun, 8 Oct 2023 00:19:41 +0200
Subject: [PATCH] x11-misc/blockdpy: update EAPI 6 -> 8

Signed-off-by: David Seifert <soap@gentoo.org>
---
 ...ckdpy-1-r1.ebuild => blockdpy-1-r2.ebuild} | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)
 rename x11-misc/blockdpy/{blockdpy-1-r1.ebuild => blockdpy-1-r2.ebuild} (73%)

diff --git a/x11-misc/blockdpy/blockdpy-1-r1.ebuild b/x11-misc/blockdpy/blockdpy-1-r2.ebuild
similarity index 73%
rename from x11-misc/blockdpy/blockdpy-1-r1.ebuild
rename to x11-misc/blockdpy/blockdpy-1-r2.ebuild
index 37504c2a89931..a53a9f8c48af3 100644
--- a/x11-misc/blockdpy/blockdpy-1-r1.ebuild
+++ b/x11-misc/blockdpy/blockdpy-1-r2.ebuild
@@ -1,26 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Tool to block access via the physical display while x11vnc is running"
 HOMEPAGE="http://www.karlrunge.com/x11vnc/blockdpy.c"
 SRC_URI="http://www.karlrunge.com/x11vnc/blockdpy.c"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_unpack() {
 	cp "${DISTDIR}"/blockdpy.c blockdpy.c || die
@@ -34,16 +32,16 @@ src_prepare() {
 	sed -i '/#include <stdio.h>/i#include <string.h>' blockdpy.c || die
 }
 
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} \
-		$($(tc-getPKG_CONFIG) --cflags x11) \
-		$($(tc-getPKG_CONFIG) --cflags xext) \
-		-o blockdpy blockdpy.c \
-		$($(tc-getPKG_CONFIG) --libs x11) \
-		$($(tc-getPKG_CONFIG) --libs xext) \
-			|| die "compile failed"
+src_configure() {
+	tc-export CC
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext)
+	export LDLIBS=$($(tc-getPKG_CONFIG) --libs x11 xext)
+}
 
-	# Create README from head comment in source.
+src_compile() {
+	emake blockdpy
+
+	# Create README from head comment in source
 	sed -n '1,/^ *\*\//s/^[ -]*\*[ \/]*//p' < blockdpy.c > README || die
 }
 
@@ -55,7 +53,7 @@ src_install() {
 pkg_postinst() {
 	# Just warn about missing xlock instead of requiring it in case
 	# the user wants to use something else.
-	if [[ ! -x ${EPREFIX}/usr/bin/xlock ]]; then
+	if [[ ! -x ${EROOR}/usr/bin/xlock ]]; then
 		ewarn 'The xlock executable was not found.'
 		ewarn 'blockdpy runs "xlock" as the screen-lock program by default.'
 		ewarn 'You should either install x11-misc/xlockmore or override the'