From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11E1415808C for ; Thu, 31 Mar 2022 11:38:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E72C5E07D8; Thu, 31 Mar 2022 11:38:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 9DC96E07D0 for ; Thu, 31 Mar 2022 11:38:21 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 201B03415EE for ; Thu, 31 Mar 2022 11:38:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A78334A for ; Thu, 31 Mar 2022 11:38:18 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1648726688.5d2d231650439bba3024233c4405bcbeff99bec7.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/emacs/emacs-24.5-r11.ebuild app-editors/emacs/emacs-25.3-r11.ebuild app-editors/emacs/emacs-26.3-r7.ebuild app-editors/emacs/emacs-27.2-r5.ebuild app-editors/emacs/emacs-28.0.92.ebuild app-editors/emacs/emacs-28.0.9999-r1.ebuild app-editors/emacs/emacs-29.0.9999.ebuild X-VCS-Directories: app-editors/emacs/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 5d2d231650439bba3024233c4405bcbeff99bec7 X-VCS-Branch: master Date: Thu, 31 Mar 2022 11:38:18 +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: c2baf7bf-44ff-4e18-8194-b8a5bf2e5a32 X-Archives-Hash: 438e8d88710ae338b2c8146c180e4f66 commit: 5d2d231650439bba3024233c4405bcbeff99bec7 Author: Ulrich Müller gentoo org> AuthorDate: Thu Mar 31 11:34:03 2022 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Thu Mar 31 11:38:08 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2d2316 app-editors/emacs: Drop deprecated dependency on gnome-base/gconf Signed-off-by: Ulrich Müller gentoo.org> app-editors/emacs/emacs-24.5-r11.ebuild | 7 +++---- app-editors/emacs/emacs-25.3-r11.ebuild | 7 +++---- app-editors/emacs/emacs-26.3-r7.ebuild | 5 ++--- app-editors/emacs/emacs-27.2-r5.ebuild | 5 ++--- app-editors/emacs/emacs-28.0.92.ebuild | 5 ++--- app-editors/emacs/emacs-28.0.9999-r1.ebuild | 5 ++--- app-editors/emacs/emacs-29.0.9999.ebuild | 7 +++---- 7 files changed, 17 insertions(+), 24 deletions(-) diff --git a/app-editors/emacs/emacs-24.5-r11.ebuild b/app-editors/emacs/emacs-24.5-r11.ebuild index 3f9cc7860442..2324de08efdf 100644 --- a/app-editors/emacs/emacs-24.5-r11.ebuild +++ b/app-editors/emacs/emacs-24.5-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" +IUSE="acl alsa aqua athena dbus games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" RDEPEND="acct-group/mail app-emacs/emacs-common[games?,gui(-)?] @@ -38,7 +38,6 @@ RDEPEND="acct-group/mail x11-libs/libXinerama x11-libs/libXrandr x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) @@ -143,7 +142,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild b/app-editors/emacs/emacs-25.3-r11.ebuild index 00a361aa4b9e..41e239215c92 100644 --- a/app-editors/emacs/emacs-25.3-r11.ebuild +++ b/app-editors/emacs/emacs-25.3-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" RDEPEND="acct-group/mail app-emacs/emacs-common[games?,gui(-)?] @@ -40,7 +40,6 @@ RDEPEND="acct-group/mail x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) @@ -145,7 +144,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild b/app-editors/emacs/emacs-26.3-r7.ebuild index abf8fbc494ed..144c1f63fbbc 100644 --- a/app-editors/emacs/emacs-26.3-r7.ebuild +++ b/app-editors/emacs/emacs-26.3-r7.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif gpm gsettings gtk gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -42,7 +42,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) @@ -148,7 +147,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild index d6c4a74eb424..c38f02ec1b8e 100644 --- a/app-editors/emacs/emacs-27.2-r5.ebuild +++ b/app-editors/emacs/emacs-27.2-r5.ebuild @@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -75,7 +75,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) @@ -189,7 +188,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" diff --git a/app-editors/emacs/emacs-28.0.92.ebuild b/app-editors/emacs/emacs-28.0.92.ebuild index 89ae30752e40..5bd030d164a3 100644 --- a/app-editors/emacs/emacs-28.0.92.ebuild +++ b/app-editors/emacs/emacs-28.0.92.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -73,7 +73,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) @@ -198,7 +197,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" diff --git a/app-editors/emacs/emacs-28.0.9999-r1.ebuild b/app-editors/emacs/emacs-28.0.9999-r1.ebuild index cc2cbac4abcc..9130393b32fa 100644 --- a/app-editors/emacs/emacs-28.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-28.0.9999-r1.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -73,7 +73,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) @@ -198,7 +197,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild index bb9b91c9c741..41b8333bd0ab 100644 --- a/app-editors/emacs/emacs-29.0.9999.ebuild +++ b/app-editors/emacs/emacs-29.0.9999.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" X_DEPEND="x11-libs/libICE @@ -123,7 +123,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] webp? ( media-libs/libwebp:0= ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) !aqua? ( - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig @@ -233,7 +232,7 @@ src_configure() { einfo "Configuring to build with pure GTK (without X11) support" myconf+=" --with-pgtk --without-x --without-ns" myconf+=" --with-toolkit-scroll-bars" #836392 - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with harfbuzz)" myconf+=" $(use_with m17n-lib libotf)" @@ -242,7 +241,7 @@ src_configure() { else # X11 myconf+=" --with-x --without-pgtk --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with xpm)"