gentoo auto-resync : 22:01:2023 - 18:53:30

6 files changed, 114 insertions, 5 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3f5d42b32ab6..440b320e5df9 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-indicator/Manifest b/x11-plugins/pidgin-indicator/Manifest
index cff7793b78d4..c9b6dc45d60e 100644
--- a/x11-plugins/pidgin-indicator/Manifest
+++ b/x11-plugins/pidgin-indicator/Manifest
@@ -1,4 +1,6 @@
 AUX pidgin-indicator-1.0.1-appindicator3.patch 686 BLAKE2B 0202142d16dc73b6ceef3451d74f157532f426fd2414d8782914e247e5989df86f6ed3c96e1bd66277ad905345178ff1a10c222ba3c9839c950159ee8ec30c2e SHA512 133f02b1a63c236d9327016630139f4bbbc755556ddcf150382a61fb2a6d8b0b4ea63be89c1b6181e467601ea055c0b9927ffe035878d366a9a321febb21c9e9
+AUX pidgin-indicator-1.0.1-ayatana-indicator.patch 2066 BLAKE2B 73d59bfdae09f9c95b9c72f5bdcf1537cb4cf12438ed886f11efc55ffbdb3577b5bdbd00211edb3385c880b337a617be60c46268a560611298a7275d1ada6b42 SHA512 1b6a403630b5d91a2620e7927aefa422291769cb9924a6c7770aad8885057ce6babeb78706793b205bcf544b288ba38bd340207aa0fe01ec446b628eeb76780b
 DIST pidgin-indicator-1.0.1.tar.bz2 311197 BLAKE2B 53c29c5c549f77caabbbbea69c447c2c092e063ee8d1a082507ec195ef7be45bf150e7831ff27c7759c79fc31ce289cd374fb7734f5171a9853e5fd37ac05bd3 SHA512 a39a285309242cfd121cff6aa6466cc2d6b4e37787cce87b9b7ed00a4147fee8ce2e9c6817212680c81b20b9c0bf7dac5d501861e6feffd8d0479a8293ad8201
