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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 801371382C5 for ; Tue, 20 Apr 2021 09:42:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B49F0E0817; Tue, 20 Apr 2021 09:42:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 88BF6E0817 for ; Tue, 20 Apr 2021 09:42:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF43C340E4D for ; Tue, 20 Apr 2021 09:42:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C26164B for ; Tue, 20 Apr 2021 09:42:35 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1618911746.6d117a5f516289df25c66703b1a9620826078f0a.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-gnome-keyring/, x11-plugins/pidgin-gnome-keyring/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild X-VCS-Directories: x11-plugins/pidgin-gnome-keyring/ x11-plugins/pidgin-gnome-keyring/files/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 6d117a5f516289df25c66703b1a9620826078f0a X-VCS-Branch: master Date: Tue, 20 Apr 2021 09:42:35 +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: 15597c6f-9076-482c-af07-4f591fe170a6 X-Archives-Hash: 0d53761de6a234f670455c4e1ef2c083 commit: 6d117a5f516289df25c66703b1a9620826078f0a Author: Marek Szuba gentoo org> AuthorDate: Tue Apr 20 09:33:00 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Apr 20 09:42:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d117a5f x11-plugins/pidgin-gnome-keyring: fix pkgconfig calls in the Makefile For some reason upstream has opted to this as `pkg-config foo`, which as reported in Bug #784323 does not always (I still cannot reproduce it on my end) work as it should. Do it the proper Make way, i.e. with $(shell pkg-config foo). While at it, bump the package to EAPI 7. Closes: https://bugs.gentoo.org/784323 Signed-off-by: Marek Szuba gentoo.org> .../pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch | 32 ++++++++++++++++++++++ .../pidgin-gnome-keyring-2.0-r1.ebuild | 29 ++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch new file mode 100644 index 00000000000..4f33cee6531 --- /dev/null +++ b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch @@ -0,0 +1,32 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,10 +1,11 @@ + TARGET = gnome-keyring + +-SECRETFLAGS = `pkg-config --libs --cflags libsecret-1` +-PURPLEFLAGS = `pkg-config --cflags purple` +-VERSION = $(shell cat VERSION) ++SECRETFLAGS := $(shell pkg-config --libs --cflags libsecret-1) ++PURPLEFLAGS := $(shell pkg-config --cflags purple) ++PLUGINDIR := $(shell pkg-config --variable=plugindir purple) ++VERSION := $(shell cat VERSION) + ifeq ($(strip $(VERSION)),) +- VERSION = `git describe --tags` ++ VERSION := $(shell git describe --tags) + endif + + all: ${TARGET}.so +@@ -15,11 +16,10 @@ + + ${TARGET}.so: ${TARGET}.c + +- ${CC} ${CFLAGS} ${LDFLAGS} -Wall -I. -g -O2 ${TARGET}.c -o ${TARGET}.so -shared -fPIC -DPIC -ggdb ${PURPLEFLAGS} ${SECRETFLAGS} -DVERSION=\"${VERSION}\" ++ ${CC} ${CFLAGS} ${LDFLAGS} -Wall -I. ${TARGET}.c -o ${TARGET}.so -shared -fPIC -DPIC ${PURPLEFLAGS} ${SECRETFLAGS} -DVERSION=\"${VERSION}\" + + install: ${TARGET}.so +- mkdir -p ${DESTDIR}/usr/lib/purple-2/ +- cp ${TARGET}.so ${DESTDIR}/usr/lib/purple-2/ ++ install -D ${TARGET}.so ${DESTDIR}/$(PLUGINDIR)/${TARGET}.so + + install_local: ${TARGET}.so + mkdir -p ~/.purple/plugins diff --git a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild new file mode 100644 index 00000000000..0bbf1d34fc2 --- /dev/null +++ b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Integrates Pidgin (and libpurple) with the system keyring" +HOMEPAGE="https://github.com/aebrahim/pidgin-gnome-keyring" +SRC_URI="https://github.com/aebrahim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="app-crypt/libsecret + net-im/pidgin" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-pkgconfig_dirs.patch" +) + +src_prepare() { + default + + # This file is used by the upstream Makefile yet as of 2.0 is still missing + # from release tarballs. + echo "${PV}" > VERSION || die "Failed to recreate version file" +}