Correctly handle the no-toolkit case.

Package-Manager: portage-2.1.2.7

6 files changed, 46 insertions, 29 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 8234f04c695e..b868e345100d 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,11 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.123 2007/05/29 06:26:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.124 2007/05/29 07:21:59 ulm Exp $
 
   29 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
   emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
   emacs-cvs-23.0.0-r6.ebuild:
-  Fix logic for USE=-motif. Variables in canonical order.
+  Fix logic for USE=-motif. Handle the case that no toolkit was specified
+  (i.e. -gtk -Xaw3d -motif). Variables in canonical order.
 
   23 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.0.990.ebuild,
   emacs-cvs-22.0.9999-r10.ebuild, emacs-cvs-22.1.50.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 221c2a17b00d..531b252040e7 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -36,30 +36,30 @@ EBUILD emacs-cvs-22.0.99.ebuild 7535 RMD160 8253d130485408770e88d299aef47950d167
 MD5 f0256b140915feea9cf39ff361a41607 emacs-cvs-22.0.99.ebuild 7535
 RMD160 8253d130485408770e88d299aef47950d1676532 emacs-cvs-22.0.99.ebuild 7535
 SHA256 37c7bd6f8315772ff982ff0f0bbbd9ae60be26708221afe0f226c4660fb2823e emacs-cvs-22.0.99.ebuild 7535
