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

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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 30 insertions, 24 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/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