| 1 |
commit: 4b94cce821add353b6873cf0e2c1b8623fcf4336 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 1 15:50:42 2015 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 1 15:50:42 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=4b94cce8 |
| 7 |
|
| 8 |
app-editors/emacs-vcs: Update for upstream merge of the xwidget branch. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.15 |
| 11 |
|
| 12 |
--- |
| 13 |
app-editors/emacs-vcs/ChangeLog | 4 ++++ |
| 14 |
app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild | 16 ++++++++++++---- |
| 15 |
app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild | 14 +++++++++++--- |
| 16 |
app-editors/emacs-vcs/metadata.xml | 1 + |
| 17 |
4 files changed, 28 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog |
| 20 |
index a2367d2..0de398f 100644 |
| 21 |
--- a/app-editors/emacs-vcs/ChangeLog |
| 22 |
+++ b/app-editors/emacs-vcs/ChangeLog |
| 23 |
@@ -2,6 +2,10 @@ |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 01 Feb 2015; Ulrich Müller <ulm@g.o> emacs-vcs-25.0.9999-r1.ebuild, |
| 28 |
+ emacs-vcs-25.0.9999-r2.ebuild, metadata.xml: |
| 29 |
+ Update for upstream merge of the xwidget branch. |
| 30 |
+ |
| 31 |
01 Feb 2015; Ulrich Müller <ulm@g.o> metadata.xml: |
| 32 |
Sync metadata.xml from Portage tree. |
| 33 |
|
| 34 |
|
| 35 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild |
| 36 |
index 07daa6b..cf43f0a 100644 |
| 37 |
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild |
| 38 |
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r1.ebuild |
| 39 |
@@ -1,4 +1,4 @@ |
| 40 |
-# Copyright 1999-2014 Gentoo Foundation |
| 41 |
+# Copyright 1999-2015 Gentoo Foundation |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-25.0.9999.ebuild,v 1.1 2014/10/02 07:13:42 ulm Exp $ |
| 44 |
|
| 45 |
@@ -27,7 +27,7 @@ HOMEPAGE="http://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 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 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 |
| 54 |
@@ -67,7 +67,13 @@ RDEPEND="sys-libs/ncurses |
| 55 |
>=dev-libs/m17n-lib-1.5.1 |
| 56 |
) |
| 57 |
) |
| 58 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 59 |
+ gtk3? ( |
| 60 |
+ x11-libs/gtk+:3 |
| 61 |
+ xwidgets? ( |
| 62 |
+ >=dev-libs/gobject-introspection-1.32.1 |
| 63 |
+ net-libs/webkit-gtk:3 |
| 64 |
+ ) |
| 65 |
+ ) |
| 66 |
!gtk3? ( |
| 67 |
gtk? ( x11-libs/gtk+:2 ) |
| 68 |
!gtk? ( |
| 69 |
@@ -165,7 +171,7 @@ src_configure() { |
| 70 |
|
| 71 |
if use gtk3; then |
| 72 |
einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" |
| 73 |
- myconf+=" --with-x-toolkit=gtk3" |
| 74 |
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" |
| 75 |
elif use gtk; then |
| 76 |
einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" |
| 77 |
myconf+=" --with-x-toolkit=gtk2" |
| 78 |
@@ -187,6 +193,8 @@ src_configure() { |
| 79 |
&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" |
| 80 |
: ${tk:=${f}} |
| 81 |
done |
| 82 |
+ ! use gtk3 && use xwidgets && ewarn \ |
| 83 |
+ "USE flag \"xwidgets\" has no effect if \"gtk3\" is not set." |
| 84 |
elif use aqua; then |
| 85 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
| 86 |
myconf+=" --with-ns --disable-ns-self-contained" |
| 87 |
|
| 88 |
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 |
| 89 |
index b54dff7..ae63b36 100644 |
| 90 |
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild |
| 91 |
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild |
| 92 |
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/" |
| 93 |
|
| 94 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 95 |
SLOT="25" |
| 96 |
-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 zlib" |
| 97 |
+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" |
| 98 |
REQUIRED_USE="?? ( aqua X )" |
| 99 |
|
| 100 |
RDEPEND="sys-libs/ncurses |
| 101 |
@@ -67,7 +67,13 @@ RDEPEND="sys-libs/ncurses |
| 102 |
>=dev-libs/m17n-lib-1.5.1 |
| 103 |
) |
| 104 |
) |
| 105 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 106 |
+ gtk3? ( |
| 107 |
+ x11-libs/gtk+:3 |
| 108 |
+ xwidgets? ( |
| 109 |
+ >=dev-libs/gobject-introspection-1.32.1 |
| 110 |
+ net-libs/webkit-gtk:3 |
| 111 |
+ ) |
| 112 |
+ ) |
| 113 |
!gtk3? ( |
| 114 |
gtk? ( x11-libs/gtk+:2 ) |
| 115 |
!gtk? ( |
| 116 |
@@ -165,7 +171,7 @@ src_configure() { |
| 117 |
|
| 118 |
if use gtk3; then |
| 119 |
einfo "Configuring to build with GIMP Toolkit (GTK+) version 3" |
| 120 |
- myconf+=" --with-x-toolkit=gtk3" |
| 121 |
+ myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" |
| 122 |
elif use gtk; then |
| 123 |
einfo "Configuring to build with GIMP Toolkit (GTK+) version 2" |
| 124 |
myconf+=" --with-x-toolkit=gtk2" |
| 125 |
@@ -187,6 +193,8 @@ src_configure() { |
| 126 |
&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" |
| 127 |
: ${tk:=${f}} |
| 128 |
done |
| 129 |
+ ! use gtk3 && use xwidgets && ewarn \ |
| 130 |
+ "USE flag \"xwidgets\" has no effect if \"gtk3\" is not set." |
| 131 |
elif use aqua; then |
| 132 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
| 133 |
myconf+=" --with-ns --disable-ns-self-contained" |
| 134 |
|
| 135 |
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml |
| 136 |
index dd924f4..c2cefd0 100644 |
| 137 |
--- a/app-editors/emacs-vcs/metadata.xml |
| 138 |
+++ b/app-editors/emacs-vcs/metadata.xml |
| 139 |
@@ -44,5 +44,6 @@ |
| 140 |
<flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit). |
| 141 |
This option has an effect only on architectures where "long" and |
| 142 |
"long long" types have different size.</flag> |
| 143 |
+ <flag name='xwidgets'>Enable use of some gtk widgets in Emacs buffers</flag> |
| 144 |
</use> |
| 145 |
</pkgmetadata> |
Archives