-EBUILD emacs-cvs-22.0.990.ebuild 7394 RMD160 d4afd34e3143f04c33ec2aa6dc0e4e754261b66f SHA1 d3f4779b82ea4ff4bfcf30b751d297ad85ac66ba SHA256 5bd564dc9ea6c2b805b0567fefa1d9859839edd8878e7bb44c05c8b5c7a68751
-MD5 f389e0bdef3a04dfe9c74be9ecd66037 emacs-cvs-22.0.990.ebuild 7394
-RMD160 d4afd34e3143f04c33ec2aa6dc0e4e754261b66f emacs-cvs-22.0.990.ebuild 7394
-SHA256 5bd564dc9ea6c2b805b0567fefa1d9859839edd8878e7bb44c05c8b5c7a68751 emacs-cvs-22.0.990.ebuild 7394
-EBUILD emacs-cvs-22.0.9999-r10.ebuild 7727 RMD160 1ef3dde13af359a46918aa85985916a257affcda SHA1 e808537fbbc68b3b0c4a777d3460796cc3ac06da SHA256 81bfbe4856ecd0ae98cd960751e9cc4ca60057e643d586d47962b0296d7fc467
-MD5 c9703cab64e1cbe6b7d892fa9dd2423c emacs-cvs-22.0.9999-r10.ebuild 7727
-RMD160 1ef3dde13af359a46918aa85985916a257affcda emacs-cvs-22.0.9999-r10.ebuild 7727
-SHA256 81bfbe4856ecd0ae98cd960751e9cc4ca60057e643d586d47962b0296d7fc467 emacs-cvs-22.0.9999-r10.ebuild 7727
-EBUILD emacs-cvs-22.1.50.ebuild 7591 RMD160 a59ad704380b3d852d05e7797ccba53cacf6e57f SHA1 3321b35e1d73bf42665f4a2f5898781886ea5868 SHA256 e9a3523032c5cbf572557d81300d1590099b3511c9355250ed509f6206ca3fef
-MD5 c0ecf163f314b27badc2aad7613e8a53 emacs-cvs-22.1.50.ebuild 7591
-RMD160 a59ad704380b3d852d05e7797ccba53cacf6e57f emacs-cvs-22.1.50.ebuild 7591
-SHA256 e9a3523032c5cbf572557d81300d1590099b3511c9355250ed509f6206ca3fef emacs-cvs-22.1.50.ebuild 7591
+EBUILD emacs-cvs-22.0.990.ebuild 7527 RMD160 cefa42d23b5164a22b3cc248f72c98458a9e7ac6 SHA1 7add2c14ad9459681f0ebdf835ccbdacfc67a545 SHA256 b9c48261b2e05b8d423621292103d5d29c195111e2558d5cf28f20acdd32b199
+MD5 3be8cf8a0c78ea2fe511fcab15d18843 emacs-cvs-22.0.990.ebuild 7527
+RMD160 cefa42d23b5164a22b3cc248f72c98458a9e7ac6 emacs-cvs-22.0.990.ebuild 7527
+SHA256 b9c48261b2e05b8d423621292103d5d29c195111e2558d5cf28f20acdd32b199 emacs-cvs-22.0.990.ebuild 7527
+EBUILD emacs-cvs-22.0.9999-r10.ebuild 7860 RMD160 6f0d62aebba468f37659a29a1c3febbdd91d1429 SHA1 751eb634dc4adcb3bbd05c949ea84346032f61b7 SHA256 8abe4643b63a4e8b3587eea7367d6f33e427131a075df94f8f0b408407946846
+MD5 26406e7d8ca5635fe55c6019026f106b emacs-cvs-22.0.9999-r10.ebuild 7860
+RMD160 6f0d62aebba468f37659a29a1c3febbdd91d1429 emacs-cvs-22.0.9999-r10.ebuild 7860
+SHA256 8abe4643b63a4e8b3587eea7367d6f33e427131a075df94f8f0b408407946846 emacs-cvs-22.0.9999-r10.ebuild 7860
+EBUILD emacs-cvs-22.1.50.ebuild 7725 RMD160 1870f743d473a57f771297c25f1c94dba00bf07e SHA1 6b85952883f1092fc841820627ea95964da34ec8 SHA256 2c81eaded2560360e3714d163d95abaf662f484d9151189da845d6aca0273dcc
+MD5 f62dbbffd8aeb6dbdc64cc7d22877ac1 emacs-cvs-22.1.50.ebuild 7725
+RMD160 1870f743d473a57f771297c25f1c94dba00bf07e emacs-cvs-22.1.50.ebuild 7725
+SHA256 2c81eaded2560360e3714d163d95abaf662f484d9151189da845d6aca0273dcc emacs-cvs-22.1.50.ebuild 7725
 EBUILD emacs-cvs-23.0.0-r1.ebuild 5849 RMD160 c6b64383c4dda706e2301c4f1634a966f4518daf SHA1 b9d1e7e0bde0128306e55f5f623f2471477a4669 SHA256 aed5bebe908df217c23b7f0d96df6b96c3ab0aeac83623c58922b5bf32719365
 MD5 13d980ab8fdb31391fe4f2f6c5cbe321 emacs-cvs-23.0.0-r1.ebuild 5849
 RMD160 c6b64383c4dda706e2301c4f1634a966f4518daf emacs-cvs-23.0.0-r1.ebuild 5849
 SHA256 aed5bebe908df217c23b7f0d96df6b96c3ab0aeac83623c58922b5bf32719365 emacs-cvs-23.0.0-r1.ebuild 5849
