1 |
commit: 4067c9065950574e5b31967f74c6d12c5aa16cd8 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 31 08:05:41 2016 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 08:05:41 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4067c906 |
7 |
|
8 |
app-editors/emacs-vcs: First pretest for Emacs 25.1. |
9 |
|
10 |
Add new "xwidgets" USE flag. Drop hppa keyword because of the conditional dependency on net-libs/webkit-gtk. Update description of the "gtk3" flag. |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
app-editors/emacs-vcs/Manifest | 1 + |
15 |
...5.0.9999-r2.ebuild => emacs-vcs-25.0.90.ebuild} | 35 +++++++++++++++------- |
16 |
.../emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild | 33 +++++++++++++------- |
17 |
app-editors/emacs-vcs/metadata.xml | 6 ++-- |
18 |
4 files changed, 52 insertions(+), 23 deletions(-) |
19 |
|
20 |
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest |
21 |
index 09e8fa8..e8314b9 100644 |
22 |
--- a/app-editors/emacs-vcs/Manifest |
23 |
+++ b/app-editors/emacs-vcs/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST emacs-25.0.50_pre20151113.tar.xz 26904832 SHA256 dcfd575afa3123bd63eba12b2ae2c7d1390c8fbccc911e9a4a70028feb207240 SHA512 cc8e871e9bb236ffd99ea93750aabc55401cdfad171f56df81c3127fba41b223196d31a64baf597268805b39015df773587e239192870f70671d131d9c6fc9b8 WHIRLPOOL 9571b10e49c028e4f8a10a54fce10bea16ff9b726e8a266650af180a57a370d225ac3bdffc12828c6d170680e514c9fb1179b3676dd4d4de3e6794147dc935ab |
26 |
+DIST emacs-25.0.90.tar.xz 42218556 SHA256 325f275b64eee106ad9aaadb42243619822e5e59bee35645f15e015176adb626 SHA512 7fdc73bc62aa3d4456faaeedf5a121fbad3363dfb20d7564308012ffb49ea96af623ae291a245ab3228457942fea7f4a872695b57befc77bbaf8478a5124f577 WHIRLPOOL 4c566e40269aecf61ca1f3055d023fa4138f6a31436a7d7f2459b39818d33ae7d49e55719179239bd3d60936a85a83f062c2bc635fe8b3fa601749019bb17daa |
27 |
|
28 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild |
29 |
similarity index 93% |
30 |
copy from app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild |
31 |
copy to app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild |
32 |
index 3db814a..59eed10 100644 |
33 |
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild |
34 |
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild |
35 |
@@ -2,9 +2,9 @@ |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
# $Id$ |
38 |
|
39 |
-EAPI=5 |
40 |
+EAPI=6 |
41 |
|
42 |
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo |
43 |
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 |
44 |
|
45 |
if [[ ${PV##*.} = 9999 ]]; then |
46 |
inherit git-r3 |
47 |
@@ -15,13 +15,13 @@ if [[ ${PV##*.} = 9999 ]]; then |
48 |
else |
49 |
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz |
50 |
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" |
51 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
52 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
53 |
# FULL_VERSION keeps the full version number, which is needed in |
54 |
# order to determine some path information correctly for copy/move |
55 |
# operations later on |
56 |
FULL_VERSION="${PV%%_*}" |
57 |
- #S="${WORKDIR}/emacs-${FULL_VERSION}" |
58 |
- S="${WORKDIR}/emacs" |
59 |
+ S="${WORKDIR}/emacs-${FULL_VERSION}" |
60 |
+ [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" |
61 |
fi |
62 |
|
63 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
64 |
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
65 |
|
66 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
67 |
SLOT="25" |
68 |
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
69 |
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
70 |
REQUIRED_USE="?? ( aqua X )" |
71 |
|
72 |
RDEPEND="sys-libs/ncurses:0 |
73 |
@@ -71,8 +71,14 @@ RDEPEND="sys-libs/ncurses:0 |
74 |
) |
75 |
) |
76 |
gtk? ( |
77 |
- gtk3? ( x11-libs/gtk+:3 ) |
78 |
- !gtk3? ( x11-libs/gtk+:2 ) |
79 |
+ xwidgets? ( |
80 |
+ x11-libs/gtk+:3 |
81 |
+ net-libs/webkit-gtk:3= |
82 |
+ ) |
83 |
+ !xwidgets? ( |
84 |
+ gtk3? ( x11-libs/gtk+:3 ) |
85 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
86 |
+ ) |
87 |
) |
88 |
!gtk? ( |
89 |
motif? ( >=x11-libs/motif-2.3:0 ) |
90 |
@@ -111,7 +117,7 @@ src_prepare() { |
91 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
92 |
fi |
93 |
|
94 |
- epatch_user |
95 |
+ eapply_user |
96 |
|
97 |
# Fix filename reference in redirected man page |
98 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
99 |
@@ -182,7 +188,12 @@ src_configure() { |
100 |
recommended that you compile Emacs with the Athena/Lucid or the |
101 |
Motif toolkit instead. |
102 |
EOF |
103 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
104 |
+ if use xwidgets; then |
105 |
+ myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
106 |
+ else |
107 |
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
108 |
+ myconf+=" --without-xwidgets" |
109 |
+ fi |
110 |
for f in motif Xaw3d athena; do |
111 |
use ${f} && ewarn \ |
112 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
113 |
@@ -201,6 +212,8 @@ src_configure() { |
114 |
einfo "Configuring to build with no toolkit" |
115 |
myconf+=" --with-x-toolkit=no" |
116 |
fi |
117 |
+ ! use gtk && use xwidgets && ewarn \ |
118 |
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
119 |
elif use aqua; then |
120 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
121 |
myconf+=" --with-ns --disable-ns-self-contained" |
122 |
@@ -305,7 +318,7 @@ src_install () { |
123 |
EOF |
124 |
elisp-site-file-install "${T}/${SITEFILE}" || die |
125 |
|
126 |
- dodoc README BUGS CONTRIBUTE |
127 |
+ dodoc README BUGS #CONTRIBUTE |
128 |
|
129 |
if use aqua; then |
130 |
dodir /Applications/Gentoo |
131 |
|
132 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild |
133 |
index 3db814a..51815df 100644 |
134 |
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild |
135 |
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild |
136 |
@@ -2,9 +2,9 @@ |
137 |
# Distributed under the terms of the GNU General Public License v2 |
138 |
# $Id$ |
139 |
|
140 |
-EAPI=5 |
141 |
+EAPI=6 |
142 |
|
143 |
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo |
144 |
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 |
145 |
|
146 |
if [[ ${PV##*.} = 9999 ]]; then |
147 |
inherit git-r3 |
148 |
@@ -15,13 +15,13 @@ if [[ ${PV##*.} = 9999 ]]; then |
149 |
else |
150 |
SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz |
151 |
mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" |
152 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
153 |
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
154 |
# FULL_VERSION keeps the full version number, which is needed in |
155 |
# order to determine some path information correctly for copy/move |
156 |
# operations later on |
157 |
FULL_VERSION="${PV%%_*}" |
158 |
- #S="${WORKDIR}/emacs-${FULL_VERSION}" |
159 |
- S="${WORKDIR}/emacs" |
160 |
+ S="${WORKDIR}/emacs-${FULL_VERSION}" |
161 |
+ [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" |
162 |
fi |
163 |
|
164 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
165 |
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
166 |
|
167 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
168 |
SLOT="25" |
169 |
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" |
170 |
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib" |
171 |
REQUIRED_USE="?? ( aqua X )" |
172 |
|
173 |
RDEPEND="sys-libs/ncurses:0 |
174 |
@@ -71,8 +71,14 @@ RDEPEND="sys-libs/ncurses:0 |
175 |
) |
176 |
) |
177 |
gtk? ( |
178 |
- gtk3? ( x11-libs/gtk+:3 ) |
179 |
- !gtk3? ( x11-libs/gtk+:2 ) |
180 |
+ xwidgets? ( |
181 |
+ x11-libs/gtk+:3 |
182 |
+ net-libs/webkit-gtk:3= |
183 |
+ ) |
184 |
+ !xwidgets? ( |
185 |
+ gtk3? ( x11-libs/gtk+:3 ) |
186 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
187 |
+ ) |
188 |
) |
189 |
!gtk? ( |
190 |
motif? ( >=x11-libs/motif-2.3:0 ) |
191 |
@@ -111,7 +117,7 @@ src_prepare() { |
192 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
193 |
fi |
194 |
|
195 |
- epatch_user |
196 |
+ eapply_user |
197 |
|
198 |
# Fix filename reference in redirected man page |
199 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
200 |
@@ -182,7 +188,12 @@ src_configure() { |
201 |
recommended that you compile Emacs with the Athena/Lucid or the |
202 |
Motif toolkit instead. |
203 |
EOF |
204 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
205 |
+ if use xwidgets; then |
206 |
+ myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
207 |
+ else |
208 |
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
209 |
+ myconf+=" --without-xwidgets" |
210 |
+ fi |
211 |
for f in motif Xaw3d athena; do |
212 |
use ${f} && ewarn \ |
213 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
214 |
@@ -201,6 +212,8 @@ src_configure() { |
215 |
einfo "Configuring to build with no toolkit" |
216 |
myconf+=" --with-x-toolkit=no" |
217 |
fi |
218 |
+ ! use gtk && use xwidgets && ewarn \ |
219 |
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
220 |
elif use aqua; then |
221 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
222 |
myconf+=" --with-ns --disable-ns-self-contained" |
223 |
|
224 |
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml |
225 |
index 0f9232f..a42a18a 100644 |
226 |
--- a/app-editors/emacs-vcs/metadata.xml |
227 |
+++ b/app-editors/emacs-vcs/metadata.xml |
228 |
@@ -29,8 +29,8 @@ |
229 |
notification</flag> |
230 |
<flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
231 |
system font name</flag> |
232 |
- <flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of |
233 |
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag> |
234 |
+ <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2 |
235 |
+ (<pkg>x11-libs/gtk+</pkg>)</flag> |
236 |
<flag name="gzip-el">Compress bundled Emacs Lisp source</flag> |
237 |
<flag name="hesiod">Enable support for <pkg>net-dns/hesiod</pkg></flag> |
238 |
<flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image |
239 |
@@ -45,5 +45,7 @@ |
240 |
<flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). |
241 |
This option has an effect only on architectures where "long" and |
242 |
"long long" types have different size.</flag> |
243 |
+ <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers |
244 |
+ (requires GTK3)</flag> |
245 |
</use> |
246 |
</pkgmetadata> |