From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3A3A1581EE for ; Sat, 22 Mar 2025 03:57:35 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 9A52A343364 for ; Sat, 22 Mar 2025 03:57:35 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B3C4A1104AC; Sat, 22 Mar 2025 03:57:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id A49311104AC for ; Sat, 22 Mar 2025 03:57:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4819F343284 for ; Sat, 22 Mar 2025 03:57:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2AEB01EEA for ; Sat, 22 Mar 2025 03:57:29 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1742615414.7b2f37c56c2f12adf9eb343629790d0e2fc4d0c3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/pidgin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/pidgin/metadata.xml net-im/pidgin/pidgin-2.14.13-r1.ebuild net-im/pidgin/pidgin-2.14.13.ebuild X-VCS-Directories: net-im/pidgin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7b2f37c56c2f12adf9eb343629790d0e2fc4d0c3 X-VCS-Branch: master Date: Sat, 22 Mar 2025 03:57:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ec2e33b4-6e73-47af-a6b4-6c16b7133a43 X-Archives-Hash: 7fa53dfb9d767c285c9c33844c62c483 commit: 7b2f37c56c2f12adf9eb343629790d0e2fc4d0c3 Author: Sam James gentoo org> AuthorDate: Sat Mar 22 03:49:26 2025 +0000 Commit: Sam James gentoo 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 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 @@ Enable Gadu Gadu protocol support Enable Novell Groupwise protocol support Enables voice and video sessions - Builds Pidgin, the GTK+ interface Enable meanwhile support for Sametime protocol Build finch, console interface Enable Contact Availability Prediction plugin 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