public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/
Date: Sat, 22 Mar 2025 03:57:29 +0000 (UTC)	[thread overview]
Message-ID: <1742615414.7b2f37c56c2f12adf9eb343629790d0e2fc4d0c3.sam@gentoo> (raw)

commit:     7b2f37c56c2f12adf9eb343629790d0e2fc4d0c3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 22 03:49:26 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 22 03:50:14 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b2f37c5

net-im/pidgin: fix USE=gui mess

USE=gui was added in 7fba7fce7193a0f760bdbe86fbc85bc8c2ed2452 but with
REQUIRED_USE="gui? ( gtk )". Unfortunately, no plugins were updated, and
no progress has happened in a year, so let's just do it all now.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-im/pidgin/metadata.xml                         |  1 -
 ...gin-2.14.13.ebuild => pidgin-2.14.13-r1.ebuild} | 41 ++++++++++------------
 2 files changed, 18 insertions(+), 24 deletions(-)

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
similarity index 89%
rename from net-im/pidgin/pidgin-2.14.13.ebuild
rename to 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


             reply	other threads:[~2025-03-22  3:57 UTC|newest]

Thread overview: 150+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-22  3:57 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-19 19:10 [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/ Sam James
2025-08-07  9:59 Pacho Ramos
2025-04-26  6:52 Arthur Zamarin
2025-04-26  4:37 Sam James
2025-04-26  2:14 Sam James
2025-04-26  1:54 Sam James
2025-04-10  9:34 Sam James
2025-03-25  4:36 Sam James
2024-11-24 22:24 Sam James
2024-07-03  5:17 Ionen Wolkens
2024-05-29  6:26 Jakov Smolić
2024-05-29  6:26 Jakov Smolić
2024-03-17 11:11 Andreas Schuerch
2024-03-17 11:07 Andreas Schuerch
2023-04-03 19:11 Arthur Zamarin
2023-03-20 11:34 Joonas Niilola
2023-03-17 18:25 Arthur Zamarin
2023-03-17 18:25 Arthur Zamarin
2023-03-17 17:00 Sam James
2023-03-17 16:46 Arthur Zamarin
2023-03-17 16:12 Arthur Zamarin
2023-01-28  8:43 Joonas Niilola
2023-01-28  8:43 Joonas Niilola
2023-01-09  9:52 Sam James
2022-07-04 23:01 Sam James
2022-06-30  7:51 Joonas Niilola
2022-06-30  7:51 Joonas Niilola
2022-06-22 16:02 Arthur Zamarin
2022-06-22 13:12 Jakov Smolić
2022-06-17 10:44 Jakov Smolić
2022-06-17 10:29 Jakov Smolić
2022-06-17 10:29 Jakov Smolić
2022-06-08  8:04 Lars Wendler
2022-06-08  7:27 Lars Wendler
2022-04-29  7:05 Lars Wendler
2022-03-24 22:17 Lars Wendler
2022-03-24 17:08 Lars Wendler
2022-01-18 22:16 Sam James
2022-01-18 12:26 Sam James
2021-12-21  3:50 Sam James
2021-12-19 22:09 Agostino Sarubbo
2021-12-19 11:02 Sam James
2021-12-18  2:09 Sam James
2021-12-17 18:27 Arthur Zamarin
2021-11-22 13:17 Jakov Smolić
2021-10-15 18:33 Lars Wendler
2021-10-01 23:42 Sam James
2021-09-30 18:19 Sam James
2021-09-22 18:03 Sam James
2021-09-19 21:35 Agostino Sarubbo
2021-09-18 17:29 Sam James
2021-09-18 12:28 Agostino Sarubbo
2021-09-17 11:18 Lars Wendler
2021-09-09  7:11 Yixun Lan
2021-08-11 12:03 Lars Wendler
2021-07-27  9:24 Lars Wendler
2021-07-17 21:30 David Seifert
2021-07-17  5:00 Sam James
2021-07-11 20:51 Sam James
2021-07-11  9:00 Agostino Sarubbo
2021-07-10  0:48 Sam James
2021-07-10  0:48 Sam James
2021-07-09 21:30 Sergei Trofimovich
2021-07-09  6:08 Lars Wendler
2021-07-09  6:08 Lars Wendler
2021-06-04 12:35 Lars Wendler
2021-06-04 12:35 Lars Wendler
2021-05-06 22:12 Sam James
2021-05-02  9:24 Sergei Trofimovich
2021-05-01 14:06 Sam James
2021-04-30 23:29 Sam James
2021-04-30 15:23 Agostino Sarubbo
2021-04-30  6:31 Lars Wendler
2021-04-30  6:31 Lars Wendler
2021-04-09  9:46 Lars Wendler
2021-02-15  2:19 Rick Farina
2020-09-27  3:00 Maciej Mrozowski
2020-09-07  8:47 Sergei Trofimovich
2020-08-31  1:25 Sam James
2020-08-11 18:51 Agostino Sarubbo
2020-08-11 18:35 Sam James
2020-08-11 14:23 Agostino Sarubbo
2020-08-11 14:18 Agostino Sarubbo
2020-08-11 14:12 Agostino Sarubbo
2020-07-20  6:17 Lars Wendler
2020-06-11 19:21 Lars Wendler
2020-03-25 15:03 Michał Górny
2020-03-25 15:03 Michał Górny
2020-03-20 21:53 Matt Turner
2020-03-14 23:07 Lars Wendler
2020-03-13  8:40 Joonas Niilola
2020-02-07 22:44 Mart Raudsepp
2020-02-03 15:04 Andreas Sturmlechner
2020-02-03 15:04 Andreas Sturmlechner
2020-02-03 15:04 Andreas Sturmlechner
2020-01-18 22:11 David Seifert
2019-12-06 18:09 Sergei Trofimovich
2019-11-23 18:48 Aaron Bauman
2019-11-22  9:51 Mikle Kolyada
2019-11-20 15:49 Agostino Sarubbo
2019-11-20 15:40 Agostino Sarubbo
2019-11-20 11:35 Agostino Sarubbo
2019-11-20 11:27 Agostino Sarubbo
2019-11-20 11:21 Agostino Sarubbo
2019-11-20 11:16 Agostino Sarubbo
2019-07-28 17:02 Aaron Bauman
2019-02-17 18:01 Lars Wendler
2019-02-17 17:54 Sergei Trofimovich
2019-02-09 19:29 Sergei Trofimovich
2018-12-26 12:46 Sergei Trofimovich
2018-10-20 11:26 Markus Meier
2018-10-12  7:32 Tobias Klausmann
2018-09-28 11:43 Mikle Kolyada
2018-05-16 16:06 Lars Wendler
2018-03-09  9:34 Lars Wendler
2017-07-05  9:25 Lars Wendler
2017-04-05  7:29 Tobias Klausmann
2017-03-17 10:42 Agostino Sarubbo
2017-03-14 16:25 Jeroen Roovers
2017-03-11 23:13 Michael Weber
2017-03-10 16:59 Michael Weber
2017-03-10 13:09 Agostino Sarubbo
2017-03-10 13:09 Agostino Sarubbo
2017-03-10 11:30 Lars Wendler
2017-02-27 21:32 Lars Wendler
2017-01-29 19:33 Fabian Groffen
2016-12-11 22:14 Lars Wendler
2016-07-29 12:18 Lars Wendler
2016-07-08 14:28 Markus Meier
2016-07-08 13:28 Agostino Sarubbo
2016-07-08  8:42 Agostino Sarubbo
2016-07-08  8:17 Agostino Sarubbo
2016-07-06  6:53 Jeroen Roovers
2016-07-03 19:26 Jeroen Roovers
2016-06-30 13:00 Tobias Klausmann
2016-06-27  8:47 Agostino Sarubbo
2016-06-27  8:23 Agostino Sarubbo
2016-06-25 14:35 Lars Wendler
2016-04-06  6:45 Lars Wendler
2016-04-06  6:45 Lars Wendler
2016-03-14  9:41 Lars Wendler
2016-03-14  9:41 Lars Wendler
2016-01-28  0:05 Sebastian Pipping
2016-01-04 10:24 Lars Wendler
2016-01-03 21:17 Lars Wendler
2016-01-03 10:59 Lars Wendler
2016-01-02 23:54 Lars Wendler
2016-01-02 23:54 Lars Wendler
2015-11-18 10:53 Agostino Sarubbo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1742615414.7b2f37c56c2f12adf9eb343629790d0e2fc4d0c3.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox