| 1 |
commit: 5d2d231650439bba3024233c4405bcbeff99bec7 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 31 11:34:03 2022 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 31 11:38:08 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d2d2316 |
| 7 |
|
| 8 |
app-editors/emacs: Drop deprecated dependency on gnome-base/gconf |
| 9 |
|
| 10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 11 |
|
| 12 |
app-editors/emacs/emacs-24.5-r11.ebuild | 7 +++---- |
| 13 |
app-editors/emacs/emacs-25.3-r11.ebuild | 7 +++---- |
| 14 |
app-editors/emacs/emacs-26.3-r7.ebuild | 5 ++--- |
| 15 |
app-editors/emacs/emacs-27.2-r5.ebuild | 5 ++--- |
| 16 |
app-editors/emacs/emacs-28.0.92.ebuild | 5 ++--- |
| 17 |
app-editors/emacs/emacs-28.0.9999-r1.ebuild | 5 ++--- |
| 18 |
app-editors/emacs/emacs-29.0.9999.ebuild | 7 +++---- |
| 19 |
7 files changed, 17 insertions(+), 24 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-editors/emacs/emacs-24.5-r11.ebuild b/app-editors/emacs/emacs-24.5-r11.ebuild |
| 22 |
index 3f9cc7860442..2324de08efdf 100644 |
| 23 |
--- a/app-editors/emacs/emacs-24.5-r11.ebuild |
| 24 |
+++ b/app-editors/emacs/emacs-24.5-r11.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2021 Gentoo Authors |
| 27 |
+# Copyright 1999-2022 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=8 |
| 31 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
| 32 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 33 |
SLOT="24" |
| 34 |
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 35 |
-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" |
| 36 |
+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" |
| 37 |
|
| 38 |
RDEPEND="acct-group/mail |
| 39 |
app-emacs/emacs-common[games?,gui(-)?] |
| 40 |
@@ -38,7 +38,6 @@ RDEPEND="acct-group/mail |
| 41 |
x11-libs/libXinerama |
| 42 |
x11-libs/libXrandr |
| 43 |
x11-misc/xbitmaps |
| 44 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 45 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 46 |
gif? ( media-libs/giflib:0= ) |
| 47 |
jpeg? ( virtual/jpeg:0= ) |
| 48 |
@@ -143,7 +142,7 @@ src_configure() { |
| 49 |
myconf+=" --without-x" |
| 50 |
else |
| 51 |
myconf+=" --with-x --without-ns" |
| 52 |
- myconf+=" $(use_with gconf)" |
| 53 |
+ myconf+=" --without-gconf" |
| 54 |
myconf+=" $(use_with gsettings)" |
| 55 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 56 |
myconf+=" $(use_with gif)" |
| 57 |
|
| 58 |
diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild b/app-editors/emacs/emacs-25.3-r11.ebuild |
| 59 |
index 00a361aa4b9e..41e239215c92 100644 |
| 60 |
--- a/app-editors/emacs/emacs-25.3-r11.ebuild |
| 61 |
+++ b/app-editors/emacs/emacs-25.3-r11.ebuild |
| 62 |
@@ -1,4 +1,4 @@ |
| 63 |
-# Copyright 1999-2021 Gentoo Authors |
| 64 |
+# Copyright 1999-2022 Gentoo Authors |
| 65 |
# Distributed under the terms of the GNU General Public License v2 |
| 66 |
|
| 67 |
EAPI=8 |
| 68 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
| 69 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 70 |
SLOT="25" |
| 71 |
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 72 |
-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" |
| 73 |
+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" |
| 74 |
|
| 75 |
RDEPEND="acct-group/mail |
| 76 |
app-emacs/emacs-common[games?,gui(-)?] |
| 77 |
@@ -40,7 +40,6 @@ RDEPEND="acct-group/mail |
| 78 |
x11-libs/libXrandr |
| 79 |
x11-libs/libxcb |
| 80 |
x11-misc/xbitmaps |
| 81 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 82 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 83 |
gif? ( media-libs/giflib:0= ) |
| 84 |
jpeg? ( virtual/jpeg:0= ) |
| 85 |
@@ -145,7 +144,7 @@ src_configure() { |
| 86 |
myconf+=" --without-x" |
| 87 |
else |
| 88 |
myconf+=" --with-x --without-ns" |
| 89 |
- myconf+=" $(use_with gconf)" |
| 90 |
+ myconf+=" --without-gconf" |
| 91 |
myconf+=" $(use_with gsettings)" |
| 92 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 93 |
myconf+=" $(use_with gif)" |
| 94 |
|
| 95 |
diff --git a/app-editors/emacs/emacs-26.3-r7.ebuild b/app-editors/emacs/emacs-26.3-r7.ebuild |
| 96 |
index abf8fbc494ed..144c1f63fbbc 100644 |
| 97 |
--- a/app-editors/emacs/emacs-26.3-r7.ebuild |
| 98 |
+++ b/app-editors/emacs/emacs-26.3-r7.ebuild |
| 99 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
| 100 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 101 |
SLOT="26" |
| 102 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 103 |
-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" |
| 104 |
+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" |
| 105 |
|
| 106 |
RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 107 |
sys-libs/ncurses:0= |
| 108 |
@@ -42,7 +42,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 109 |
x11-libs/libXrandr |
| 110 |
x11-libs/libxcb |
| 111 |
x11-misc/xbitmaps |
| 112 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 113 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 114 |
gif? ( media-libs/giflib:0= ) |
| 115 |
jpeg? ( virtual/jpeg:0= ) |
| 116 |
@@ -148,7 +147,7 @@ src_configure() { |
| 117 |
myconf+=" --without-x" |
| 118 |
else |
| 119 |
myconf+=" --with-x --without-ns" |
| 120 |
- myconf+=" $(use_with gconf)" |
| 121 |
+ myconf+=" --without-gconf" |
| 122 |
myconf+=" $(use_with gsettings)" |
| 123 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 124 |
myconf+=" $(use_with gif)" |
| 125 |
|
| 126 |
diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild |
| 127 |
index d6c4a74eb424..c38f02ec1b8e 100644 |
| 128 |
--- a/app-editors/emacs/emacs-27.2-r5.ebuild |
| 129 |
+++ b/app-editors/emacs/emacs-27.2-r5.ebuild |
| 130 |
@@ -43,7 +43,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed |
| 131 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 132 |
|
| 133 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 134 |
-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" |
| 135 |
+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" |
| 136 |
RESTRICT="test" |
| 137 |
|
| 138 |
RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 139 |
@@ -75,7 +75,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 140 |
x11-libs/libXrandr |
| 141 |
x11-libs/libxcb |
| 142 |
x11-misc/xbitmaps |
| 143 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 144 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 145 |
gif? ( media-libs/giflib:0= ) |
| 146 |
jpeg? ( virtual/jpeg:0= ) |
| 147 |
@@ -189,7 +188,7 @@ src_configure() { |
| 148 |
myconf+=" --without-x" |
| 149 |
else |
| 150 |
myconf+=" --with-x --without-ns" |
| 151 |
- myconf+=" $(use_with gconf)" |
| 152 |
+ myconf+=" --without-gconf" |
| 153 |
myconf+=" $(use_with gsettings)" |
| 154 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 155 |
myconf+=" $(use_with gif)" |
| 156 |
|
| 157 |
diff --git a/app-editors/emacs/emacs-28.0.92.ebuild b/app-editors/emacs/emacs-28.0.92.ebuild |
| 158 |
index 89ae30752e40..5bd030d164a3 100644 |
| 159 |
--- a/app-editors/emacs/emacs-28.0.92.ebuild |
| 160 |
+++ b/app-editors/emacs/emacs-28.0.92.ebuild |
| 161 |
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed |
| 162 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 163 |
|
| 164 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 165 |
-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" |
| 166 |
+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" |
| 167 |
RESTRICT="test" |
| 168 |
|
| 169 |
RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 170 |
@@ -73,7 +73,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 171 |
x11-libs/libXrandr |
| 172 |
x11-libs/libxcb |
| 173 |
x11-misc/xbitmaps |
| 174 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 175 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 176 |
gif? ( media-libs/giflib:0= ) |
| 177 |
jpeg? ( virtual/jpeg:0= ) |
| 178 |
@@ -198,7 +197,7 @@ src_configure() { |
| 179 |
myconf+=" --without-x" |
| 180 |
else |
| 181 |
myconf+=" --with-x --without-ns" |
| 182 |
- myconf+=" $(use_with gconf)" |
| 183 |
+ myconf+=" --without-gconf" |
| 184 |
myconf+=" $(use_with gsettings)" |
| 185 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 186 |
myconf+=" $(use_with gif)" |
| 187 |
|
| 188 |
diff --git a/app-editors/emacs/emacs-28.0.9999-r1.ebuild b/app-editors/emacs/emacs-28.0.9999-r1.ebuild |
| 189 |
index cc2cbac4abcc..9130393b32fa 100644 |
| 190 |
--- a/app-editors/emacs/emacs-28.0.9999-r1.ebuild |
| 191 |
+++ b/app-editors/emacs/emacs-28.0.9999-r1.ebuild |
| 192 |
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed |
| 193 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 194 |
|
| 195 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 196 |
-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" |
| 197 |
+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" |
| 198 |
RESTRICT="test" |
| 199 |
|
| 200 |
RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 201 |
@@ -73,7 +73,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 202 |
x11-libs/libXrandr |
| 203 |
x11-libs/libxcb |
| 204 |
x11-misc/xbitmaps |
| 205 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 206 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 207 |
gif? ( media-libs/giflib:0= ) |
| 208 |
jpeg? ( virtual/jpeg:0= ) |
| 209 |
@@ -198,7 +197,7 @@ src_configure() { |
| 210 |
myconf+=" --without-x" |
| 211 |
else |
| 212 |
myconf+=" --with-x --without-ns" |
| 213 |
- myconf+=" $(use_with gconf)" |
| 214 |
+ myconf+=" --without-gconf" |
| 215 |
myconf+=" $(use_with gsettings)" |
| 216 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 217 |
myconf+=" $(use_with gif)" |
| 218 |
|
| 219 |
diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild |
| 220 |
index bb9b91c9c741..41b8333bd0ab 100644 |
| 221 |
--- a/app-editors/emacs/emacs-29.0.9999.ebuild |
| 222 |
+++ b/app-editors/emacs/emacs-29.0.9999.ebuild |
| 223 |
@@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed |
| 224 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 225 |
|
| 226 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 227 |
-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" |
| 228 |
+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" |
| 229 |
RESTRICT="test" |
| 230 |
|
| 231 |
X_DEPEND="x11-libs/libICE |
| 232 |
@@ -123,7 +123,6 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] |
| 233 |
webp? ( media-libs/libwebp:0= ) |
| 234 |
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 235 |
!aqua? ( |
| 236 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 237 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 238 |
gtk? ( !X? ( |
| 239 |
media-libs/fontconfig |
| 240 |
@@ -233,7 +232,7 @@ src_configure() { |
| 241 |
einfo "Configuring to build with pure GTK (without X11) support" |
| 242 |
myconf+=" --with-pgtk --without-x --without-ns" |
| 243 |
myconf+=" --with-toolkit-scroll-bars" #836392 |
| 244 |
- myconf+=" $(use_with gconf)" |
| 245 |
+ myconf+=" --without-gconf" |
| 246 |
myconf+=" $(use_with gsettings)" |
| 247 |
myconf+=" $(use_with harfbuzz)" |
| 248 |
myconf+=" $(use_with m17n-lib libotf)" |
| 249 |
@@ -242,7 +241,7 @@ src_configure() { |
| 250 |
else |
| 251 |
# X11 |
| 252 |
myconf+=" --with-x --without-pgtk --without-ns" |
| 253 |
- myconf+=" $(use_with gconf)" |
| 254 |
+ myconf+=" --without-gconf" |
| 255 |
myconf+=" $(use_with gsettings)" |
| 256 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 257 |
myconf+=" $(use_with xpm)" |
Archives