Backport some changes from the emacs-vcs live ebuild.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index c955ae897b17f8501d6dd4338bf6966ace2aa62e..49e59b043f8b0f01e8c2f8e7b0e56ff5b90129e4 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.428 2011/08/29 16:28:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.429 2011/09/08 14:10:03 ulm Exp $
+
+  02 Sep 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild:
+  Backport some changes from the emacs-vcs live ebuild.
 
   29 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r1.ebuild,
   emacs-23.3-r2.ebuild:

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 57f6cb664e1aed440a20d70581b84fa952b41f3f..eff04ef1dcde2f3781370229e95a343e0f2f4b12 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,13 +18,13 @@ EBUILD emacs-21.4-r23.ebuild 5022 RMD160 b7ece01e4d6bd874b4f719682ec89ad02e92356
 EBUILD emacs-22.3-r8.ebuild 7874 RMD160 213faef35dfe75d32e0c325399302af10a5d810f SHA1 2d3cd24c7e9f5ff79e27daf11c337c8fddc3b041 SHA256 e6a2d9a214be37d16e342a4d56ef473db2076940270ac879073f781e4a9372e2
 EBUILD emacs-23.2-r2.ebuild 9169 RMD160 da42435c54872e15a786f36e586b39855b33686f SHA1 b84b1d60ba0f4f3a9aa8b1952aa3cfd40c731b1c SHA256 7dd8751820b59c7b6619e05d879263fe91a56269a74240daf9d6326e44a942e1
 EBUILD emacs-23.3-r1.ebuild 10269 RMD160 4a384f15d098757c99f15d0592a49d2415b9d2f5 SHA1 5c1a2259f4911c8e238a4cdcfe686998ecad7039 SHA256 8b50b0f54553270a1c71a948110fe0d101a2f11ffe847913d60abb4aa716130a
-EBUILD emacs-23.3-r2.ebuild 10369 RMD160 d59c64f42a5f2685188075a33f45ef01e3fc4825 SHA1 6bee94c8c0472db886db401ceb2643086aff0de3 SHA256 833abb40dbd83382f052d7b704adff0fd1fa4c3d79bbba2e2897c590056ebc7f
-MISC ChangeLog 61159 RMD160 d260548299c7a1f8d113ec29d25c35a4c57b055e SHA1 9b58c3b8002cd441ab73c2117a131623b392f5f0 SHA256 3c5a59a2514a1cb917e25c81db12295b4d77c2b3ebcfec2aeefb9c7fa81966b4
+EBUILD emacs-23.3-r2.ebuild 10399 RMD160 abb9075f2a1bf79cd1f850489c0fe0d3c24fc804 SHA1 bedbb80e6f98ba9b12fb12ca7df45370bcbd6f45 SHA256 8d1304cbe1f4574534da83a32410843bb26210d3dd5ab4491cb25b0ef59d1a7e
+MISC ChangeLog 61285 RMD160 0ee915e0984e73d8084b7c3b322f3a7f6227f97d SHA1 ffcf6b0c7c3e6c179df6da6604a9b2a9a1c7a497 SHA256 202eaaca6bd67c203047996db9510b93fce221bb170654cde2774b54f0da85b2
 MISC metadata.xml 1704 RMD160 efbac0e266304bf11ffb64c3cdfecac81e7ff177 SHA1 d12430143adab307f896d1c72c02ed40a8f62822 SHA256 22b564149011a32c17256ac39c2d6d49be01b52f9ddddeb82795ff9b66a46ed1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5bv6UACgkQOeoy/oIi7uwgUwCfVOQBZG7t91ICqJ6ddoCa1XQO
-iPsAoOOurMYERBkiSMJoedyhxUi8ITai
-=1GN8
+iEYEARECAAYFAk5ozkIACgkQOeoy/oIi7uy6iQCeKm6BoXYMFo2S9filxv3AZ6lV
+yWwAnjAPhFXpdNXNc5QTrpYOiPpoHAwF
+=gJtK
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index 7254872021e6df48b80c0c70ea264c387e47d1c6..42ff731258258d6f8f208ce2f8d209019965b292 100644 (file)
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.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/emacs-23.3-r2.ebuild,v 1.2 2011/08/29 16:28:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.3 2011/09/08 14:10:03 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -127,15 +127,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
@@ -146,7 +147,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"