USE="athena Xaw3d" is a valid combination, so don't warn.

Add a warning for USE="-gtk gtk3".

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

4 files changed, 46 insertions, 40 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 9bab457f074f..120e0644e6f2 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.79 2012/01/22 10:27:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.80 2012/01/28 11:44:38 ulm Exp $
+
+  28 Jan 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-23.4.9999.ebuild,
+  emacs-vcs-24.0.9999-r3.ebuild:
+  USE="athena Xaw3d" is a valid combination, so don't warn.
+  Add a warning for USE="-gtk gtk3".
 
 *emacs-vcs-23.4.9999 (22 Jan 2012)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 74c8081a48fd..ab6bf2f158e7 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -3,25 +3,25 @@ Hash: SHA1
 
 DIST emacs-23.3-patches-4.tar.bz2 19275 RMD160 9a5d61bcf60422efd44efc5f206d9baf8e742bd6 SHA1 695d786f1d43ddbc0c269c780a43cfed9aeb35f0 SHA256 0d4393e221b78bd97c39a10f6e4206d2dbbcee7062e9626d37a3a45c72b34636
 DIST emacs-24.0.92.tar.gz 50996706 RMD160 4530f9208765ef168bfb55831371cecc089e2433 SHA1 6d876d3f187be67c210242e8106e8f38c314f77d SHA256 861369d3006e59837bd2daac9931b17148d60cc16d074fb532b51ef9c5d1975f
-EBUILD emacs-vcs-23.4.9999.ebuild 11115 RMD160 db151568d0481ed2eb32db8b5cf203288bf61c6a SHA1 ae94a7b2fe6f441bfce98de1870aff60f34fd430 SHA256 cd19cb0c7fd0b51fc40150795fc006b087eaee834b02a2c844834445154a8984
+EBUILD emacs-vcs-23.4.9999.ebuild 11183 RMD160 944d9981ea522e0cc75f8d8cace4b58efa6f3d64 SHA1 03177b048d4f72abcdc0d426d2c4406db13b4d4d SHA256 61a2c95095bd3e2fdfe5830991139732cb864ab5d0a434a0677615a84adf2193
 EBUILD emacs-vcs-24.0.92-r1.ebuild 11483 RMD160 3af9f27f668b3b921499cfe00a718dc1277be4f7 SHA1 1c7e08cc9c39c4db9f5dd155343f940f720e38d1 SHA256 3884e1a38da0c27fb6274a2989626a70100592dfa72ae2c36c0338ff6e20eeec
-EBUILD emacs-vcs-24.0.9999-r3.ebuild 11313 RMD160 198b58d7cdf8634cb83d3a5a454367e8c2818d18 SHA1 51e178fa5f36f79f2a8c2af7ae6e9bb11aa28132 SHA256 8846706e0bb593cb3caff3d1fca4a138e204d3c5ac19f94828aea7fd711df083
-MISC ChangeLog 63379 RMD160 5d7330bcf9096aaa4b4c3d1961cf5eba1465657c SHA1 cc058b3d86ff95fd33ad40441306b8b729a2e2fa SHA256 5175021b9e7c4f40e741af0f6992bdbfbbf9c6ff93c11688dde63e00addca2af
+EBUILD emacs-vcs-24.0.9999-r3.ebuild 11477 RMD160 c779beb80bbe3850d2710b62ff3ae62979a14a19 SHA1 f2a419906b694ce591fade3f55f2feefae301e1d SHA256 b9d253c6831ac49cdb8f26ca1df7f118d264f5b23bc04e8f346321a516dac78d
+MISC ChangeLog 63585 RMD160 c126531b2ddf5055af5e6cf5323f922dd25c70dd SHA1 c5f49d5b1829b83435c98ed2a59e8b08f9890a5c SHA256 78b4b987224ab13ccf6f1a38d70236930ef1bf130d3d65a51ed34f7e00e4e56f
 MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPG+TGAAoJEDxpGckxwJCBY7sQALBDeFG5iCIjvpmtcCkXf+gx
