From 899eb370b88ced478207000723cb54d0c5c977a2 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Thu, 13 Sep 2012 08:46:56 +0000
Subject: Sync from Portage tree.

(Portage version: 2.1.11.14/svn/Linux x86_64, signed Manifest commit with key 7DC6EA25)

svn path=/emacs-overlay/; revision=1835
---
 app-editors/emacs-vcs/ChangeLog                  |  3 +++
 app-editors/emacs-vcs/Manifest                   | 30 ++++++++++++------------
 app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild |  7 ++----
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'app-editors/emacs-vcs')

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 96e51bb..f49c5cc 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
+  Sync from Portage tree.
+
   12 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
   Use lightweight checkout for WORKDIR, bug 434746.
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 7232c42..2c8226e 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,23 +2,23 @@
 Hash: SHA256
 
 AUX emacs-24.0.92-ns-appdirs.patch 1538 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804 SHA512 141d6f2a0df176eafd476b1b064586ac1d32d2b920fd3e65a7bdd9ad6335d3c148761238da07329795477c7aebab2db3b685c3466ddbe6c0d297654949bb8364 WHIRLPOOL daf3baf1d88c2399435b340c178888a126ae4ed1e9ffa87575b14977f215f3cb07b109e0c1fe13ccdd5cf9b1d63b7ebd1237586fef7393c0bc279cf9a6196459
-EBUILD emacs-vcs-24.2.9999.ebuild 10885 SHA256 044bcf67ede8c8fb747422e8cc2d92a79722ecdd9611f2676bed41ced97333ee SHA512 f3f90c73a7bc6710d77f61b4f8fe5dd2119da1b38a9f016a8459520fa156ff6969f497efcf08b08aa62dfc820b9fc026fc6aa72e43455eda115a8750303174ef WHIRLPOOL f2abed33c61d35ed2532e5b8c62d92216bf081da44c04c702f9eadabcb56908044bb20b9a454e7cac276932faa0b678417c12ba040080425aa50d4c4afcd4495
-MISC ChangeLog 888 SHA256 ff32428a054d42fe35b0bdaa4760ac12665c109221182b4b9545c34197e09bed SHA512 c1f85d453e5a25313e9ff1e45c9cd5055c23791835f3d62e38ddf7b875c48f01a7bb2c31d51969ffe43a8ceb47451ac7955d7d05955e2d315d28795a9f891f85 WHIRLPOOL 730b3c74fcdecbf4af1d1824fd393ad6fe6805f771c0e0bb797bfa67cfed9eaf085d29d41605c506ef829e3117a6ccd7a6f9bc1f659cf446597944070ab02678
+EBUILD emacs-vcs-24.2.9999.ebuild 10788 SHA256 0b5fb9f57e87cfba987728fccef1adae5b816cfd7a4e42d80a72766b744ce310 SHA512 12eff34711a71577ad91863483c4d40c3b5cf94672f63cb845a3b3d2178a56e0ad08c5c91e6276079860db3ac6f906e8b06b6ee0c9eb589df635d6aa03f0f2ce WHIRLPOOL fc76d5c234e50e8a005fe9ab4da4765eaef105e1e55e768e1246fac4b73f537d9b5ba3f9ffb51b32f153bf13557f8209b7f47f487bca7eee54329e9e1f597b89
+MISC ChangeLog 990 SHA256 948daa3163878d89306ff45f213b66d26214b6456b83edfe1b027c81afd356b2 SHA512 f09bdca1e2d62aedf30ba3efc7d96dabf014daa0fa0b121462433a90405cb2ef4bbde4288b5f58aa8dd311947355c4e9ad0ada0647dd180964626ad34d68eb70 WHIRLPOOL 24c52046922349bbe240932143a20ec7f41f395ba5765b73144e5d065e922646674b61c966be402c78b8db224d5dc599f9d770f4f42439f3b28fe29303a57b75
 MISC metadata.xml 2333 SHA256 6a4ab4b0709e8f61773994140d420a9c75b6c8a3eef7b02727bf4c18d91abe74 SHA512 2ea80909c30fe404ae0ca7059ae444fa9b4bdb168d6c7b2a08d566980e4374d95f21d56d2fba40ac5182705fbbd650362194aa091b3c9fadeebaf82fe92fdfd6 WHIRLPOOL 8987cb0f15d50817f0ab89bc82e1c85e1225797bfe77b13db3a917f2875be9d314054520b6d78b1552bcd1afe7f4446423eafdece71bb638dc26cb9fc41011f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQUQAhAAoJEDxpGckxwJCBsSwQAL4vWWa/e+el3XbzzEsYTk69
