gentoo auto-resync : 23:03:2025 - 00:31:41

3 files changed, 20 insertions, 26 deletions

diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index aa1afbb6c43a..ddc5056715b9 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-2.14.13.tar.bz2 8230755 BLAKE2B 38dc8bbd8966b0fce9bdcc043077628df172568490c390e1b6730a326398557b0df2f6289c8fbcb55bee0dd73fad6efc4ca0341c0d172326ba69a6cc5afbd35c SHA512 8bce143079c9421370ec4762d6fdb9b4cacf41c754eecf55c678943b834b709af9c1969070f30361341c0f51576cad4dfcaff89935c2160446be46deb8d2d3ef
-EBUILD pidgin-2.14.13.ebuild 7899 BLAKE2B be8442f8269ad299ad94303ae6ee1bf78d01673dd56c8f55f56409526bb57cdc3edb1608515373235266c18c58f987fc166192f259f2e2e18e26cc3fec7048b1 SHA512 f94cecd4f1664d0ef524278f642c4a0c75425f2001a59c016b2c99afc4ddb5f4a6fbefce69f6017ba2212471916a06b59c99a76c255e92f1b6c2972e60f2f1fe
-MISC metadata.xml 1427 BLAKE2B 1fc5e939ab85b6ee53c8a28bdcb2c6ebc848538d60bf168e99b37c9cd8f95f54cd6fc908ed8c18c157b332384de54099e64e0ff012b620861d3ad248ab1fb185 SHA512 7ddab544366efdf7a58d3b61666c057d480516da649e0386530eac8b2169e0c44fedfbe6dbdc30327cb14ec1cad1e1f501545a2b4bb3614ab09e787ed9f34749
+EBUILD pidgin-2.14.13-r1.ebuild 7669 BLAKE2B e148f208192ee5566bd30f89d8d33658f511796bb3e0f6f230bb94f60dfc5cd8765013c181b5a6ed0a60f5e0fa5ed3fa8d9c4491d81c3b7734f5efcce77f59e5 SHA512 028b2d09449dce7d9cea8d22a207f225bc9c0d7dc4c7dad2f3babedcdd1b65efd8f0728b4a8989a3328340ff27f95993d2b5b062c10cd3fb04f0a3bf7a264dbd
+MISC metadata.xml 1367 BLAKE2B 21a005bee47ca80aff50e9a8532efcb68f255373f54c96223aec19ce0be209f1fd44db69c4656226d824a2ad735cc004759163501cfb837fcbaf6a1a1fc29e9e SHA512 8c693cdccdf7d3cd4472e2bcb940934451cd614ec5339dabe1ad1a44202880c4f05b7548f48bfc52a5f2eb18bb9ed1f41bae5b9e62c84daa93dc05a48c23f556
diff --git a/net-im/pidgin/metadata.xml b/net-im/pidgin/metadata.xml
index 8875dc41710e..4778b8643c61 100644
--- a/net-im/pidgin/metadata.xml
+++ b/net-im/pidgin/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="gadu">Enable Gadu Gadu protocol support</flag>
 		<flag name="groupwise">Enable Novell Groupwise protocol support</flag>
 		<flag name="gstreamer">Enables voice and video sessions</flag>
-		<flag name="gtk">Builds Pidgin, the GTK+ interface</flag>
 		<flag name="meanwhile">Enable meanwhile support for Sametime protocol</flag>
 		<flag name="ncurses">Build finch, console interface</flag>
 		<flag name="prediction">Enable Contact Availability Prediction plugin</flag>
diff --git a/net-im/pidgin/pidgin-2.14.13.ebuild b/net-im/pidgin/pidgin-2.14.13-r1.ebuild
index 971afeb79ffb..b008a0e36ff7 100644
--- a/net-im/pidgin/pidgin-2.14.13.ebuild
+++ b/net-im/pidgin/pidgin-2.14.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,10 +15,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
 KEYWORDS="~alpha amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-# The new gui useflag depends on the gtk useflag, as most pidgin plugins depend
