gentoo resync : 31.05.2021

11 files changed, 83 insertions, 65 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 4e3e6f6a206a..283124a63a29 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-gnome-keyring/Manifest b/x11-plugins/pidgin-gnome-keyring/Manifest
index 15cd14badd43..65665082e7a7 100644
--- a/x11-plugins/pidgin-gnome-keyring/Manifest
+++ b/x11-plugins/pidgin-gnome-keyring/Manifest
@@ -1,6 +1,4 @@
 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
+EBUILD pidgin-gnome-keyring-2.0-r1.ebuild 718 BLAKE2B 04a910338f83cd17574aa95692a64d6947a1dd4e9089dce9e765f6ce39712f7a66614e47933479cb236821e0586d43ae8dfaec38676b8ec4fb685761d841b561 SHA512 b167032e0986cbf2818358556cc824e8b23835157ab30a2a26cd9562d13df49c3f85bafe915b0af564f355af9d263305dc60125524f0c052904ae7582144e301
 MISC metadata.xml 601 BLAKE2B addada712eacbbc687e3483c3fa41e833ef1432dab4f13f1b5848e1b1bcdb09d176f989c8ff4ddb0eb85041cda73fa1369b716cd9e7129433c8e9ace7d76d93a SHA512 8c30a86da0a41a8e47009cfafecae861d6389c6dbe0d14c68200d1b2a6c83b047befca74f70ac8652ba22fd2c738a1ce41fe63186fc7a2e5762d348c08635970
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
deleted file mode 100644
index a96080fc6aa3..000000000000
--- a/x11-plugins/pidgin-gnome-keyring/files/pidgin-gnome-keyring-2.0-plugindir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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`
- VERSION = $(shell cat VERSION)
- ifeq ($(strip $(VERSION)),)
- 	VERSION = `git describe --tags`
-@@ -18,8 +19,8 @@
- 	${CC} ${CFLAGS} ${LDFLAGS} -Wall -I. -g -O2 ${TARGET}.c -o ${TARGET}.so -shared -fPIC -DPIC -ggdb ${PURPLEFLAGS} ${SECRETFLAGS} -DVERSION=\"${VERSION}\"
- 
- install: ${TARGET}.so
--	mkdir -p ${DESTDIR}/usr/lib/purple-2/
--	cp ${TARGET}.so ${DESTDIR}/usr/lib/purple-2/
-+	mkdir -p ${DESTDIR}/$(PLUGINDIR)/
-+	cp ${TARGET}.so ${DESTDIR}/$(PLUGINDIR)/
- 
- 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
index 0bbf1d34fc26..84ee25614882 100644
--- 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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/aebrahim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-crypt/libsecret
 	net-im/pidgin"
diff --git a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild b/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
deleted file mode 100644
index 221d0975bdde..000000000000
--- a/x11-plugins/pidgin-gnome-keyring/pidgin-gnome-keyring-2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-plugindir.patch"
-)
-
-src_prepare() {
-	default
-
-	# This file is used by the upstream Makefile yet is missing from at least
-	# some release tarballs.
-	if [ ! -f VERSION ]; then
-		echo "${PV}" > VERSION || die "failed to recreate VERSION file"
-	fi
-
-	sed -i \
-		-e 's|-O2||g' \
-		-e 's|-ggdb||g' \
-		-e 's|-g||g' \
-		Makefile || die "stripping hard-coded flags failed"
-}
diff --git a/x11-plugins/pidgin-gpg/Manifest b/x11-plugins/pidgin-gpg/Manifest
index 2d6b40d32a13..75c4b99d4856 100644
--- a/x11-plugins/pidgin-gpg/Manifest
+++ b/x11-plugins/pidgin-gpg/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-gpg-0.9.3.tar.gz 806492 BLAKE2B 67ca75307419fe25d6a7f90ce33f63e736eae59e0cab9fd2fafbf7f9ccd61569fb9906e755163400c462bcd63fa8e9b1e42deb98e459fb9e070d73de9cfb28ab SHA512 bff7ec08d7999d40b689aabc0b559b7eab1fae765b6ffc799e355601ac3a2bb05c3831c1e56e30b95f387c446f7d07d1576af7e7824094fca9ac6c6636d62f6c
-EBUILD pidgin-gpg-0.9.3.ebuild 587 BLAKE2B 227a5be81c857baf27ee7fca8dae72559a48a933ec4d31d03880e0d157c77fc4b54d2b6ed9018f5ce89b1a856892f08b2829b1a1b9c15bd4af3ccaa9f84ea1a3 SHA512 d3e5fc8313d7947ba044cdd445a231c8d166d0e1febb47ae7f6dea553ba7b13937e8d46ed3c0b0237743205e1c2b04454c8a40902546499bcdf7c3fffb15bc13
+EBUILD pidgin-gpg-0.9.3.ebuild 594 BLAKE2B 2044957f9c8489852b934af8fce9ea9f7cb64f203fca7977b9ec9e48c78d9542cb93a089b75d098019c1cafef98e4c5fa3a952d38eaf1da21c08d564f559cf0d SHA512 bbf8d7d973b3be0cab9defa7651e4376f9d47ef61de910bf25531d8830155bc5593aa594b6748afa75f4ae6d0bfdf3d614d98c8040a63353c7eaddb3d26e99b0
 MISC metadata.xml 601 BLAKE2B a50fd4f65b5a35ced398de8cb427c1e8fb1969f9a594970b6178e4ba3b2e52bf1fffde004fe1bb51ab3a045a8acd0bd9e013e57608b9566aad942b27ecb1c8ec SHA512 b35e806fe2c3901cad3dda6adac3b6f76d45c23205e4cf1a4370d7501a3be11d4b7ea4825a9e802715caa8da416306dc09e075bf38fd8320435e0826b7928a71
diff --git a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
index 653c0ced057d..f699f16d0bb9 100644
--- a/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
+++ b/x11-plugins/pidgin-gpg/pidgin-gpg-0.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit autotools ltprune
+inherit autotools
 
 DESCRIPTION="Pidgin GPG/OpenPGP (XEP-0027) plugin"
 HOMEPAGE="https://github.com/Draghtnod/Pidgin-GPG"
@@ -27,5 +27,5 @@ src_prepare() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/x11-plugins/pidgin-indicator/Manifest b/x11-plugins/pidgin-indicator/Manifest
new file mode 100644
index 000000000000..4fbfc11b49ca
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/Manifest
@@ -0,0 +1,4 @@
+AUX pidgin-indicator-1.0.1-appindicator3.patch 686 BLAKE2B 0202142d16dc73b6ceef3451d74f157532f426fd2414d8782914e247e5989df86f6ed3c96e1bd66277ad905345178ff1a10c222ba3c9839c950159ee8ec30c2e SHA512 133f02b1a63c236d9327016630139f4bbbc755556ddcf150382a61fb2a6d8b0b4ea63be89c1b6181e467601ea055c0b9927ffe035878d366a9a321febb21c9e9
+DIST pidgin-indicator-1.0.1.tar.bz2 311197 BLAKE2B 53c29c5c549f77caabbbbea69c447c2c092e063ee8d1a082507ec195ef7be45bf150e7831ff27c7759c79fc31ce289cd374fb7734f5171a9853e5fd37ac05bd3 SHA512 a39a285309242cfd121cff6aa6466cc2d6b4e37787cce87b9b7ed00a4147fee8ce2e9c6817212680c81b20b9c0bf7dac5d501861e6feffd8d0479a8293ad8201
+EBUILD pidgin-indicator-1.0.1.ebuild 871 BLAKE2B a1eb06aace6d75e165a8c047e739ece80ad5e1214666eb9d9c0646e34e984aeae6641942681f3d759ab72cffa4fcaab1002c79563bf32c7dea03dc8d5803047d SHA512 d233da0525c440bf12fe860dc81699faf40d98ae748b177c476f091eb2997b8da3f69dc44142633cd516417e47d867d613252abbee86bc34a992cdb2c5f99759
+MISC metadata.xml 241 BLAKE2B af805c04655da4d349b84babd949495eb28edc9da90ed33277cb47f062068245e4366fb20ccbe516fc605f8eb6fc7a1f116e1c3b7a63a0309e1808488caf7e36 SHA512 f81b0132d3fda7a1b9f7c331de3bf1fd7550969f9a9e18432943081b89fb28dd9479cf0deb451f2ef90120efe52c1a437e6a90091104c7dc2272298494922afd
diff --git a/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-appindicator3.patch b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-appindicator3.patch
new file mode 100644
index 000000000000..436166fe3996
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-appindicator3.patch
@@ -0,0 +1,22 @@
+From b0d26dd060475505f3c0a6369f4fbbd3c20d84b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Patrick=20H=C3=B6hn?= <hoehnp@users.noreply.github.com>
+Date: Fri, 7 Feb 2020 10:26:46 +0100
+Subject: [PATCH] Update configure.ac to make compatible with python3
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dfd8a1b..fefd90d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,7 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+ AC_SUBST(GTK_LIBS)
+ AC_SUBST(GTK_CFLAGS)
+ 
+-PKG_CHECK_MODULES(INDICATOR, [appindicator-0.1])
++PKG_CHECK_MODULES(INDICATOR, [appindicator3-0.1])
+ AC_SUBST(INDICATOR_LIBS)
+ AC_SUBST(INDICATOR_CFLAGS)
+ 
diff --git a/x11-plugins/pidgin-indicator/metadata.xml b/x11-plugins/pidgin-indicator/metadata.xml
new file mode 100644
index 000000000000..5e1cee9e7c1e
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>pacho@gentoo.org</email>
+  <name>Pacho Ramos</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
new file mode 100644
index 000000000000..b3e06a3579ee
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg
+
+DESCRIPTION="AppIndicator/KStatusNotifierItem plugin for Pidgin"
+HOMEPAGE="https://github.com/philipl/pidgin-indicator"
+SRC_URI="https://github.com/philipl/pidgin-indicator/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+# No direct gtk3 until pidgin migrates:
+# https://github.com/philipl/pidgin-indicator/issues/32
+RDEPEND="
+	dev-libs/libappindicator:3
+	net-im/pidgin[gtk]
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-appindicator3.patch"
+)
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
+}