gentoo resync : 28.04.2021

4 files changed, 67 insertions, 4 deletions

diff --git a/x11-plugins/pidgin-gnome-keyring/Manifest b/x11-plugins/pidgin-gnome-keyring/Manifest
index 106d45374133..15cd14badd43 100644
--- a/x11-plugins/pidgin-gnome-keyring/Manifest
+++ b/x11-plugins/pidgin-gnome-keyring/Manifest
@@ -1,4 +1,6 @@
-AUX pidgin-gnome-keyring-2.0-plugindir.patch 793 BLAKE2B d0310e76a928023cbe4093b979b1def64fd525e281e1d8bfcf55b1d6c59d8f7ff35d626632dc6b49d693e305b386b1fd74cfc43eef236b2864a228e04735e33d SHA512 70c4580f79d339c40a47ec8b8ff636649430f14627a9c88478f330c978781ac9252642c793eb155b26f366eb90cc00cf69e144a5cbf9903ae7be1a67441b59be
+AUX pidgin-gnome-keyring-2.0-pkgconfig_dirs.patch 1136 BLAKE2B 98e87c5680a0ba4caad6ae5a4b9f99d88603fc77dd484cfc1f6c75c9a8ca06b482f05a78d12ee8def125db48ecf36aab3a50b865c14cb8ed0d5fc752a672a3b0 SHA512 a0b1ce7e24872d10f8225fd2be27b8b561ad37bad97962170989ed50060062298c89f1c67c2d1f1a0459f56f7eef1b549553f4e93cd96987674bf3b0a3d1688b
+AUX pidgin-gnome-keyring-2.0-plugindir.patch 724 BLAKE2B 89423d2a8e1b8d4ba7508fc08c29231d136c3549606a8721a9ab517ea6c6f55d7546ee50bd2d0fdadaae84496f4c083852cb7efd6c0cba8d3f0874f86205ae31 SHA512 ba98b088ea91219075c4ee4e471505ef65c6a91fb34c4cc0806a9c376b378b30dc34f8c7013ba96090c3a48964f4716b6dddb685368b24137e212144ecc4e71d
 DIST pidgin-gnome-keyring-2.0.tar.gz 12066 BLAKE2B 466abfa59fea84acd63e03bd2b2b9e7c5e40b63baf5bc1b80bb17fa1b910b3b8be4c3e4ee7fd4687625101dcac8d43e872b1e3dc7e231306b6f26ee0c14484c2 SHA512 b1f83c107631a7105aa517312f13d745922b8033afc15069cba1c515caeee9e6ad89c4c7a5f96c561713d7f7a6ca3f03cff8fb11566a8ea0d8980f10e85d4610
+EBUILD pidgin-gnome-keyring-2.0-r1.ebuild 720 BLAKE2B e63f12a0f6dfad57a41db618570f177712354587f720027f2a60151c4e0dc83b813b8597f577c7e0b347e2f6d055d917bf2e58371ca1468767452b5d87896569 SHA512 ad6fbc7d4b9d23c5cc43ab240b180620478c7a95ec9e89c045444ede0d4f20ff0815cbc695e376cac7d1d20783fad27faf4dffb4b2470e6ca6e6c129cc97dac7
 EBUILD pidgin-gnome-keyring-2.0.ebuild 857 BLAKE2B a666a8083eada8405530d29c9de4abd0e9fc7e413b94c66f4a1d50d125eeb8410bc7daa28d55c88c01e266985e1724527d01651cd806911ba8fe0b41c5bd7552 SHA512 b80bf78c54a8b66449176940e9aaa17eb3569875fb6ff3fd06ecc045b392b9d2527b89ca58dea4153e7f54bb928b266bcca23ce60228ecece282fc5de67eb160
 MISC metadata.xml 601 BLAKE2B addada712eacbbc687e3483c3fa41e833ef1432dab4f13f1b5848e1b1bcdb09d176f989c8ff4ddb0eb85041cda73fa1369b716cd9e7129433c8e9ace7d76d93a SHA512 8c30a86da0a41a8e47009cfafecae861d6389c6dbe0d14c68200d1b2a6c83b047befca74f70ac8652ba22fd2c738a1ce41fe63186fc7a2e5762d348c08635970
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 000000000000..4f33cee65318
--- /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/files/pidgin-gnome-keyring-2.0-plugindir.patch b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
index 6aa6ffca3c52..a96080fc6aa3 100644
--- a/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
+++ b/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
@@ -1,10 +1,10 @@
---- a/Makefile	2015-02-07 03:23:05.000000000 +0000
-+++ b/Makefile	2016-04-28 09:53:59.915565380 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -2,6 +2,7 @@
  
  SECRETFLAGS = `pkg-config --libs --cflags libsecret-1`
  PURPLEFLAGS = `pkg-config --cflags purple`
-+PLUGINDIR = `pkg-config --variable=plugindir purple`
++PLUGINDIR = `${PKG_CONFIG} --variable=plugindir purple`
  VERSION = $(shell cat VERSION)
  ifeq ($(strip $(VERSION)),)
  	VERSION = `git describe --tags`
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 000000000000..0bbf1d34fc26
--- /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"
+}