Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/emacs:master commit in: app-editors/emacs-vcs/
Date: Sun, 01 Feb 2015 21:31:58
Message-Id: 1422826630.cdbfc6e884c17c9baae5ed2995a610b3cb85c431.ulm@gentoo
1 commit: cdbfc6e884c17c9baae5ed2995a610b3cb85c431
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 1 21:37:10 2015 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 1 21:37:10 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=cdbfc6e8
7
8 Revert "app-editors/emacs-vcs: Update for upstream merge of the xwidget branch."
9
10 This reverts commit 4b94cce821add353b6873cf0e2c1b8623fcf4336.
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, 7 insertions(+), 28 deletions(-)
18
19 diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
20 index 0de398f..a2367d2 100644
21 --- a/app-editors/emacs-vcs/ChangeLog
22 +++ b/app-editors/emacs-vcs/ChangeLog
23 @@ -2,10 +2,6 @@
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 cf43f0a..07daa6b 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-2015 Gentoo Foundation
41 +# Copyright 1999-2014 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 xwidgets 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 zlib"
51 REQUIRED_USE="?? ( aqua X )"
52
53 RDEPEND="sys-libs/ncurses
54 @@ -67,13 +67,7 @@ RDEPEND="sys-libs/ncurses
55 >=dev-libs/m17n-lib-1.5.1
56 )
57 )
58 - gtk3? (
59 - x11-libs/gtk+:3
60 - xwidgets? (
61 - >=dev-libs/gobject-introspection-1.32.1
62 - net-libs/webkit-gtk:3
63 - )
64 - )
65 + gtk3? ( x11-libs/gtk+:3 )
66 !gtk3? (
67 gtk? ( x11-libs/gtk+:2 )
68 !gtk? (
69 @@ -171,7 +165,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 $(use_with xwidgets)"
74 + myconf+=" --with-x-toolkit=gtk3"
75 elif use gtk; then
76 einfo "Configuring to build with GIMP Toolkit (GTK+) version 2"
77 myconf+=" --with-x-toolkit=gtk2"
78 @@ -193,8 +187,6 @@ 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 ae63b36..b54dff7 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 xwidgets 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 zlib"
98 REQUIRED_USE="?? ( aqua X )"
99
100 RDEPEND="sys-libs/ncurses
101 @@ -67,13 +67,7 @@ RDEPEND="sys-libs/ncurses
102 >=dev-libs/m17n-lib-1.5.1
103 )
104 )
105 - gtk3? (
106 - x11-libs/gtk+:3
107 - xwidgets? (
108 - >=dev-libs/gobject-introspection-1.32.1
109 - net-libs/webkit-gtk:3
110 - )
111 - )
112 + gtk3? ( x11-libs/gtk+:3 )
113 !gtk3? (
114 gtk? ( x11-libs/gtk+:2 )
115 !gtk? (
116 @@ -171,7 +165,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 $(use_with xwidgets)"
121 + myconf+=" --with-x-toolkit=gtk3"
122 elif use gtk; then
123 einfo "Configuring to build with GIMP Toolkit (GTK+) version 2"
124 myconf+=" --with-x-toolkit=gtk2"
125 @@ -193,8 +187,6 @@ 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 c2cefd0..dd924f4 100644
137 --- a/app-editors/emacs-vcs/metadata.xml
138 +++ b/app-editors/emacs-vcs/metadata.xml
139 @@ -44,6 +44,5 @@
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>
Report Message
Find on MARC Find on Google Groups