1 |
commit: 084eadf93279631a2e48abd88561edd593f388f7 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Dec 29 11:16:56 2014 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 29 11:16:56 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=084eadf9 |
7 |
|
8 |
app-editors/emacs-xwidget: Upstream version number has changed. Merge changes from emacs-vcs. |
9 |
|
10 |
Package-Manager: portage-2.2.15 |
11 |
|
12 |
--- |
13 |
app-editors/emacs-xwidget/ChangeLog | 6 +++ |
14 |
....9999.ebuild => emacs-xwidget-25.0.9999.ebuild} | 63 +++++++++++----------- |
15 |
2 files changed, 36 insertions(+), 33 deletions(-) |
16 |
|
17 |
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog |
18 |
index 36dd441..28a0a5a 100644 |
19 |
--- a/app-editors/emacs-xwidget/ChangeLog |
20 |
+++ b/app-editors/emacs-xwidget/ChangeLog |
21 |
@@ -2,6 +2,12 @@ |
22 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+*emacs-xwidget-25.0.9999 (29 Dec 2014) |
26 |
+ |
27 |
+ 29 Dec 2014; Ulrich Müller <ulm@g.o> -emacs-xwidget-24.4.9999.ebuild, |
28 |
+ +emacs-xwidget-25.0.9999.ebuild: |
29 |
+ Upstream version number has changed. Merge changes from emacs-vcs. |
30 |
+ |
31 |
13 Nov 2014; Ulrich Müller <ulm@g.o> emacs-xwidget-24.4.9999.ebuild: |
32 |
Merge changes from emacs-vcs. |
33 |
|
34 |
|
35 |
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild |
36 |
similarity index 90% |
37 |
rename from app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild |
38 |
rename to app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild |
39 |
index 4661889..0cce171 100644 |
40 |
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.4.9999.ebuild |
41 |
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild |
42 |
@@ -27,8 +27,8 @@ HOMEPAGE="http://www.gnu.org/software/emacs/ |
43 |
http://www.emacswiki.org/emacs/EmacsXembed" |
44 |
|
45 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
46 |
-SLOT="24" |
47 |
-IUSE="acl alsa aqua athena 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" |
48 |
+SLOT="25" |
49 |
+IUSE="acl alsa aqua athena 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" |
50 |
REQUIRED_USE="?? ( aqua X )" |
51 |
|
52 |
RDEPEND="sys-libs/ncurses |
53 |
@@ -68,21 +68,21 @@ RDEPEND="sys-libs/ncurses |
54 |
>=dev-libs/m17n-lib-1.5.1 |
55 |
) |
56 |
) |
57 |
- gtk? ( |
58 |
+ gtk3? ( |
59 |
+ x11-libs/gtk+:3 |
60 |
xwidgets? ( |
61 |
- x11-libs/gtk+:3 |
62 |
+ >=dev-libs/gobject-introspection-1.32.1 |
63 |
net-libs/webkit-gtk:3 |
64 |
) |
65 |
- !xwidgets? ( |
66 |
- gtk3? ( x11-libs/gtk+:3 ) |
67 |
- !gtk3? ( x11-libs/gtk+:2 ) |
68 |
- ) |
69 |
) |
70 |
- !gtk? ( |
71 |
- motif? ( >=x11-libs/motif-2.3:0 ) |
72 |
- !motif? ( |
73 |
- Xaw3d? ( x11-libs/libXaw3d ) |
74 |
- !Xaw3d? ( athena? ( x11-libs/libXaw ) ) |
75 |
+ !gtk3? ( |
76 |
+ gtk? ( x11-libs/gtk+:2 ) |
77 |
+ !gtk? ( |
78 |
+ motif? ( >=x11-libs/motif-2.3:0 ) |
79 |
+ !motif? ( |
80 |
+ Xaw3d? ( x11-libs/libXaw3d ) |
81 |
+ !Xaw3d? ( athena? ( x11-libs/libXaw ) ) |
82 |
+ ) |
83 |
) |
84 |
) |
85 |
)" |
86 |
@@ -173,26 +173,15 @@ src_configure() { |
87 |
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
88 |
fi |
89 |
|
90 |
- local f |
91 |
- if use gtk; then |
92 |
- einfo "Configuring to build with GIMP Toolkit (GTK+)" |
93 |
- if use xwidgets; then |
94 |
- myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
95 |
- else |
96 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
97 |
- myconf+=" --without-xwidgets" |
98 |
- fi |
99 |
- for f in motif Xaw3d athena; do |
100 |
- use ${f} && ewarn \ |
101 |
- "USE flag \"${f}\" has no effect if \"gtk\" is set." |
102 |
- done |
103 |
+ if use gtk3; then |
104 |
+ einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" |
105 |
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" |
106 |
+ elif use gtk; then |
107 |
+ einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" |
108 |
+ myconf+=" --with-x-toolkit=gtk2" |
109 |
elif use motif; then |
110 |
einfo "Configuring to build with Motif toolkit" |
111 |
myconf+=" --with-x-toolkit=motif" |
112 |
- for f in Xaw3d athena; do |
113 |
- use ${f} && ewarn \ |
114 |
- "USE flag \"${f}\" has no effect if \"motif\" is set." |
115 |
- done |
116 |
elif use athena || use Xaw3d; then |
117 |
einfo "Configuring to build with Athena/Lucid toolkit" |
118 |
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" |
119 |
@@ -200,8 +189,16 @@ src_configure() { |
120 |
einfo "Configuring to build with no toolkit" |
121 |
myconf+=" --with-x-toolkit=no" |
122 |
fi |
123 |
- ! use gtk && use xwidgets && ewarn \ |
124 |
- "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
125 |
+ |
126 |
+ local f tk |
127 |
+ for f in gtk3 gtk motif Xaw3d athena; do |
128 |
+ use ${f} || continue |
129 |
+ [[ ${tk} = gtk* || ${tk} = motif ]] \ |
130 |
+ && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" |
131 |
+ : ${tk:=${f}} |
132 |
+ done |
133 |
+ ! use gtk3 && use xwidgets && ewarn \ |
134 |
+ "USE flag \"xwidgets\" has no effect if \"gtk3\" is not set." |
135 |
elif use aqua; then |
136 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
137 |
myconf+=" --with-ns --disable-ns-self-contained" |
138 |
@@ -306,7 +303,7 @@ src_install () { |
139 |
EOF |
140 |
elisp-site-file-install "${T}/${SITEFILE}" || die |
141 |
|
142 |
- dodoc README README.xwidget BUGS |
143 |
+ dodoc README README.xwidget BUGS CONTRIBUTE |
144 |
|
145 |
if use aqua; then |
146 |
dodir /Applications/Gentoo |