-ZRXdTffxy9e3uu/00TfKEcweIf3Hp6jYq+zyMUe7yoeud3MlHssXAgJ70a5R4MDd
-LHPWAv27iMg5zUqqHkDa8nx7Ac5mJyud1u3h438lUBjaPUchMMsObvSXVR2M9q9B
-myBmfUrE39lPw3G9fl02duS3Q/r/Jhchuw2CnNEMJvbYqrWFt5nE9lEzfcf5crGL
-IMCWYXIFuTitAxh+MSUDI6zGGAwY1MukAmuQ4uk6Y/y/MPMee4nME8vWB6Rm1tOo
-SeAex+PMcvftcv65ENOFyhYOxk9I2HMQdcJu7/6KFZWnB6OckSC9mBCX7Jo5ZxMZ
-j1ohoePst+VnZwb/ADQTt9F0E1tmBN+Luds2VWx2GDEuVQWTcUagekkznucDF2Yz
-781H+3ulnW8T9zvjWMmcDvelaHI2shmcoDqxYfHbvOeBN4XX+tB5g9GTaPXHNIh6
-RP+03M6dxS/C5GU3YfE/Gw1xBVdi204iRav+Q0XhIZ8DIFV8E4rQJJPGv7wwclvI
-Ff4xl2CT9aBGgJ4I52PoVL1X1F4o/TsYVGLLOlodrMMj5hv2hMYBhlY40N3cv/ib
-ieuWSYL6nTjXd+OCoXXn4cS6rrTKc4lV6CCtiTpvmOMJIvNojgRoa6PzNINlHuZr
-goxaHQAuLpAUKfxDDHrt
-=uY7y
+iQIcBAEBAgAGBQJPI9/WAAoJEDxpGckxwJCB6rYP/38Gn2qDJxPPhuKsQgFOcv7j
+innTAVztS0aOOQ+CXdRCZKIJpu4McZTNzsQYwbuhu80dTuFRvvcTdI4l53vJFQOB
+D8pqUm2milSDrcD/wQRXHZ6CzyWdNGZP7JSzLmsfG9LfTsgXsVVHd2asKI6WOMTM
+WJAiz44FOC8gEj35Lp/0BK2zuEGa2pDCo3PqOslKSVlO5j1s4McMc2VMVU/kviuf
+BLunbUOSj+FdpHmPh11xShGWqV6pJhBa628CuX9GV2gS0cjQ1U1uiNm9E2rHMX7V
+qnqe/HV1iOXVRtPNkmLJEzwege0wX5Go/AxHPiD3OaohahFz8AiyjBAX5FskpaWE
+uZYtefmD6j4EBRqywBODbU0kcp59P9utvQTOEyqGPwZL0SC6Df8cmL3goCzbusWd
+hxIp8m+ZIOt41V52fHJgU51lStaBvUUZ03nhPit9IYEXzfwlwgn5rOQRWKTZ38AO
+qfaDBzZZFzV4/1j/iwOTvZSUfiw8n5ffPTJsyHqsrIlSbWx5ShYLDNX+gBYHxHKB
+t3g9llEQpFuEza8QF/uoS6YCOo2k9QyQh3esztRWEHTg6G4yCX6vjJn/TA2SBXUI
+OOC8nto82odqaUtIYtrVI9GWIaF/OBqb6Znl5Syy8k/FNMr0gSXvQDqfMPl3WieI
+FN3XaX0HuRIvCqWoTOyL
+=HN41
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild
index 7d2920005628..4535efd3c000 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.9999.ebuild,v 1.1 2012/01/22 10:27:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.4.9999.ebuild,v 1.2 2012/01/28 11:44:38 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -142,7 +142,7 @@ src_configure() {
 	fi
 
 	if use X; then
-		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-x --without-ns"
 		myconf="${myconf} $(use_with gconf)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
 		myconf="${myconf} $(use_with gif) $(use_with jpeg)"
@@ -166,9 +166,16 @@ src_configure() {
 		if use gtk; then
 			einfo "Configuring to build with GIMP Toolkit (GTK+)"
 			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d || use athena; then
+			local f
+			for f in athena Xaw3d motif; do
+				use ${f} && ewarn "USE flag \"${f}\" ignored" \
+					"(superseded by \"gtk\")"
+			done
+		elif use athena || use Xaw3d; then
 			einfo "Configuring to build with Athena/Lucid toolkit"
 			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+			use motif && ewarn "USE flag \"motif\" ignored" \
+				"(superseded by \"athena\" or \"Xaw3d\")"
 		elif use motif; then
 			einfo "Configuring to build with Motif toolkit"
 			myconf="${myconf} --with-x-toolkit=motif"
@@ -176,16 +183,8 @@ src_configure() {
 			einfo "Configuring to build with no toolkit"
 			myconf="${myconf} --with-x-toolkit=no"
 		fi
-
-		local f tk=
-		for f in gtk Xaw3d athena motif; do
-			use ${f} || continue
-			[[ ${tk} ]] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
 	else
-		myconf="${myconf} --without-x"
+		myconf="${myconf} --without-x --without-ns"
 	fi
 
 	if [[ ${PV##*.} = 9999 ]]; then
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild
index dd48110ec7be..cfc20eaaa246 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r3.ebuild,v 1.1 2012/01/13 23:07:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r3.ebuild,v 1.2 2012/01/28 11:44:38 ulm Exp $
 
 EAPI=4
 
@@ -144,7 +144,7 @@ src_configure() {
 	fi
 
 	if use X; then
-		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-x --without-ns"
 		myconf="${myconf} $(use_with gconf)"
 		myconf="${myconf} $(use_with gsettings)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
@@ -168,9 +168,16 @@ src_configure() {
 		if use gtk; then
 			einfo "Configuring to build with GIMP Toolkit (GTK+)"
 			myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)"
-		elif use Xaw3d || use athena; then
+			local f
+			for f in athena Xaw3d motif; do
+				use ${f} && ewarn "USE flag \"${f}\" ignored" \
+					"(superseded by \"gtk\")"
+			done
+		elif use athena || use Xaw3d; then
 			einfo "Configuring to build with Athena/Lucid toolkit"
 			myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+			use motif && ewarn "USE flag \"motif\" ignored" \
+				"(superseded by \"athena\" or \"Xaw3d\")"
 		elif use motif; then
 			einfo "Configuring to build with Motif toolkit"
 			myconf="${myconf} --with-x-toolkit=motif"
@@ -179,15 +186,10 @@ src_configure() {
 			myconf="${myconf} --with-x-toolkit=no"
 		fi
 
-		local f tk=
-		for f in gtk Xaw3d athena motif; do
-			use ${f} || continue
-			[[ ${tk} ]] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
+		! use gtk && use gtk3 \
+			&& ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set."
 	else
-		myconf="${myconf} --without-x"
+		myconf="${myconf} --without-x --without-ns"
 	fi
 
 	if [[ ${PV##*.} = 9999 ]]; then