From 6dbb36d8c9cf893978b2ecc6d7150cf888d3d98e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
Date: Fri, 9 Sep 2011 19:21:18 +0000
Subject: [PATCH] Merge changes from Emacs overlay.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64
---
 app-editors/emacs-vcs/ChangeLog                  |  5 ++++-
 app-editors/emacs-vcs/Manifest                   | 10 +++++-----
 app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild |  9 +++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 83200ac16e08..bc2f9c987489 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.61 2011/08/19 17:27:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.62 2011/09/09 19:21:18 ulm Exp $
+
+  09 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild:
+  Merge changes from Emacs overlay.
 
   19 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
   emacs-vcs-24.0.9999-r1.ebuild:
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 986e3d466726..3b9d8f88c2b8 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD emacs-vcs-23.3.9999.ebuild 10895 RMD160 bdfb1aa63b08bd6b7ef2a17dfa5bd275514234ee SHA1 8627f8eb7e9aca67952d3bf5eab9b99b08915232 SHA256 74f8e15f8ae45c64154330585b139600f537ee5398c35b78b6f01c4b69c40fa4
+EBUILD emacs-vcs-23.3.9999.ebuild 10925 RMD160 a7b930bdee3a37af8ebc225afd511a1021643267 SHA1 8e5df146433a10037b5a5cf312a25126bd0f0456 SHA256 b32416377f334c7c07aa2837e2b41418f859f01cfbc885bd124f1255dfba41be
 EBUILD emacs-vcs-24.0.9999-r1.ebuild 11229 RMD160 327d5d7fbaca12452ec3a63140867ac943a04ada SHA1 fc52886699f664d787df3504c6e7ba216d553867 SHA256 c268753468038c30bdb7b929132e83be3fa4a2aad151fe051f81f04f9876b832
-MISC ChangeLog 59652 RMD160 556720192f793bbdce6d6f93738f740c8520ddaa SHA1 d3d9c0dcd030e95988730cd0aea4a248f820af86 SHA256 054fac6a892f9ad14a3eb7e95ac309c15a2c8ecea41d5a261331a6ad396d0786
+MISC ChangeLog 59764 RMD160 dca6b75fb3053d899e23f622971541fdd02731df SHA1 56f1f0165c8af679c642bb3ce31f90c9fb1a3268 SHA256 10d04e8affbdb1080f23726827a049aa926446cee0012eedd00473ce0d6737ef
 MISC metadata.xml 2219 RMD160 59724e54af053aa155ff1079d7971df365088afd SHA1 664d49b56b126e8ad2c64b4415eafcf68e447ad3 SHA256 2d94fccd2d478d91044897e7e5facb4883cb752ea81382e0671a33dd17dce579
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Sr+8ACgkQOeoy/oIi7uw2cgCgrVgUiIDVyRoBnW1t73lRu80C
-VMYAoInUpsCWUz4Mvibg1PS2lo4OXS9b
-=yAoh
+iEYEARECAAYFAk5qaLYACgkQOeoy/oIi7uzIxwCgvT3ejnI1K/DYkW5chlYI0YXy
+FLAAoOVcHNqfkql2zltMO5hMqF3zZc7A
+=8m7e
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
index c37e4b8391a2..6ea957fdd704 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.11 2011/08/22 19:31:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.12 2011/09/09 19:21:18 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -156,15 +156,16 @@ src_configure() {
 		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
 		myconf="${myconf} $(use_with png) $(use_with svg rsvg)"
 		myconf="${myconf} $(use_with tiff) $(use_with xpm)"
-		myconf="${myconf} $(use_with xft)"
 
 		if use xft; then
+			myconf="${myconf} --with-xft"
 			myconf="${myconf} $(use_with m17n-lib libotf)"
 			myconf="${myconf} $(use_with m17n-lib m17n-flt)"
 		else
+			myconf="${myconf} --without-xft"
 			myconf="${myconf} --without-libotf --without-m17n-flt"
 			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect because xft is not set."
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
 		fi
 
 		# GTK+ is the default toolkit if USE=gtk is chosen with other
@@ -175,7 +176,7 @@ src_configure() {
 			myconf="${myconf} --with-x-toolkit=gtk"
 		elif use Xaw3d; then
 			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
+			myconf="${myconf} --with-x-toolkit=lucid"
 		elif use motif; then
 			einfo "Configuring to build with Motif toolkit"
 			myconf="${myconf} --with-x-toolkit=motif"
-- 
2.26.2