x11-misc/dzen: near-complete rework

Replaced large 8kB Makefile patch by smaller (not pretty) ebuild
workarounds leaving things up to pkg-config. This notably fix lld,
prefix, and crossdev builds.

Removed unused-but-set patch, its only purpose was to silence
build-time warnings.

Removed USE=minimal and disabled by default. Gadgets are small, quick
to build, and with no extra deps.

Removed USE=xft and enabled by default (like upstream). Alternate code
path is unreliable with locales and there's little reasons to support
it (doubtful will be brought back, so removing rather than forcing).

New tarball to drop obsolete SRC_URI.

Closes: https://bugs.gentoo.org/477656
Closes: https://bugs.gentoo.org/732434
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>

2 files changed, 64 insertions, 0 deletions

diff --git a/x11-misc/dzen/Manifest b/x11-misc/dzen/Manifest
index 4f53d592b690..1b47872530b4 100644
--- a/x11-misc/dzen/Manifest
+++ b/x11-misc/dzen/Manifest
@@ -1,2 +1,3 @@
 DIST dzen-0.9.5.tar.gz 38167 BLAKE2B 92297cceca2215d812aa4536bd7421ab992a372667ca832de70a2bf43faea4b5e7beb147a454d7ced5be4e53085f4eaf15d752888ee019d799cd3bb8fcbdb6ba SHA512 ed4eb5d657d8f3822d8fbf224da5c2d415852c340959840051ec9cfc63f90361e09b9d36cb8221cf046ae66af02b9fab67f4f16c834c5895e801d452e4f8a916
 DIST dzen-0.9.5_p1.tar.gz 38178 BLAKE2B 9ec81747d6eec9b7cca58b11096e00548cdca7ba21a179599979cf9b22ff84100d266d98e7a3e419960a56fee788ae96158650884a1b1322def6a98a70d6683b SHA512 239acfcacbc871ded5755ee0d5cca3185fcd93142bcf81552974f2ffc19d9f5ebdc02956108931f58b35c68ac57ec6e748bdb9cdbf7791ec6e224ef270bda300
+DIST dzen-0.9.5_p2.tar.gz 38181 BLAKE2B 0e34228c3795864a1b6ac5a3ac9d0ab4a1b90e065a649caa34d704951007bb1239db920f7ed3e35303f614c6572b6232768d59302b23edab0c11793574fcde3d SHA512 e750ab9c62dad311bf478d79c15ffdc1ef108fe2c3ed5df82316d879aad000bee785d304048f5daae237468f6fe018f14fc05d0114d68d873f766dbf1dfebbc9
diff --git a/x11-misc/dzen/dzen-0.9.5_p2.ebuild b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
new file mode 100644
index 000000000000..b2dadc4502d7
--- /dev/null
+++ b/x11-misc/dzen/dzen-0.9.5_p2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+COMMIT_HASH="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}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="2"
+IUSE="xinerama xpm"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="
+	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)"
+
+	emake -C gadgets \
+		CC="$(tc-getCC)" CFLAGS="${cflags}" \
+		LDFLAGS="${LDFLAGS}" X11LIBS="${libs}"
+
+	local flag
+	# xft always-enabled wrt bug #477656
+	for flag in xft $(usev xinerama) $(usev xpm); do
+		cflags+=" $($(tc-getPKG_CONFIG) --cflags ${flag}) -DDZEN_${flag^^}"
+		libs+=" $($(tc-getPKG_CONFIG) --libs ${flag})"
+	done
+
+	cflags+=" -DVERSION='\"$(ver_cut 1-3)\"'"
+
+	emake CC="$(tc-getCC)" CFLAGS="${cflags}" LIBS="${LDFLAGS} ${libs}"
+}
+
+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
+}