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 F3F4E15808D 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 510A8E0AA7; Thu, 21 Apr 2022 19:55:37 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39F0AE0AA1 for ; Thu, 21 Apr 2022 19:55:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 9929C3418D4 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 A6EAF3C7 for ; Thu, 21 Apr 2022 19:55:30 +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: <1650570874.9f5fe0f7aa0b3ddf7da451784a73dfc179fe79f6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellm-xkb/files/, x11-plugins/gkrellm-xkb/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild X-VCS-Directories: x11-plugins/gkrellm-xkb/files/ x11-plugins/gkrellm-xkb/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 9f5fe0f7aa0b3ddf7da451784a73dfc179fe79f6 X-VCS-Branch: master Date: Thu, 21 Apr 2022 19:55:30 +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: 013870dd-a0f1-4897-97b4-6b3139fbeedb X-Archives-Hash: 9892e0b98d01a075d2859f4f5187dd6a commit: 9f5fe0f7aa0b3ddf7da451784a73dfc179fe79f6 Author: Thomas Bracht Laumann Jespersen laumann xyz> AuthorDate: Sat Mar 26 15:13:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 21 19:54:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f5fe0f7 x11-plugins/gkrellm-xkb: update EAPI 6 -> 8 Signed-off-by: Thomas Bracht Laumann Jespersen laumann.xyz> Signed-off-by: Sam James gentoo.org> .../files/gkrellm-xkb-1.05-r2-pkgconfig.patch | 30 ++++++++++++++++++++ x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild | 33 ++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch new file mode 100644 index 000000000000..59208c8814bb --- /dev/null +++ b/x11-plugins/gkrellm-xkb/files/gkrellm-xkb-1.05-r2-pkgconfig.patch @@ -0,0 +1,30 @@ +From f4cd320421d80075c280dc23115d00ecefb8501c Mon Sep 17 00:00:00 2001 +From: Thomas Bracht Laumann Jespersen +Date: Sat, 26 Mar 2022 16:08:49 +0100 +Subject: [PATCH] pkgconfig + +--- + Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 13f2dd3..a63b4ab 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,10 @@ + + PREFIX ?= /usr/local +-GTK_CONFIG = pkg-config gtk+-2.0 ++PKG_CONFIG ?= pkg-config + PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins + GKRELLM_INCLUDE = -I$(PREFIX)/include +-GTK_CFLAGS = `$(GTK_CONFIG) --cflags` +-GTK_LIB = `$(GTK_CONFIG) --libs` ++GTK_CFLAGS = $(shell ${PKG_CONFIG} gtk+-2.0 --cflags) ++GTK_LIB = $(shell ${PKG_CONFIG} gtk+-2.0 --libs) + FLAGS = -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) + LFLAGS = -shared +-- +2.34.1 + diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild new file mode 100644 index 000000000000..c148d04e190e --- /dev/null +++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gkrellm-plugin toolchain-funcs + +DESCRIPTION="XKB keyboard switcher for gkrellm2" +HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/" +SRC_URI="http://tripie.sweb.cz/gkrellm/xkb/dist/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-admin/gkrellm:2[X]" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-makefile.patch + "${FILESDIR}"/${P}-r2-pkgconfig.patch +) + +src_configure() { + PLUGIN_SO=( xkb$(get_modname) ) + default +} + +src_compile() { + tc-export PKG_CONFIG + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" +}