1 |
commit: 6f4e9df5b9cc71d330ccb73104e46fdfce0733e4 |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 1 21:35:20 2015 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 1 21:35:20 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6f4e9df5 |
7 |
|
8 |
app-editors/emacs-xwidget: Merge changes from emacs-vcs. |
9 |
|
10 |
Package-Manager: portage-2.2.15 |
11 |
|
12 |
--- |
13 |
app-editors/emacs-xwidget/ChangeLog | 6 +++++- |
14 |
app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild | 4 ++-- |
15 |
app-editors/emacs-xwidget/metadata.xml | 11 ++++++----- |
16 |
3 files changed, 13 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog |
19 |
index 1cec23c..73ee722 100644 |
20 |
--- a/app-editors/emacs-xwidget/ChangeLog |
21 |
+++ b/app-editors/emacs-xwidget/ChangeLog |
22 |
@@ -1,7 +1,11 @@ |
23 |
# ChangeLog for app-editors/emacs-xwidget |
24 |
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
26 |
# $Header: $ |
27 |
|
28 |
+ 01 Feb 2015; Ulrich Müller <ulm@g.o> emacs-xwidget-25.0.9999.ebuild, |
29 |
+ metadata.xml: |
30 |
+ Merge changes from emacs-vcs. |
31 |
+ |
32 |
29 Dec 2014; Ulrich Müller <ulm@g.o> emacs-xwidget-25.0.9999.ebuild: |
33 |
Set a fake version number to avoid collisions with emacs-vcs. |
34 |
|
35 |
|
36 |
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild |
37 |
index 7ae4df6..dbbfa36 100644 |
38 |
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild |
39 |
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild |
40 |
@@ -1,4 +1,4 @@ |
41 |
-# Copyright 1999-2014 Gentoo Foundation |
42 |
+# Copyright 1999-2015 Gentoo Foundation |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
# $Header: $ |
45 |
|
46 |
@@ -303,7 +303,7 @@ src_install () { |
47 |
EOF |
48 |
elisp-site-file-install "${T}/${SITEFILE}" || die |
49 |
|
50 |
- dodoc README README.xwidget BUGS CONTRIBUTE |
51 |
+ dodoc README BUGS CONTRIBUTE |
52 |
|
53 |
if use aqua; then |
54 |
dodir /Applications/Gentoo |
55 |
|
56 |
diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml |
57 |
index 7e27373..c2cefd0 100644 |
58 |
--- a/app-editors/emacs-xwidget/metadata.xml |
59 |
+++ b/app-editors/emacs-xwidget/metadata.xml |
60 |
@@ -26,16 +26,17 @@ |
61 |
notification</flag> |
62 |
<flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
63 |
system font name</flag> |
64 |
- <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of |
65 |
- version 2 (<pkg>x11-libs/gtk+</pkg>)</flag> |
66 |
+ <flag name='gtk'>Add support for <pkg>x11-libs/gtk+</pkg> |
67 |
+ (the GIMP Toolkit) version 2</flag> |
68 |
+ <flag name='gtk3'>Add support for <pkg>x11-libs/gtk+</pkg> |
69 |
+ (the GIMP Toolkit) version 3</flag> |
70 |
<flag name='gzip-el'>Compress bundled Emacs Lisp source</flag> |
71 |
<flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag> |
72 |
<flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image |
73 |
processing</flag> |
74 |
<flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead |
75 |
of the internal Lisp implementations</flag> |
76 |
- <flag name='pax_kernel'>Enable building under a PaX enabled kernel |
77 |
- (<pkg>sys-apps/paxctl</pkg>)</flag> |
78 |
+ <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag> |
79 |
<flag name='source'>Install C source files and make them available for |
80 |
find-function</flag> |
81 |
<flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in |
82 |
@@ -43,6 +44,6 @@ |
83 |
<flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit). |
84 |
This option has an effect only on architectures where "long" and |
85 |
"long long" types have different size.</flag> |
86 |
- <flag name='xwidgets'>Enable use of some gtk widgets it Emacs buffers</flag> |
87 |
+ <flag name='xwidgets'>Enable use of some gtk widgets in Emacs buffers</flag> |
88 |
</use> |
89 |
</pkgmetadata> |