portage-overlay

Commit: 6ecb7a2cab74ccebae34a03cd5b10a909e4a2163
Parent: e5a518ea351150c5f1587e14d12b10aacaa7d8fa
Author: Randy Palamar
Date:   Sat, 22 Oct 2022 22:44:02 -0600

update some suckless ebuilds and bump to EAPI8

Diffstat:
M
app-admin/doas/doas-9999.ebuild
 | 
2
+-
M
app-shells/oksh/oksh-9999.ebuild
 | 
2
+-
M
sys-apps/sbase/sbase-9999.ebuild
 | 
17
++++++++---------
M
x11-misc/dmenu/dmenu-9999.ebuild
 | 
8
+-------
M
x11-misc/tabbed/tabbed-9999.ebuild
 | 
2
+-
M
x11-misc/xbanish/xbanish-9999.ebuild
 | 
5
++---
M
x11-terms/st/st-9999.ebuild
 | 
9
++-------

7 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/app-admin/doas/doas-9999.ebuild b/app-admin/doas/doas-9999.ebuild
@@ -1,4 +1,4 @@
-EAPI=7
+EAPI=8
 
 inherit git-r3
 
diff --git a/app-shells/oksh/oksh-9999.ebuild b/app-shells/oksh/oksh-9999.ebuild
@@ -1,4 +1,4 @@
-EAPI=7
+EAPI=8
 
 inherit git-r3
 
diff --git a/sys-apps/sbase/sbase-9999.ebuild b/sys-apps/sbase/sbase-9999.ebuild
@@ -1,4 +1,4 @@
-EAPI=7
+EAPI=8
 
 inherit git-r3
 
@@ -13,19 +13,18 @@ IUSE="+static"
 src_configure() {
 	default
 
-	sed \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/{s:=:+=:}' \
-		-e '/^LDFLAGS/{s:=:+=:}' \
-		< config.mk > config.mk.new || die
-		mv config.mk.new config.mk
-
 	if use static ; then
 		export LDFLAGS="${LDFLAGS} -s -static"
 	fi
 }
 
+src_compile() {
+	emake \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
 src_install() {
-	emake DESTDIR="${D}" CC=${CC} PREFIX=${EPREFIX}${LOCAL_PREFIX} install
+	emake DESTDIR="${D}" PREFIX=${EPREFIX}${LOCAL_PREFIX} install
 	einstalldocs
 }
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -1,4 +1,4 @@
-EAPI=7
+EAPI=8
 inherit git-r3 savedconfig
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
@@ -17,18 +17,12 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 "
 
 src_prepare() {
 	default
 
-	sed	-e '/^X11INC/{s:X11R6/include:include/X11:}' \
-		-e '/^X11LIB/{s:X11R6/lib:lib/X11:}' \
-		< config.mk > config.mk.new || die
-		mv config.mk.new config.mk
-
 	if use static; then
 		export CFLAGS="${CFLAGS} -static"
 		export LDFLAGS="${LDFLAGS} -static"
diff --git a/x11-misc/tabbed/tabbed-9999.ebuild b/x11-misc/tabbed/tabbed-9999.ebuild
@@ -1,4 +1,4 @@
-EAPI=7
+EAPI=8
 inherit git-r3 savedconfig
 
 DESCRIPTION="simple generic tabbed frontend for xembed aware applications"
diff --git a/x11-misc/xbanish/xbanish-9999.ebuild b/x11-misc/xbanish/xbanish-9999.ebuild
@@ -1,4 +1,4 @@
-EAPI=7
+EAPI=8
 inherit git-r3
 
 DESCRIPTION="banish the mouse cursor when typing, show it again when the mouse moves"
@@ -13,8 +13,7 @@ RDEPEND="x11-libs/libX11"
 src_prepare() {
 	default
 
-	sed	-e '/^X11BASE/{s:X11R6:X11:}' \
-		-e '/^MANDIR/{s:man:share/man:}' \
+	sed	-e '/^MANDIR/{s:man:share/man:}' \
 		< Makefile > Makefile.new || die
 	mv Makefile.new Makefile || die
 
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
@@ -1,4 +1,4 @@
-EAPI=7
+EAPI=8
 inherit git-r3 savedconfig
 
 DESCRIPTION="simple terminal implementation for X"
@@ -18,18 +18,13 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	virtual/pkgconfig
 	x11-base/xorg-proto
 "
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
 
-	sed	-e '/^X11INC/{s:X11R6/include:include/X11:}' \
-		-e '/^X11LIB/{s:X11R6/lib:lib/X11:}' \
-		< config.mk > config.mk.new || die
-		mv config.mk.new config.mk
-
 	if use static; then
 		export CFLAGS="${CFLAGS} -static"
 		export LDFLAGS="${LDFLAGS} -static"