-EBUILD emacs-cvs-23.0.0-r6.ebuild 7790 RMD160 5dc7c1e34f42c768bcc884347f58cf4a74f7cc14 SHA1 ebfe11d1945d0b94303012ff22e07cd671b0af47 SHA256 ae0eba37940b5288ec337ab2fd1b30026f7e3a8d33189c6f6b58ea43dd7f2ab2
-MD5 a5f1de066bcb1abafad619c32a236e31 emacs-cvs-23.0.0-r6.ebuild 7790
-RMD160 5dc7c1e34f42c768bcc884347f58cf4a74f7cc14 emacs-cvs-23.0.0-r6.ebuild 7790
-SHA256 ae0eba37940b5288ec337ab2fd1b30026f7e3a8d33189c6f6b58ea43dd7f2ab2 emacs-cvs-23.0.0-r6.ebuild 7790
-MISC ChangeLog 24399 RMD160 28c8fe080a309bba0b2e61c386a06916f0fb141f SHA1 e27992e6c0f2e7f63a7a6aed5032dc3361e63355 SHA256 680a0bca77a155b2eabd940ecdddb01df1e6dcfe5e1b878e5cd80d14c06b1e84
-MD5 15b8a1369d5b7596cdb4a3cc90191df0 ChangeLog 24399
-RMD160 28c8fe080a309bba0b2e61c386a06916f0fb141f ChangeLog 24399
-SHA256 680a0bca77a155b2eabd940ecdddb01df1e6dcfe5e1b878e5cd80d14c06b1e84 ChangeLog 24399
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7923 RMD160 a541e460d39986ef05e3c65196417ca0ae1b8782 SHA1 633e44fb96e239a9d0a3a417c393623b6ac4f284 SHA256 5eda8184d0c709613e90320bf0a0ca56e021f86140c2c1691af59c4a9036383c
+MD5 3df2207e724bf74126f5027441a2888d emacs-cvs-23.0.0-r6.ebuild 7923
+RMD160 a541e460d39986ef05e3c65196417ca0ae1b8782 emacs-cvs-23.0.0-r6.ebuild 7923
+SHA256 5eda8184d0c709613e90320bf0a0ca56e021f86140c2c1691af59c4a9036383c emacs-cvs-23.0.0-r6.ebuild 7923
+MISC ChangeLog 24474 RMD160 8a2f84eaa16598098f97621ae6be85a4fb0ec8c1 SHA1 941f6efbe9ab44280bc1f1efb2592abba7a3043a SHA256 808043285e449cadc56cd440f10741197743f1c9bc48bce1f23fe079cf2ab020
+MD5 41c52a2435172a3fffdfa442390a447d ChangeLog 24474
+RMD160 8a2f84eaa16598098f97621ae6be85a4fb0ec8c1 ChangeLog 24474
+SHA256 808043285e449cadc56cd440f10741197743f1c9bc48bce1f23fe079cf2ab020 ChangeLog 24474
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -88,7 +88,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGW8qUOeoy/oIi7uwRAtdgAJ0a9Elw0RuQB/BM+D6vV6mWqGktIQCgx5Up
-Nuz49cj9T6M+i4pYjjuIncg=
-=zFIh
+iD8DBQFGW9SnOeoy/oIi7uwRAjm6AJ9Et3xJ7hKMV+laMoO0byPS4n/FSwCfciqi
+xyka6C8RrgYuXxKgLuynix8=
+=NtKd
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
index 0b959f40e45b..cd1a9c484c10 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.4 2007/05/29 06:39:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.5 2007/05/29 07:21:59 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -122,6 +122,10 @@ src_compile() {
 			einfo "Configuring to build with motif toolkit support"
 			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=no"
 		fi
 	else
 		myconf="${myconf} --without-x"
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
index a403b19a655f..b062a83bbbf2 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.17 2007/05/29 06:39:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.18 2007/05/29 07:21:59 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -134,6 +134,10 @@ src_compile() {
 			einfo "Configuring to build with motif toolkit support"
 			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=no"
 		fi
 	else
 		myconf="${myconf} --without-x"
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
index b1c1ffe670f2..4d1dbe46226f 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.9 2007/05/29 06:39:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.10 2007/05/29 07:21:59 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -136,6 +136,10 @@ src_compile() {
 			einfo "Configuring to build with motif toolkit support"
 			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=no"
 		fi
 	else
 		myconf="${myconf} --without-x"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index b3d05d0acfdc..ebdc6147c202 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.14 2007/05/29 06:39:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.15 2007/05/29 07:21:59 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -138,6 +138,10 @@ src_compile() {
 			einfo "Configuring to build with motif toolkit support"
 			myconf="${myconf} --without-gtk"
 			myconf="${myconf} --with-x-toolkit=motif"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=no"
 		fi
 	else
 		myconf="${myconf} --without-x"