From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EAB3315806C for ; Sun, 13 Jul 2025 08:07:00 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D03E53410D6 for ; Sun, 13 Jul 2025 08:07:00 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1E70511055B; Sun, 13 Jul 2025 08:06:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 15FAD11055B for ; Sun, 13 Jul 2025 08:06:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF86A340FB8 for ; Sun, 13 Jul 2025 08:06:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FF422C5D for ; Sun, 13 Jul 2025 08:06:55 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1752393981.7e65fddc913bc7fe8ed323c5a7b358d7d9024d1f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/gkrellm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild X-VCS-Directories: app-admin/gkrellm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7e65fddc913bc7fe8ed323c5a7b358d7d9024d1f X-VCS-Branch: master Date: Sun, 13 Jul 2025 08:06:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e05fe1ba-3d0b-43f0-be91-b36721eb0724 X-Archives-Hash: e5df10f37eacc5c0e011abe31f4b2265 commit: 7e65fddc913bc7fe8ed323c5a7b358d7d9024d1f Author: Nicolas PARLANT parhuet fr> AuthorDate: Sat Jul 12 04:14:38 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 13 08:06:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e65fddc app-admin/gkrellm: remove annoying required_use with ssl REQUIRED_USE 'ssl? ( X )' is annoying, because ssl is mostly enabled. Therefore, an headless usage forces to disable the ssl useflag. Remove it to avoid micro-manage flags and move the dep block into X?. Apply the same logic for ntlm. export PKG_CONFIG Closes: https://bugs.gentoo.org/958215 Signed-off-by: Nicolas PARLANT parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/42964 Signed-off-by: Sam James gentoo.org> app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild | 128 ++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild b/app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild new file mode 100644 index 000000000000..85182a491a6c --- /dev/null +++ b/app-admin/gkrellm/gkrellm-2.4.0-r1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic optfeature toolchain-funcs xdg + +DESCRIPTION="Single process stack of various system monitors" +HOMEPAGE="https://gkrellm.srcbox.net/" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.srcbox.net/gkrellm/gkrellm.git" +else + SRC_URI="https://gkrellm.srcbox.net/releases/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +fi +LICENSE="GPL-3+" +SLOT="2" +IUSE="gnutls lm-sensors nls ntlm ssl X" +REQUIRED_USE="gnutls? ( ssl )" + +RDEPEND=" + acct-group/gkrellmd + acct-user/gkrellmd + dev-libs/glib:2 + lm-sensors? ( sys-apps/lm-sensors:= ) + nls? ( virtual/libintl ) + X? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/pango + ntlm? ( net-libs/libntlm ) + ssl? ( + gnutls? ( net-libs/gnutls:= ) + !gnutls? ( dev-libs/openssl:0= ) + ) + ) +" + +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto + nls? ( sys-devel/gettext ) +" + +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-2.4.0-config.patch" + "${FILESDIR}/${PN}-2.3.5-width.patch" +) + +src_prepare() { + # Fix paths defined in headers for etc, themes, plugins + sed -e "s:/usr/lib:${EPREFIX}/usr/$(get_libdir):" \ + -e "s:/usr/local/lib:${EPREFIX}/usr/local/$(get_libdir):" \ + -i server/gkrellmd.h \ + -i src/gkrellm.h || die + # avoid no-op warning + if [[ -n ${EPREFIX} ]]; then + sed -e "s:/usr/share:${EPREFIX}/usr/share:" \ + -e "s:/etc/:${EPREFIX}/etc/:" \ + -i server/gkrellmd.h \ + -i src/gkrellm.h || die + fi + + # filter -O2 set by default + sed -e 's:-O2::' \ + -i src/Makefile \ + -i server/Makefile || die + + default +} + +src_compile() { + # see #943935 + append-cflags -std=gnu99 + + # in addition to adding EPREFIX, avoid /usr/local + # export in src_compile for gkrellm.pc and then used during installation + export PREFIX="${EPREFIX}/usr" + + # used for gtk/glib + tc-export PKG_CONFIG + + export TARGET=$(usex X . server) + local emakeargs=( + CC=$(tc-getCC) + AR=$(tc-getAR) + + # fix X11 path + X11_LIBS="$($(tc-getPKG_CONFIG) --libs x11 sm ice)" + + # useflags + enable_nls=$(usex nls) + without-libsensors=$(usex !lm-sensors) + without-ntlm=$(usex !ntlm) + without-ssl=$(usex ssl $(usex gnutls) yes) + without-gnutls=$(usex !gnutls) + ) + emake "${emakeargs[@]}" -C ${TARGET} +} + +src_install() { + local emakeargs=( + STRIP= + DESTDIR="${D}" + PKGCONFIGDIR="${ED}/usr/$(get_libdir)/pkgconfig" + CFGDIR="${ED}/etc" + ) + emake "${emakeargs[@]}" install -C ${TARGET} + + newinitd "${FILESDIR}"/gkrellmd.initd gkrellmd + newconfd "${FILESDIR}"/gkrellmd.conf gkrellmd + + local DOCS=( CHANGELOG.md CREDITS README ) + local HTML_DOCS=( *.html ) + einstalldocs +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "disk temperatures monitoring" app-admin/hddtemp +}