From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5049415808D for ; Thu, 21 Apr 2022 19:55:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 383ECE0AA5; Thu, 21 Apr 2022 19:55:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3A7E3E0AA3 for ; Thu, 21 Apr 2022 19:55:36 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B2605341C78 for ; Thu, 21 Apr 2022 19:55:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2401442F for ; Thu, 21 Apr 2022 19:55:31 +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: <1650570879.f02baf42d610b3ec3bf73aac713837c3f8a72267.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrelltop/, x11-plugins/gkrelltop/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild X-VCS-Directories: x11-plugins/gkrelltop/files/ x11-plugins/gkrelltop/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f02baf42d610b3ec3bf73aac713837c3f8a72267 X-VCS-Branch: master Date: Thu, 21 Apr 2022 19:55:31 +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: c9471f31-377d-41d9-8d93-84fbfbc7a012 X-Archives-Hash: fa89439d10be4eeb31815aa975832f70 commit: f02baf42d610b3ec3bf73aac713837c3f8a72267 Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Mon Apr 4 12:12:49 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 21 19:54:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02baf42 x11-plugins/gkrelltop: update EAPI 6 -> 8 Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Signed-off-by: Sam James gentoo.org> .../files/gkrelltop-2.2.13-r3-pkgconfig.patch | 67 ++++++++++++++++++++++ x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild | 47 +++++++++++++++ 2 files changed, 114 insertions(+) diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch new file mode 100644 index 000000000000..552190827da5 --- /dev/null +++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-r3-pkgconfig.patch @@ -0,0 +1,67 @@ +Makefile and configure should respect user's pkg-config +--- a/Makefile ++++ b/Makefile +@@ -28,9 +28,10 @@ + OSFLAG = $(shell uname | tr '[:lower:]' '[:upper:]') + SHELL=/bin/sh + ++PKG_CONFIG ?= pkg-config + GKRELL1FLAG=1 + #find out if we have gkrellm 2 or 1 (from the gtk+ version) +-GKRELL1FLAG=$(shell bash -c 'pkg-config gtk+-2.0 --cflags &>/dev/null && echo 0') ++GKRELL1FLAG=$(shell bash -c "${PKG_CONFIG} gtk+-2.0 --cflags &>/dev/null && echo 0") + GKRELLTOP = gkrelltop.so + OBJ = top_three.o gkrelltop.o + EXTRA = krell_panel1.xpm +@@ -43,7 +44,8 @@ endif + + ifeq ($(GKRELL1FLAG),0) + # Parameters for gkrellm version 2.* +-CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags` ++GTK_INCLUDE=$(shell ${PKG_CONFIG} gtk+-2.0 --cflags) ++CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall ${GTK_INCLUDE} + LIBS = + CC += $(CFLAGS) $(CFLAGS2) + +@@ -69,8 +71,9 @@ LIBSD = `glib-config --libs` + LIBSD = + CONFIGURE_ARGS += --with-glib12 + else +-CFLAGSD = -D$(OSFLAG) -fPIC -Wall `pkg-config glib-2.0 --cflags` +-LIBSD = `pkg-config glib-2.0 --libs` ++GLIB_INCLUDE=$(shell ${PKG_CONFIG} glib-2.0 --cflags) ++CFLAGSD = -D$(OSFLAG) -fPIC -Wall ${GLIB_INCLUDE} ++LIBSD = $(shell ${PKG_CONFIG} glib-2.0 --libs) + LIBSD = + endif + INSTALLDIRD ?= $(PREFIXD)/$(DESTDIR) +diff --git a/configure b/configure +index f0b7366..99f58d8 100755 +--- a/configure ++++ b/configure +@@ -4,8 +4,9 @@ + # There is no need to run this configure before doing a make. + # + +-GLIB_INCLUDE=`pkg-config --cflags glib-2.0` +-GLIB_LIBS=`pkg-config --libs glib-2.0` ++PKG_CONFIG=${PKG_CONFIG-pkg-config} ++GLIB_INCLUDE=$(${PKG_CONFIG} --cflags glib-2.0) ++GLIB_LIBS=$(${PKG_CONFIG} --libs glib-2.0) + + for i + do +@@ -17,8 +18,8 @@ do + done + + +-PKG_INCLUDE=`pkg-config gkrellm --cflags --silence-errors` +-PKG_LIBS=`pkg-config gkrellm --libs --silence-errors` ++PKG_INCLUDE=$(${PKG_CONFIG} gkrellm --cflags --silence-errors) ++PKG_LIBS=$(${PKG_CONFIG} gkrellm --libs --silence-errors) + + if [ "$PKG_INCLUDE" = "" ] + then +-- +2.34.1 + diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild new file mode 100644 index 000000000000..c9faf9266655 --- /dev/null +++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r3.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit gkrellm-plugin toolchain-funcs + +DESCRIPTION="a GKrellM2 plugin which displays the top three processes" +HOMEPAGE="https://sourceforge.net/projects/gkrelltop" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz" +S="${WORKDIR}/${P}.orig" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="X" + +RDEPEND=" + app-admin/gkrellm:2[X] + dev-libs/glib:2 + x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch + "${FILESDIR}"/${PN}-2.2.13-r3-pkgconfig.patch +) + +src_configure() { + tc-export CC PKG_CONFIG + + PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) ) + PLUGIN_SO=( gkrelltop$(get_modname) ) + + default +} + +src_compile() { + use X || local target="server" + emake ${target} +} + +pkg_postinst() { + einfo "To enable the gkrelltopd server plugin, you must add the following" + einfo "line to /etc/gkrellmd.conf:" + einfo "\tplugin-enable gkrelltopd" +}