-W+i/oUNyOqRwth+ejKzZBsPKNaVOT+RTIKZ97xq1VC+ubTW6B0iKz22B2Y5eOdrJ
-E9wV/ToGNRqnaYU91KpbCmPZQriqVMmNYDmpFPC3NFIUuLQIhjKhVdKS/sLqErPL
-PsH+7VYC34St+Roy33x/C40W+kR+ze5xOYcq0pIRpSEF1hPZR9ExFRXKcbqX2Gza
-anhKMRfWtZm0WWHSkgelik9D+XJLnsqVFowcBfv7pSRYL8ydWZYnMLhAHHAUmkvf
-+rfHfY/vPvtcvT1O2x4HoEAbemGRaT/MEk+SLrXqye5uadG9buXqAhDg8LoSbXpo
-K1VEr/LAN0uxCledlS7aWAMcff44fkXaJuAO6W3u8qaiE821K6WVYijV7o6LlNFk
-LxV+Sq2JJ0672P3YymB/7HBDpOvUaGtyGicKEZCNqB1wE1J4aMoKhzYSqaJyuFN/
-gvTZhpXAiAqpYY+zhd8BVXCigR+sXnYEiFo/z8fmZmGjOrqDl1hO+gKVhsra6gCo
-x50CX49KfY6ABHFjrKdUxziOlS+bSseok7D9bs5vMYDbnWDWlZ/TFI0Yhurn3seP
-jqCq/D8dNm/aPG/YK44yLN0LF6Y/khHecqxckeIfqxN4JDhUFgbQ/jDpkF8Mfqu7
-ST9Ufw6u0B3VoPivw1i6
-=cAff
+iQIcBAEBCAAGBQJQUZ2BAAoJEDxpGckxwJCBPYMQAL6kqJ8j6dFh18+7FLPgdp7e
+DLVRqgsp6QkuIGW6OXgtq5aVzwoQ/XgjL+ZUZjTfSfG72sZXaijA3y5SSctlK5gI
+9j68lelzsTTDnNbDmaIBHVq8wUaNgeytjMyngnogEUfsGizSzB3pChz/HmKFE5kB
+wjqcxuq/DtTu93iiWGrHK8SLz3SgxNjarHx6jmaijTSCKig3iq5OweGFtRm8V1S0
+NyNq8cgxObGfUNRA4rMcN/E+IcyGEN14rtMXxIOC0jVG1rAqhudPv01eWBXJQNQW
+yy8yKTlKq9HTRE1L/s1tr2drubnajc3+6MtM4SPSo0B6RIalS90vRla78qImLVQH
+YhPSZWgJsqL53km+gY0RTG9V0YqWJco9H1jrJy05bEQy6O5jU3N4NwGZRmmagFMx
+Cz659Oz9/MbKqw68+BmjHZCo148C4AfywzAV98HJKubrV8P0Ev3q3g0lnuTv/rCV
+UpvtFcmSqBkQf7mhPA508yoSLyL3ZBEYvHMkWWNWMkRfldvU0ukzotQ1dEBHmyTq
+9lDmPyCDjShe7q/hFQmH+XQozQGgvDxQUIGh9vThgfHV0SA3ta4SP2JKXv4XrkXQ
+fD9bGwRyNygOLdsd7cb2VMmRWkzU/ByedWAIyAmuFxpxfdoNBH14HtbFulK+CLMK
+Uxnzhw2SwxV5FvtzLTXV
+=ZiCA
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
index 4ecefb8..d08c302 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@@ -31,7 +31,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
+IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.2
@@ -167,7 +167,7 @@ src_configure() {
 
 		if use gtk; then
 			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
+			myconf="${myconf} --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
 			local f
 			for f in athena Xaw3d motif; do
 				use ${f} && ewarn "USE flag \"${f}\" ignored" \
@@ -185,9 +185,6 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf="${myconf} --with-x-toolkit=no"
 		fi
-
-		! use gtk && use gtk3 \
-			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
 	else
 		myconf="${myconf} --without-x --without-ns"
 	fi
-- 
cgit v1.2.3-18-g5258