1 |
commit: 154d8ec8ce39f54eb69199da87f3f8827c5456fa |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 30 16:48:19 2022 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 30 16:48:19 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=154d8ec8 |
7 |
|
8 |
app-editors/emacs: Apply some changes from 24.5 to 24.3 |
9 |
|
10 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
11 |
|
12 |
app-editors/emacs/emacs-24.3-r8.ebuild | 63 ++++++++++++++++------------------ |
13 |
1 file changed, 29 insertions(+), 34 deletions(-) |
14 |
|
15 |
diff --git a/app-editors/emacs/emacs-24.3-r8.ebuild b/app-editors/emacs/emacs-24.3-r8.ebuild |
16 |
index 565baf1..9c4d40e 100644 |
17 |
--- a/app-editors/emacs/emacs-24.3-r8.ebuild |
18 |
+++ b/app-editors/emacs/emacs-24.3-r8.ebuild |
19 |
@@ -1,7 +1,7 @@ |
20 |
# Copyright 1999-2022 Gentoo Authors |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
-EAPI=7 |
24 |
+EAPI=8 |
25 |
|
26 |
inherit autotools elisp-common flag-o-matic readme.gentoo-r1 |
27 |
|
28 |
@@ -38,7 +38,7 @@ RDEPEND="app-emacs/emacs-common[gui(-)?] |
29 |
x11-misc/xbitmaps |
30 |
gsettings? ( >=dev-libs/glib-2.28.6 ) |
31 |
gif? ( media-libs/giflib:0= ) |
32 |
- jpeg? ( virtual/jpeg:0= ) |
33 |
+ jpeg? ( media-libs/libjpeg-turbo:0= ) |
34 |
png? ( >=media-libs/libpng-1.4:0= ) |
35 |
svg? ( >=gnome-base/librsvg-2.0 ) |
36 |
tiff? ( media-libs/tiff:0 ) |
37 |
@@ -54,10 +54,7 @@ RDEPEND="app-emacs/emacs-common[gui(-)?] |
38 |
>=dev-libs/m17n-lib-1.5.1 |
39 |
) |
40 |
) |
41 |
- gtk? ( |
42 |
- gtk2? ( x11-libs/gtk+:2 ) |
43 |
- !gtk2? ( x11-libs/gtk+:3 ) |
44 |
- ) |
45 |
+ gtk? ( x11-libs/gtk+:3 ) |
46 |
!gtk? ( |
47 |
motif? ( |
48 |
>=x11-libs/motif-2.3:0 |
49 |
@@ -83,12 +80,12 @@ RDEPEND="app-emacs/emacs-common[gui(-)?] |
50 |
DEPEND="${RDEPEND} |
51 |
gui? ( !aqua? ( x11-base/xorg-proto ) )" |
52 |
|
53 |
-BDEPEND="app-eselect/eselect-emacs |
54 |
- virtual/pkgconfig |
55 |
+BDEPEND="virtual/pkgconfig |
56 |
gzip-el? ( app-arch/gzip )" |
57 |
|
58 |
-RDEPEND="${RDEPEND} |
59 |
- app-eselect/eselect-emacs" |
60 |
+IDEPEND="app-eselect/eselect-emacs" |
61 |
+ |
62 |
+RDEPEND+=" ${IDEPEND}" |
63 |
|
64 |
EMACS_SUFFIX="emacs-${SLOT}" |
65 |
SITEFILE="20${EMACS_SUFFIX}-gentoo.el" |
66 |
@@ -117,7 +114,7 @@ src_prepare() { |
67 |
"${FILESDIR}"/${P}-data-start.patch \ |
68 |
"${FILESDIR}"/${P}-imagemagick-7.patch \ |
69 |
"${FILESDIR}"/${P}-glibc-2.28.patch |
70 |
- eapply_user |
71 |
+ default |
72 |
|
73 |
# Fix filename reference in redirected man page |
74 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
75 |
@@ -203,12 +200,13 @@ src_configure() { |
76 |
Your version of GTK+ will have problems with closing open |
77 |
displays. This is no problem if you just use one display, but |
78 |
if you use more than one and close one of them Emacs may crash. |
79 |
- See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>. |
80 |
+ See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and |
81 |
+ <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. |
82 |
If you intend to use more than one display, then it is strongly |
83 |
recommended that you compile Emacs with the Athena/Lucid or the |
84 |
Motif toolkit instead. |
85 |
EOF |
86 |
- myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)" |
87 |
+ myconf+=" --with-x-toolkit=gtk3" |
88 |
for f in motif Xaw3d athena; do |
89 |
use ${f} && ewarn \ |
90 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
91 |
@@ -227,8 +225,6 @@ src_configure() { |
92 |
einfo "Configuring to build with no toolkit" |
93 |
myconf+=" --with-x-toolkit=no" |
94 |
fi |
95 |
- ! use gtk && use gtk2 && ewarn \ |
96 |
- "USE flag \"gtk2\" has no effect if \"gtk\" is not set." |
97 |
fi |
98 |
|
99 |
econf \ |
100 |
@@ -269,15 +265,15 @@ src_install() { |
101 |
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig |
102 |
|
103 |
# avoid collision between slots, see bug #169033 e.g. |
104 |
- rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el |
105 |
- rm -rf "${ED}"/usr/share/{applications,icons} |
106 |
- rm -rf "${ED}"/var |
107 |
+ rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die |
108 |
+ rm -rf "${ED}"/usr/share/{applications,icons} || die |
109 |
+ rm -rf "${ED}"/var || die |
110 |
|
111 |
# remove unused <version>/site-lisp dir |
112 |
- rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp |
113 |
+ rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die |
114 |
|
115 |
# remove COPYING file (except for etc/COPYING used by describe-copying) |
116 |
- rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING |
117 |
+ rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die |
118 |
|
119 |
local cdir |
120 |
if use source; then |
121 |
@@ -312,9 +308,9 @@ src_install() { |
122 |
|
123 |
dodoc README BUGS |
124 |
|
125 |
- if use aqua; then |
126 |
+ if use gui && use aqua; then |
127 |
dodir /Applications/Gentoo |
128 |
- rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app |
129 |
+ rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die |
130 |
mv nextstep/Emacs.app \ |
131 |
"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die |
132 |
fi |
133 |
@@ -322,18 +318,20 @@ src_install() { |
134 |
local DOC_CONTENTS="You can set the version to be started by |
135 |
/usr/bin/emacs through the Emacs eselect module, which also |
136 |
redirects man and info pages. Therefore, several Emacs versions can |
137 |
- be installed at the same time. \"man emacs.eselect\" for details. |
138 |
+ be installed at the same time. \"man emacs.eselect\" for details. |
139 |
\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is |
140 |
strongly recommended that you use app-admin/emacs-updater to rebuild |
141 |
all byte-compiled elisp files of the installed Emacs packages." |
142 |
- use gui && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
143 |
- Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
144 |
- machine would satisfy basic Emacs requirements under X11. |
145 |
- See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
146 |
- for how to enable anti-aliased fonts." |
147 |
- use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in |
148 |
- \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink |
149 |
- it into /Applications by yourself." |
150 |
+ if use gui; then |
151 |
+ DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. |
152 |
+ Installing media-fonts/font-adobe-{75,100}dpi on the X server's |
153 |
+ machine would satisfy basic Emacs requirements under X11. |
154 |
+ See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs |
155 |
+ for how to enable anti-aliased fonts." |
156 |
+ use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in |
157 |
+ \"${EPREFIX}/Applications/Gentoo\". You may want to copy or |
158 |
+ symlink it into /Applications by yourself." |
159 |
+ fi |
160 |
readme.gentoo_create_doc |
161 |
} |
162 |
|
163 |
@@ -352,9 +350,6 @@ pkg_postinst() { |
164 |
# force an update of the emacs symlink for the livecd/dvd, |
165 |
# because some microemacs packages set it with USE=livecd |
166 |
eselect emacs update |
167 |
- elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then |
168 |
- # refresh symlinks in case any installed files have changed |
169 |
- eselect emacs set ${EMACS_SUFFIX} |
170 |
else |
171 |
eselect emacs update ifunset |
172 |
fi |