Sync from Portage tree.

svn path=/emacs-overlay/; revision=1649

4 files changed, 44 insertions, 18 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index dd2f754..ff53328 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Jul 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999-r1.ebuild,
+  metadata.xml:
+  Sync from Portage tree.
+
   19 Mar 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
   emacs-vcs-24.0.9999-r1.ebuild, -emacs-vcs-24.0.9999-r2.ebuild:
   Sync from portage tree. Remove experimental ebuild linking to Xaw3dxft.
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index ae8cf97..d3f3257 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 EBUILD emacs-vcs-23.3.9999.ebuild 10439 RMD160 97bc213e09f3d3ab36bb2b75f0a87a95db835976 SHA1 9f99a71de87e7da5be80207593ac6fbd79581f30 SHA256 c11a8e1807c04fd48de8bd20b77d682e708a29a8e3cee7af8657ad8223381c04
-EBUILD emacs-vcs-24.0.9999-r1.ebuild 10524 RMD160 7d614f0cfcf4a93f74fd0e666c6c5d7a8d62c751 SHA1 1b7871039ad22b4492be3373e6b53bbb21a97d0f SHA256 d0bd27b50cb5e89c8deff8546ee9ed03d30514e81e1bf0cf314b42e45a60c979
-MISC ChangeLog 3037 RMD160 df670e4421affad28c389b1f8c73188898b35c20 SHA1 c350388f640fc8f89990b35313dcdcfce35f3a4e SHA256 7bab5a0ac1caacc4c2465a00058c01e4c19a7d771a010f9c7a1197d8584a6df1
-MISC metadata.xml 1801 RMD160 606c780a3e86f485699157f14a35ca0e5da1d3c2 SHA1 05839ee25c6f6389e8eb80d783df895d59600a90 SHA256 bdc233a1795f52900dbe4d0a39c0e56d4eb5ba1c4842b9c46bae47f7052d5d74
+EBUILD emacs-vcs-24.0.9999-r1.ebuild 10955 RMD160 ee2ea3a17f24183c248b3e9d80a80590dea2799a SHA1 daad39daf70927e47dde2a91e4a74056ac9a19d8 SHA256 5d4ea2ac3280b3a6058396f8e500e94990bad89025fd5020d6b8d9113d8dd150
+MISC ChangeLog 3158 RMD160 31a95925f6b63dffb285332d225736f1f717f1a6 SHA1 bf0d53a131faf2fac479c7f48920f2a17a858eda SHA256 26ee273a6c9972ab3dd29c45636170284ac8e3dd1132700cf1561d90b81354d1
+MISC metadata.xml 2106 RMD160 be033c20ddf8d50f045e59552c1cccd3ce829149 SHA1 7e92f2fc679fade0f4b3a4c3d587a6ec8757437d SHA256 ae9bc43d98770006a0792f92b173911e1357135f82f33156f121206f51948e65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2EeaUACgkQOeoy/oIi7uxrYgCeJeDd/ZPTpJ9aIGl+DqNpuSqW
-JFAAoMyd1p0VE+dWIqyKh70sGCtY2lFL
-=kD9t
+iEYEARECAAYFAk4gfw0ACgkQOeoy/oIi7uwkMACggkuY32lkd9Ihf9YdP28Fw2uR
+CCwAoLJthSL7IGKMPQR1ZSYVMl7NbL6s
+=zvy2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
index 3f64331..6388351 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.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-24.0.9999-r1.ebuild,v 1.9 2011/03/19 09:34:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.10 2011/07/01 18:39:13 ulm Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa dbus gconf gif gnutls gpm gtk gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+IUSE="alsa dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
 RESTRICT="strip"
 
 RDEPEND="sys-libs/ncurses
@@ -47,7 +47,8 @@ RDEPEND="sys-libs/ncurses
 		x11-libs/libXmu
 		x11-libs/libXt
 		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		!gsettings? ( gconf? ( >=gnome-base/gconf-2.26.2 ) )
 		libxml2? ( >=dev-libs/libxml2-2.2.0 )
 		gif? ( media-libs/giflib )
 		jpeg? ( virtual/jpeg )
@@ -65,7 +66,10 @@ RDEPEND="sys-libs/ncurses
 				>=dev-libs/m17n-lib-1.5.1
 			)
 		)
-		gtk? ( x11-libs/gtk+:2 )
+		gtk? (
+			gtk3? ( x11-libs/gtk+:3 )
+			!gtk3? ( x11-libs/gtk+:2 )
+		)
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
@@ -147,28 +151,41 @@ src_configure() {
 
 	if use X; then
 		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with gconf) $(use_with libxml2 xml2)"
+		myconf="${myconf} $(use_with libxml2 xml2)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
+		myconf="${myconf} $(use_with wide-int)"
 		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 imagemagick) $(use_with xft)"
+		myconf="${myconf} $(use_with imagemagick)"
+
+		if use gsettings; then
+			myconf="${myconf} --with-gsettings --without-gconf"
+			use gconf && ewarn \
+				"USE flag \"gconf\" has no effect if \"gsettings\" is also set."
+		else
+			myconf="${myconf} --without-gsettings $(use_with gconf)"
+		fi
 
 		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
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
 		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=gtk"
+			if use gtk3; then
+				einfo "Configuring to build with GIMP Toolkit (GTK+ 3)"
+				myconf="${myconf} --with-x-toolkit=gtk3"
+			else
+				einfo "Configuring to build with GIMP Toolkit (GTK+ 2)"
+				myconf="${myconf} --with-x-toolkit=gtk"
+			fi
 		elif use Xaw3d; then
 			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
 			myconf="${myconf} --with-x-toolkit=athena"
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 161808d..060eda8 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -22,6 +22,10 @@
 <use>
   <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</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='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
@@ -30,5 +34,6 @@
     of the internal Lisp implementations</flag>
   <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
+  <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit)</flag>
 </use>
 </pkgmetadata>