[gentoo-commits] repo/gentoo:master commit in: x11-plugins/pidgin-gnome-keyring/, x11-plugins/pidgin-gnome-keyring/files/

[Marek Szuba]

commit:     6d117a5f516289df25c66703b1a9620826078f0a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 09:33:00 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> 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 <marecki <AT> 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"
+}