1 |
commit: 41c80d3d37be488e9b3b1d62da755715218e2e62 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 31 19:39:41 2016 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 19:39:41 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41c80d3d |
7 |
|
8 |
app-editors/emacs-vcs: Support xwidgets flag. |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
...1.9999.ebuild => emacs-vcs-25.1.9999-r1.ebuild} | 31 +++++++++++++++------- |
13 |
1 file changed, 22 insertions(+), 9 deletions(-) |
14 |
|
15 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild |
16 |
similarity index 94% |
17 |
rename from app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild |
18 |
rename to app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild |
19 |
index 4c02aba..c66d03f 100644 |
20 |
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999.ebuild |
21 |
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild |
22 |
@@ -2,9 +2,9 @@ |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
# $Id$ |
25 |
|
26 |
-EAPI=5 |
27 |
+EAPI=6 |
28 |
|
29 |
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo |
30 |
+inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 |
31 |
|
32 |
if [[ ${PV##*.} = 9999 ]]; then |
33 |
inherit git-r3 |
34 |
@@ -20,8 +20,8 @@ else |
35 |
# order to determine some path information correctly for copy/move |
36 |
# operations later on |
37 |
FULL_VERSION="${PV%%_*}" |
38 |
- #S="${WORKDIR}/emacs-${FULL_VERSION}" |
39 |
- S="${WORKDIR}/emacs" |
40 |
+ S="${WORKDIR}/emacs-${FULL_VERSION}" |
41 |
+ [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" |
42 |
fi |
43 |
|
44 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
45 |
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/" |
46 |
|
47 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
48 |
SLOT="25" |
49 |
-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" |
50 |
+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" |
51 |
REQUIRED_USE="?? ( aqua X )" |
52 |
|
53 |
RDEPEND="sys-libs/ncurses:0 |
54 |
@@ -71,8 +71,14 @@ RDEPEND="sys-libs/ncurses:0 |
55 |
) |
56 |
) |
57 |
gtk? ( |
58 |
- gtk3? ( x11-libs/gtk+:3 ) |
59 |
- !gtk3? ( x11-libs/gtk+:2 ) |
60 |
+ xwidgets? ( |
61 |
+ x11-libs/gtk+:3 |
62 |
+ net-libs/webkit-gtk:3= |
63 |
+ ) |
64 |
+ !xwidgets? ( |
65 |
+ gtk3? ( x11-libs/gtk+:3 ) |
66 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
67 |
+ ) |
68 |
) |
69 |
!gtk? ( |
70 |
motif? ( >=x11-libs/motif-2.3:0 ) |
71 |
@@ -111,7 +117,7 @@ src_prepare() { |
72 |
|| die "Upstream version number changed to ${FULL_VERSION}" |
73 |
fi |
74 |
|
75 |
- epatch_user |
76 |
+ eapply_user |
77 |
|
78 |
# Fix filename reference in redirected man page |
79 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
80 |
@@ -182,7 +188,12 @@ src_configure() { |
81 |
recommended that you compile Emacs with the Athena/Lucid or the |
82 |
Motif toolkit instead. |
83 |
EOF |
84 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
85 |
+ if use xwidgets; then |
86 |
+ myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
87 |
+ else |
88 |
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
89 |
+ myconf+=" --without-xwidgets" |
90 |
+ fi |
91 |
for f in motif Xaw3d athena; do |
92 |
use ${f} && ewarn \ |
93 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
94 |
@@ -201,6 +212,8 @@ src_configure() { |
95 |
einfo "Configuring to build with no toolkit" |
96 |
myconf+=" --with-x-toolkit=no" |
97 |
fi |
98 |
+ ! use gtk && use xwidgets && ewarn \ |
99 |
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
100 |
elif use aqua; then |
101 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
102 |
myconf+=" --with-ns --disable-ns-self-contained" |