| 1 |
commit: 5647b50a3da4eb559cf3b774cb1166fb01fdc0ee |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 1 11:26:48 2022 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 1 11:27:13 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=5647b50a |
| 7 |
|
| 8 |
app-editors/emacs: Drop deprecated dependency on gconf |
| 9 |
|
| 10 |
Drop some keywords. |
| 11 |
|
| 12 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-editors/emacs/emacs-24.3-r8.ebuild | 9 ++++----- |
| 15 |
app-editors/emacs/metadata.xml | 2 -- |
| 16 |
2 files changed, 4 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-editors/emacs/emacs-24.3-r8.ebuild b/app-editors/emacs/emacs-24.3-r8.ebuild |
| 19 |
index b8281b6..565baf1 100644 |
| 20 |
--- a/app-editors/emacs/emacs-24.3-r8.ebuild |
| 21 |
+++ b/app-editors/emacs/emacs-24.3-r8.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2021 Gentoo Authors |
| 24 |
+# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=7 |
| 28 |
@@ -15,8 +15,8 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
| 29 |
|
| 30 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 31 |
SLOT="24.3" |
| 32 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" |
| 33 |
-IUSE="alsa aqua athena dbus gconf gif gpm gsettings gtk gtk2 gui gzip-el imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm" |
| 34 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 35 |
+IUSE="alsa aqua athena dbus gif gpm gsettings gtk gtk2 gui gzip-el imagemagick jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm" |
| 36 |
|
| 37 |
RDEPEND="app-emacs/emacs-common[gui(-)?] |
| 38 |
net-libs/liblockfile |
| 39 |
@@ -36,7 +36,6 @@ RDEPEND="app-emacs/emacs-common[gui(-)?] |
| 40 |
x11-libs/libXinerama |
| 41 |
x11-libs/libXrandr |
| 42 |
x11-misc/xbitmaps |
| 43 |
- gconf? ( >=gnome-base/gconf-2.26.2 ) |
| 44 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
| 45 |
gif? ( media-libs/giflib:0= ) |
| 46 |
jpeg? ( virtual/jpeg:0= ) |
| 47 |
@@ -175,7 +174,7 @@ src_configure() { |
| 48 |
myconf+=" --without-x" |
| 49 |
else |
| 50 |
myconf+=" --with-x --without-ns" |
| 51 |
- myconf+=" $(use_with gconf)" |
| 52 |
+ myconf+=" --without-gconf" |
| 53 |
myconf+=" $(use_with gsettings)" |
| 54 |
myconf+=" $(use_with toolkit-scroll-bars)" |
| 55 |
myconf+=" $(use_with gif)" |
| 56 |
|
| 57 |
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml |
| 58 |
index e351ed7..3625f6f 100644 |
| 59 |
--- a/app-editors/emacs/metadata.xml |
| 60 |
+++ b/app-editors/emacs/metadata.xml |
| 61 |
@@ -22,8 +22,6 @@ |
| 62 |
<use> |
| 63 |
<flag name="athena">Enable the MIT Athena widget set |
| 64 |
(<pkg>x11-libs/libXaw</pkg>)</flag> |
| 65 |
- <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system |
| 66 |
- font name</flag> |
| 67 |
<flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
| 68 |
system font name</flag> |
| 69 |
<flag name="gtk2">Prefer version 2 of the GIMP Toolkit to version 3 |
Archives