[gentoo-commits] repo/gentoo:master commit in: x11-misc/dzen/

[Ionen Wolkens]

commit:     363f6aacf5fd4a8a41030441612975d1fe2cbd0f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 05:44:27 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 07:01:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363f6aac

x11-misc/dzen: EAPI7->8, tidy, fix VariableOrderWrong

Can skip revbump wrt EAPI, only uses toolchain-funcs.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-misc/dzen/dzen-0.9.5_p2.ebuild | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/x11-misc/dzen/dzen-0.9.5_p2.ebuild 
b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
index 547c24c755b8..ff606eb36623 100644
--- a/x11-misc/dzen/dzen-0.9.5_p2.ebuild
+++ b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
@@ -1,42 +1,46 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
-COMMIT_HASH="488ab66019f475e35e067646621827c18a879ba1"
+HASH_DZEN=488ab66019f475e35e067646621827c18a879ba1
 
 DESCRIPTION="General purpose messaging, notification, and menu utility"
-HOMEPAGE="https://github.com/robm/dzen";
-SRC_URI="https://github.com/robm/dzen/archive/${COMMIT_HASH}.tar.gz -> 
${P}.tar.gz"
-S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+HOMEPAGE="https://github.com/robm/dzen/";
+SRC_URI="https://github.com/robm/dzen/archive/${HASH_DZEN}.tar.gz -> 
${P}.tar.gz"
+S=${WORKDIR}/${PN}-${HASH_DZEN}
 
 LICENSE="MIT"
-KEYWORDS="amd64 x86"
 SLOT="2"
+KEYWORDS="amd64 x86"
 IUSE="xinerama xpm"
 
 RDEPEND="
        x11-libs/libX11
        x11-libs/libXft
        xinerama? ( x11-libs/libXinerama )
-       xpm? ( x11-libs/libXpm )"
+       xpm? ( x11-libs/libXpm )
+"
 DEPEND="
        ${RDEPEND}
-       x11-base/xorg-proto"
+       x11-base/xorg-proto
+"
 BDEPEND="
-       virtual/pkgconfig"
+       virtual/pkgconfig
+"
 
 src_prepare() {
        default
+
        sed -i '/strip/d; /@echo/d; s/\t@/\t/; s/-L.*/$(X11LIBS)/' \
                Makefile gadgets/Makefile || die
 }
 
 src_compile() {
-       local cflags="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags x11)"
-       local libs="$($(tc-getPKG_CONFIG) --libs x11)"
+       local cflags="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags x11 || die)"
+       local libs="$($(tc-getPKG_CONFIG) --libs x11 || die)"
 
        emake -C gadgets \
                CC="$(tc-getCC)" CFLAGS="${cflags}" \
@@ -57,7 +61,10 @@ src_compile() {
 src_install() {
        emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
        emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C gadgets install
+
        dobin gadgets/*.sh
+
        dodoc gadgets/README*
+
        einstalldocs
 }