From 96bee4fec3f1954fda90b1b3fa5c787f7d5303da Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Wed, 4 Jun 2008 12:28:46 +0000 Subject: Warn about inconsistent toolkit USE flags. (Portage version: 2.2_pre7-r1/cvs/Linux 2.6.25-gentoo-r4 Intel(R) Pentium(R) M processor 1.73GHz) --- app-editors/emacs-cvs/ChangeLog | 6 +++++- app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild | 10 +++++++++- app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild | 10 +++++++++- app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild | 10 +++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) (limited to 'app-editors/emacs-cvs') diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index f0b627eeebff..a440df8cc674 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.206 2008/06/01 11:33:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.207 2008/06/04 12:28:46 ulm Exp $ + + 04 Jun 2008; Ulrich Mueller emacs-cvs-22.2.9999.ebuild, + emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild: + Warn about inconsistent toolkit USE flags. 01 Jun 2008; Ulrich Mueller emacs-cvs-22.2.9999.ebuild, emacs-cvs-23.0.50_pre20080201.ebuild, emacs-cvs-23.0.9999.ebuild: diff --git a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild index 59ab367fa4d4..89bdc05a9282 100644 --- a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.2.9999.ebuild,v 1.6 2008/06/01 11:33:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild,v 1.7 2008/06/04 12:28:46 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -143,6 +143,14 @@ src_compile() { myconf="${myconf} --with-x-toolkit=no" myconf="${myconf} --without-gtk" fi + + local f tk= + for f in gtk Xaw3d motif; do + use ${f} || continue + [ "${tk}" ] \ + && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" + tk="${tk}${tk:+ }${f}" + done else myconf="${myconf} --without-x" fi diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild index 4dfc9d322af6..573869ea52bc 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.50_pre20080201.ebuild,v 1.8 2008/06/01 11:33:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50_pre20080201.ebuild,v 1.9 2008/06/04 12:28:46 ulm Exp $ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" @@ -127,6 +127,14 @@ src_compile() { myconf="${myconf} --with-x-toolkit=no" myconf="${myconf} --without-gtk" fi + + local f tk= + for f in gtk Xaw3d motif; do + use ${f} || continue + [ "${tk}" ] \ + && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" + tk="${tk}${tk:+ }${f}" + done else myconf="${myconf} --without-x" fi diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild index cca490b309ca..b1777a1f39d0 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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.9999.ebuild,v 1.5 2008/06/01 11:33:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.9999.ebuild,v 1.6 2008/06/04 12:28:46 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -162,6 +162,14 @@ src_compile() { einfo "Configuring to build with no toolkit" myconf="${myconf} --with-x-toolkit=no" fi + + local f tk= + for f in gtk Xaw3d motif; do + use ${f} || continue + [ "${tk}" ] \ + && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" + tk="${tk}${tk:+ }${f}" + done else myconf="${myconf} --without-x" fi -- cgit v1.2.3-65-gdbad