-EBUILD pidgin-indicator-1.0.1.ebuild 878 BLAKE2B f8dcd1ab542365e13892e3e426e6be6b9beebfed7ea814f4b41332a6b2d91f2d1c9fd82d5753f340fbde4aba0424355b7600f344635d351d816a5c9647c3cc3c SHA512 417cd0b1b8da20adc24c7b27f3f0e3b14b0d960a2ce8df3f8ed3a0fc3f9a1b37f2080809c8d191b08e0ca4df79ed9771a180c9355400fe8eb71f100efebff040
-MISC metadata.xml 242 BLAKE2B 9db96deb0ac0f0c56005569bfe8636cf19c8ec5b5eaf79ef19ea822bac91af7f51b011d87a916685b85ef4f26d61c73bd1c86ff62f883ff9b41f107f19c03a6f SHA512 ea993245936afaef29665b80b5c74b526fc6f53998d2727e33599fd27f363132684857f194ef7f15a64faed22809c937209615b45f1a537d11e349f61bde4969
+EBUILD pidgin-indicator-1.0.1-r1.ebuild 910 BLAKE2B 3b243f5956857588c4b64654879563671f8108641965e56c2289968c78026536836f25d2fcd236e29e91e5fd6cb14cbb12189cdb8242ec0c1e9814ede10aa02d SHA512 37fd9210f82f587cf8c0ce16d555513ceb92dd16f6fabd4823d7d40ee03b4c38ce7ccd892bcf6cb1d19e6c34cc1e5a998d563a70387a6764405d33252ca99806
+EBUILD pidgin-indicator-1.0.1.ebuild 878 BLAKE2B c61d545b751fe2502b7710fa65ab617cf490f212270b595df8584fb0afa3699abb60fbfd7ccd4fd78b381bdc5abe4002fd3c86d49244085897f1bbab1de4e43a SHA512 48304be615ce4f216d927149360f456ebb508dc8b86ad6128b1d196d5cd79f48b0bd5e6630518f835f3ea4a39c7713860a3c30a7d556acf125131f258724b83a
+MISC metadata.xml 326 BLAKE2B 4e224ae375dc6710c52496cb0fcff6056851eb542e34283b51a33522587e38a582b3ca3d4250b182047954e0add6acd92ac02c316994a2e38d6abca12eaa9293 SHA512 cbceb28d799cd33feef00eac6a78e13beeb79b475c24a8e8a1001be8e923371b4ae785f3cdf0e2c7db335f4fdfbc9d08f913b8417004b072e6490d58a60c5392
diff --git a/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch
new file mode 100644
index 000000000000..f3061bc8dee1
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/files/pidgin-indicator-1.0.1-ayatana-indicator.patch
@@ -0,0 +1,59 @@
+From 0376453849ca2e7ba5ab1ff7feb7a527ec0b1045 Mon Sep 17 00:00:00 2001
+From: Kevin Locke <kevin@kevinlocke.name>
+Date: Tue, 22 Feb 2022 18:43:11 -0700
+Subject: [PATCH] Support Ayatana AppIndicators
+
+Ubuntu AppIndicator ([libappindicator]) was [removed in Debian Bullseye]
+and has been superseded by Ayatana AppIndicator
+([libayatana-appindicator]) for both [Debian] and [Ubuntu].
+
+Add support for building with libayatana-appindicator instead of
+libappindicator.
+
+[libappindicator]: https://launchpad.net/libappindicator
+[libayatana-appindicator]: https://github.com/AyatanaIndicators/libayatana-appindicator
+[Debian]: https://lists.debian.org/debian-devel/2018/03/msg00506.html
+[Ubuntu]: https://bugs.launchpad.net/ubuntu/+source/libayatana-appindicator/+bug/1915695
+[removed in Debian Bullseye]: https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html#noteworthy-obsolete-packages
+
+Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
+---
+ configure.ac           | 6 +++++-
+ debian/control         | 2 +-
+ src/pidgin-indicator.c | 6 +++++-
+ 3 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fefd90d..195651e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,11 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+ AC_SUBST(GTK_LIBS)
+ AC_SUBST(GTK_CFLAGS)
+ 
+-PKG_CHECK_MODULES(INDICATOR, [appindicator3-0.1])
++PKG_CHECK_MODULES(
++	[INDICATOR],
++	[ayatana-appindicator3-0.1],
++	[AC_DEFINE([HAVE_AYATANA_INDICATOR], [1], [Have Ayatana AppIndicator])],
++	[PKG_CHECK_MODULES([INDICATOR], [appindicator3-0.1])])
+ AC_SUBST(INDICATOR_LIBS)
+ AC_SUBST(INDICATOR_CFLAGS)
+ 
+diff --git a/src/pidgin-indicator.c b/src/pidgin-indicator.c
+index 9eeb8a4..9382a95 100644
+--- a/src/pidgin-indicator.c
++++ b/src/pidgin-indicator.c
+@@ -41,7 +41,11 @@
+ #include <savedstatuses.h>
+ #include <version.h>
+ 
+-#include <libappindicator/app-indicator.h>
++#ifdef HAVE_AYATANA_INDICATOR
++# include <libayatana-appindicator/app-indicator.h>
++#else
++# include <libappindicator/app-indicator.h>
++#endif
+ 
+ #include "docklet.h"
+ 
diff --git a/x11-plugins/pidgin-indicator/metadata.xml b/x11-plugins/pidgin-indicator/metadata.xml
index b04f4b7da0d0..b4940dcfe9a1 100644
--- a/x11-plugins/pidgin-indicator/metadata.xml
+++ b/x11-plugins/pidgin-indicator/metadata.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-  <email>pacho@gentoo.org</email>
-  <name>Pacho Ramos</name>
+	<email>pacho@gentoo.org</email>
+	<name>Pacho Ramos</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">philipl/pidgin-indicator</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..1d3cef23947e
--- /dev/null
+++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+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 ~riscv"
+IUSE=""
+
+# No direct gtk3 until pidgin migrates:
+# https://github.com/philipl/pidgin-indicator/issues/32
+RDEPEND="
+	dev-libs/libayatana-indicator
+	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"
+	"${FILESDIR}/${P}-ayatana-indicator.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
index 381a03e9919d..1a903c3269d2 100644
--- a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
+++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7