-# on the gtk flag. As soon as all plugins have been updated to use the new
-# gui flag, the gtk flag can get removed.
-IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gtk +gui idn
+IUSE="aqua dbus debug doc eds gadu gnutls groupwise +gstreamer +gui idn
 meanwhile ncurses networkmanager nls perl pie prediction python sasl spell tcl
 test tk v4l +xscreensaver zephyr zeroconf"
 RESTRICT="!test? ( test )"
@@ -50,7 +47,7 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 		>=net-libs/farstream-0.2.7:0.2
 	)
-	gtk? (
+	gui? (
 		>=x11-libs/gtk+-2.10:2[aqua=]
 		x11-libs/libSM
 		>=x11-libs/pango-1.4.0
@@ -83,7 +80,7 @@ NLS_DEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	gtk? (
+	gui? (
 		x11-base/xorg-proto
 		${NLS_DEPEND}
 	)
@@ -94,7 +91,7 @@ BDEPEND="
 	dev-perl/XML-Parser
 	virtual/pkgconfig
 	doc? ( app-text/doxygen )
-	!gtk? ( nls? ( ${NLS_DEPEND} ) )
+	!gui? ( nls? ( ${NLS_DEPEND} ) )
 	test? ( >=dev-libs/check-0.9.4 )
 "
 
@@ -102,8 +99,6 @@ DOCS=( AUTHORS HACKING NEWS README ChangeLog )
 
 REQUIRED_USE="
 	dbus? ( ${PYTHON_REQUIRED_USE} )
-	gtk? ( gui )
-	gui? ( gtk )
 	networkmanager? ( dbus )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	v4l? ( gstreamer )
@@ -142,15 +137,15 @@ DEFAULT_PRPLS="irc,jabber,simple"
 #	x11-plugins/pidgimpd
 
 pkg_pretend() {
-	if ! use gtk && ! use ncurses ; then
-		elog "You did not pick the ncurses or gtk use flags, only libpurple"
+	if ! use gui && ! use ncurses ; then
+		elog "You did not pick the ncurses or gui use flags, only libpurple"
 		elog "will be built."
 	fi
 
 	# dbus is enabled, no way to disable linkage with python => python is enabled
-	#REQUIRED_USE="gtk? ( nls ) dbus? ( python )"
-	if use gtk && ! use nls ; then
-		ewarn "gtk build => nls is enabled!"
+	#REQUIRED_USE="gui? ( nls ) dbus? ( python )"
+	if use gui && ! use nls ; then
+		ewarn "gui build => nls is enabled!"
 	fi
 	if use dbus && ! use python ; then
 		elog "dbus is enabled, no way to disable linkage with python => python is enabled"
@@ -196,8 +191,8 @@ src_configure() {
 		$(use_enable debug)
 		$(use_enable doc doxygen)
 		$(use_enable gstreamer)
-		$(use_enable gtk gtkui)
-		$(use_enable gtk sm)
+		$(use_enable gui gtkui)
+		$(use_enable gui sm)
 		$(use_enable idn)
 		$(use_enable meanwhile)
 		$(use_enable networkmanager nm)
@@ -211,11 +206,11 @@ src_configure() {
 		$(use_enable v4l vv)
 		$(use_enable zeroconf avahi)
 		$(use_with gstreamer gstreamer 1.0)
-		$(usex gtk '--enable-nls' "$(use_enable nls)")
-		$(use gtk && use_enable eds gevolution)
-		$(use gtk && use_enable prediction cap)
-		$(use gtk && use_enable spell gtkspell)
-		$(use gtk && use_enable xscreensaver screensaver)
+		$(usex gui '--enable-nls' "$(use_enable nls)")
+		$(use gui && use_enable eds gevolution)
+		$(use gui && use_enable prediction cap)
+		$(use gui && use_enable spell gtkspell)
+		$(use gui && use_enable xscreensaver screensaver)
 	)
 
 	if use gnutls ; then
@@ -248,7 +243,7 @@ src_install() {
 	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
 	default
 
-	if use gtk ; then
+	if use gui ; then
 		# Fix tray paths for e16 (x11-wm/enlightenment) and other
 		# implementations that are not compliant with new hicolor theme yet, #323355
 		local d f pixmapdir