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

["Pacho Ramos" <pacho@gentoo.org>]

commit:     3520984a77497862b87451b979b75007b6d8e303
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 22 12:29:47 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Jan 22 12:45:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3520984a

x11-plugins/pidgin-indicator: Use ayatana indicators

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../pidgin-indicator-1.0.1-ayatana-indicator.patch | 59 ++++++++++++++++++++++
 ...0.1.ebuild => pidgin-indicator-1.0.1-r1.ebuild} | 13 ++---
 .../pidgin-indicator/pidgin-indicator-1.0.1.ebuild |  2 +-
 3 files changed, 67 insertions(+), 7 deletions(-)

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/pidgin-indicator-1.0.1.ebuild b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild
similarity index 77%
copy from x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
copy to x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild
index 381a03e9919d..1d3cef23947e 100644
--- a/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1.ebuild
+++ b/x11-plugins/pidgin-indicator/pidgin-indicator-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 inherit autotools xdg
 
 DESCRIPTION="AppIndicator/KStatusNotifierItem plugin for Pidgin"
@@ -10,13 +10,13 @@ SRC_URI="https://github.com/philipl/pidgin-indicator/releases/download/${PV}/${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~riscv"
+KEYWORDS="~amd64 ~riscv"
 IUSE=""
 
 # No direct gtk3 until pidgin migrates:
 # https://github.com/philipl/pidgin-indicator/issues/32
 RDEPEND="
-	dev-libs/libappindicator:3
+	dev-libs/libayatana-indicator
 	net-im/pidgin[gtk]
 	x11-libs/gtk+:2
 "
@@ -31,14 +31,15 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${P}-appindicator3.patch"
+	"${FILESDIR}/${P}-ayatana-indicator.patch"
 )
 
 src_prepare() {
-	xdg_src_prepare
+	default
 	eautoreconf
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die "Pruning failed"
+	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