From 6f4e9df5b9cc71d330ccb73104e46fdfce0733e4 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Sun, 1 Feb 2015 22:35:20 +0100
Subject: app-editors/emacs-xwidget: Merge changes from emacs-vcs.

Package-Manager: portage-2.2.15
---
 app-editors/emacs-xwidget/ChangeLog                      |  6 +++++-
 app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild |  4 ++--
 app-editors/emacs-xwidget/metadata.xml                   | 11 ++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'app-editors')

diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 1cec23c..73ee722 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-editors/emacs-xwidget
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild,
+  metadata.xml:
+  Merge changes from emacs-vcs.
+
   29 Dec 2014; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-25.0.9999.ebuild:
   Set a fake version number to avoid collisions with emacs-vcs.
 
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
index 7ae4df6..dbbfa36 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-25.0.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -303,7 +303,7 @@ src_install () {
 	EOF
 	elisp-site-file-install "${T}/${SITEFILE}" || die
 
-	dodoc README README.xwidget BUGS CONTRIBUTE
+	dodoc README BUGS CONTRIBUTE
 
 	if use aqua; then
 		dodir /Applications/Gentoo
diff --git a/app-editors/emacs-xwidget/metadata.xml b/app-editors/emacs-xwidget/metadata.xml
index 7e27373..c2cefd0 100644
--- a/app-editors/emacs-xwidget/metadata.xml
+++ b/app-editors/emacs-xwidget/metadata.xml
@@ -26,16 +26,17 @@
     notification</flag>
   <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
-    version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
+  <flag name='gtk'>Add support for <pkg>x11-libs/gtk+</pkg>
+    (the GIMP Toolkit) version 2</flag>
+  <flag name='gtk3'>Add support for <pkg>x11-libs/gtk+</pkg>
+    (the GIMP Toolkit) version 3</flag>
   <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
   <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
   <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
   <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
-  <flag name='pax_kernel'>Enable building under a PaX enabled kernel
-    (<pkg>sys-apps/paxctl</pkg>)</flag>
+  <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
   <flag name='source'>Install C source files and make them available for
     find-function</flag>
   <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
@@ -43,6 +44,6 @@
   <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
-  <flag name='xwidgets'>Enable use of some gtk widgets it Emacs buffers</flag>
+  <flag name='xwidgets'>Enable use of some gtk widgets in Emacs buffers</flag>
 </use>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad