Fix logic for USE=-motif.

Package-Manager: portage-2.1.2.7

6 files changed, 72 insertions, 57 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index e02daf6916c6..8234f04c695e 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.122 2007/05/23 10:29:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.123 2007/05/29 06:26:35 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.
 
   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 04bd68fc4444..689ffdde00da 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 7548 RMD160 1a0d320cb6a6ee53aab80680608e67e0ea47a9b2 SHA1 f6a1c89d396774226058dd1ccf47b3b860c9fb5e SHA256 b7e109053f570ec57f7f7203db4d3fd8986cd3fcc938719f2f1c56948838afaf
-MD5 7c3bbe2b77f6e952c28fdc0a0599c8bb emacs-cvs-22.0.990.ebuild 7548
-RMD160 1a0d320cb6a6ee53aab80680608e67e0ea47a9b2 emacs-cvs-22.0.990.ebuild 7548
-SHA256 b7e109053f570ec57f7f7203db4d3fd8986cd3fcc938719f2f1c56948838afaf emacs-cvs-22.0.990.ebuild 7548
-EBUILD emacs-cvs-22.0.9999-r10.ebuild 7882 RMD160 f2d96bb29f2f4519f67562d42416a6b9441046f3 SHA1 b9bede87f05486478ae9759fc3d3df51960a7e2e SHA256 deb341d05156d381949912f70f44da69b8f58fb52925672da35ecd58348f7f5e
-MD5 ad2208f61bc9d765ce044914f6fb4f0f emacs-cvs-22.0.9999-r10.ebuild 7882
-RMD160 f2d96bb29f2f4519f67562d42416a6b9441046f3 emacs-cvs-22.0.9999-r10.ebuild 7882
-SHA256 deb341d05156d381949912f70f44da69b8f58fb52925672da35ecd58348f7f5e emacs-cvs-22.0.9999-r10.ebuild 7882
-EBUILD emacs-cvs-22.1.50.ebuild 7745 RMD160 633a76477e9043e5d5cd1730e3fb23f0ec85c201 SHA1 7fa102f91a2d6c48aba3f3ff45da1b5d0829ebb8 SHA256 2e220a24bb4cf591872f783a663044d501cb0b9b024498b773b94543a3f82c5c
-MD5 a53e5b8b34d4fb5264d1fade8e670780 emacs-cvs-22.1.50.ebuild 7745
-RMD160 633a76477e9043e5d5cd1730e3fb23f0ec85c201 emacs-cvs-22.1.50.ebuild 7745
-SHA256 2e220a24bb4cf591872f783a663044d501cb0b9b024498b773b94543a3f82c5c emacs-cvs-22.1.50.ebuild 7745
+EBUILD emacs-cvs-22.0.990.ebuild 7561 RMD160 18af67297160721f0d970c7d24bd4b4510f4881d SHA1 7b33b3e40b2328bd3fd0c7f44f5649fc3279765a SHA256 ebe6a846805d2db6364c6dcb7c875b6ceca7014c65a9e0c60c1b836e14141db9
+MD5 7b7197c18c37f52c5f09f3cfb7542371 emacs-cvs-22.0.990.ebuild 7561
+RMD160 18af67297160721f0d970c7d24bd4b4510f4881d emacs-cvs-22.0.990.ebuild 7561
+SHA256 ebe6a846805d2db6364c6dcb7c875b6ceca7014c65a9e0c60c1b836e14141db9 emacs-cvs-22.0.990.ebuild 7561
+EBUILD emacs-cvs-22.0.9999-r10.ebuild 7894 RMD160 c37bcd70da58e6cb040f282345b6e6e3ea320572 SHA1 0a46f613985466b2b5a2b90bb62d41e2d08c8a8e SHA256 780a4768a263b9b1035c0164fa05bbd73cbe02ed07aaa42c7fe8011d1754a9f4
+MD5 63622cf9590b52760d773fdd8cb48ab6 emacs-cvs-22.0.9999-r10.ebuild 7894
+RMD160 c37bcd70da58e6cb040f282345b6e6e3ea320572 emacs-cvs-22.0.9999-r10.ebuild 7894
+SHA256 780a4768a263b9b1035c0164fa05bbd73cbe02ed07aaa42c7fe8011d1754a9f4 emacs-cvs-22.0.9999-r10.ebuild 7894
+EBUILD emacs-cvs-22.1.50.ebuild 7758 RMD160 8a4d0a324160fd3cc6c3e78ac6b73807a32c6212 SHA1 7c4353f32edaec8cbfe2b58d582abeff220d9195 SHA256 d73b9237484006b1c1435aa543434ba4b2ad8488c9f6b4ba2fd3f1a9fbe00a84
+MD5 8e111323b15cb321b099c6c69fb2167f emacs-cvs-22.1.50.ebuild 7758
+RMD160 8a4d0a324160fd3cc6c3e78ac6b73807a32c6212 emacs-cvs-22.1.50.ebuild 7758
+SHA256 d73b9237484006b1c1435aa543434ba4b2ad8488c9f6b4ba2fd3f1a9fbe00a84 emacs-cvs-22.1.50.ebuild 7758
 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 7945 RMD160 df0bac94c52b437083fcbfe71069a7bfab4dc73f SHA1 c65e53980e101239c8ebc189b956e9a4d57c18f6 SHA256 3588c536cf4b2a5392d7555a9f76e79d5a5239af1239f54d63834724a2f3f9ca
-MD5 d82b619cfed64e4f2d3a758715867f71 emacs-cvs-23.0.0-r6.ebuild 7945
-RMD160 df0bac94c52b437083fcbfe71069a7bfab4dc73f emacs-cvs-23.0.0-r6.ebuild 7945
-SHA256 3588c536cf4b2a5392d7555a9f76e79d5a5239af1239f54d63834724a2f3f9ca emacs-cvs-23.0.0-r6.ebuild 7945
-MISC ChangeLog 24176 RMD160 d09e1f66645a4026820beaabcadb70d429ab606b SHA1 f58df3033878304c958a2372899717b5b120a4c9 SHA256 0ab6ab1e5f0787ce18febee0ba77115975f276c33e4b7b262c45fd9df36d7308
-MD5 eb79125f167cfd4da8100fd425c00981 ChangeLog 24176
-RMD160 d09e1f66645a4026820beaabcadb70d429ab606b ChangeLog 24176
-SHA256 0ab6ab1e5f0787ce18febee0ba77115975f276c33e4b7b262c45fd9df36d7308 ChangeLog 24176
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7957 RMD160 8d9c9ac9de643a4798ecaee4e31c5a576cfff2ab SHA1 3341ea2e1d482329cf0d6a717f45e67d7aface4c SHA256 e68e7671ded6e85b2bb8213846413d6b00465a1e0ef71b85da91ef50854fc81b
+MD5 27017b183203e34e465da951e101b8f5 emacs-cvs-23.0.0-r6.ebuild 7957
+RMD160 8d9c9ac9de643a4798ecaee4e31c5a576cfff2ab emacs-cvs-23.0.0-r6.ebuild 7957
+SHA256 e68e7671ded6e85b2bb8213846413d6b00465a1e0ef71b85da91ef50854fc81b emacs-cvs-23.0.0-r6.ebuild 7957
+MISC ChangeLog 24399 RMD160 28c8fe080a309bba0b2e61c386a06916f0fb141f SHA1 e27992e6c0f2e7f63a7a6aed5032dc3361e63355 SHA256 680a0bca77a155b2eabd940ecdddb01df1e6dcfe5e1b878e5cd80d14c06b1e84
+MD5 15b8a1369d5b7596cdb4a3cc90191df0 ChangeLog 24399
+RMD160 28c8fe080a309bba0b2e61c386a06916f0fb141f ChangeLog 24399
+SHA256 680a0bca77a155b2eabd940ecdddb01df1e6dcfe5e1b878e5cd80d14c06b1e84 ChangeLog 24399
 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)
 
-iD8DBQFGVBgDOeoy/oIi7uwRAuYUAKCPiXLbbnpLF+MAe4mt78sUP4Cq1gCgzeEr
-lW/Ttq8LR8QPRYYCf+T8sJ0=
-=0S/d
+iD8DBQFGW8erOeoy/oIi7uwRArDxAJ481BnSE4r6VshekO2DhW30EVynVgCaA2cP
+nzy98JHiGbqvlZnq+3KWulw=
+=H7b1
 -----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 a5f24af08cdd..6a7d899d06b0 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.2 2007/05/23 10:29:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.990.ebuild,v 1.3 2007/05/29 06:26:35 ulm Exp $
 
 WANT_AUTOCONF="2.61"
 WANT_AUTOMAKE="latest"
@@ -8,10 +8,13 @@ WANT_AUTOMAKE="latest"
 inherit autotools elisp-common eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+SRC_URI="ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz"
 
+LICENSE="GPL-2 FDL-1.2"
+SLOT="22"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
+IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
 RESTRICT="strip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
@@ -34,8 +37,10 @@ RDEPEND="sys-libs/ncurses
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? (
-				motif? ( x11-libs/openmotif )
-				!motif? ( lesstif? ( x11-libs/lesstif ) )
+				motif? (
+					lesstif? ( x11-libs/lesstif )
+					!lesstif? ( x11-libs/openmotif )
+				)
 			)
 		)
 	)"
@@ -45,13 +50,11 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/editor"
 
-SLOT="22"
+S="${WORKDIR}/emacs-${PV}"
+
 # FULL_VERSION keeps the full version number, which is needed in order to
 # determine some path information correctly for copy/move operations later on
 FULL_VERSION="${PV}"
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
-S="${WORKDIR}/emacs-${PV}"
 
 src_unpack() {
 	unpack ${A}
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 214ea3056ca0..a448a3acc1d8 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.15 2007/05/23 10:29:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.9999-r10.ebuild,v 1.16 2007/05/29 06:26:35 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -14,10 +14,13 @@ WANT_AUTOMAKE="latest"
 inherit autotools cvs elisp-common eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+SRC_URI=""
 
+LICENSE="GPL-2 FDL-1.2"
+SLOT="22"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
+IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
 RESTRICT="strip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
@@ -40,8 +43,10 @@ RDEPEND="sys-libs/ncurses
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? (
-				motif? ( x11-libs/openmotif )
-				!motif? ( lesstif? ( x11-libs/lesstif ) )
+				motif? (
+					lesstif? ( x11-libs/lesstif )
+					!lesstif? ( x11-libs/openmotif )
+				)
 			)
 		)
 	)"
@@ -51,9 +56,6 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/editor"
 
-SLOT="22"
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
 S="${WORKDIR}/${ECVS_LOCALNAME}"
 
 src_unpack() {
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 c4bc9cca0f86..1ff2cae21d25 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.7 2007/05/23 10:29:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.8 2007/05/29 06:26:35 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -14,10 +14,13 @@ WANT_AUTOMAKE="latest"
 inherit autotools cvs elisp-common eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+SRC_URI=""
 
+LICENSE="GPL-2 FDL-1.2"
+SLOT="22"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
+IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
 RESTRICT="strip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
@@ -40,8 +43,10 @@ RDEPEND="sys-libs/ncurses
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? (
-				motif? ( x11-libs/openmotif )
-				!motif? ( lesstif? ( x11-libs/lesstif ) )
+				motif? (
+					lesstif? ( x11-libs/lesstif )
+					!lesstif? ( x11-libs/openmotif )
+				)
 			)
 		)
 	)"
@@ -51,10 +56,8 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/editor"
 
-SLOT="22"
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
 S="${WORKDIR}/${ECVS_LOCALNAME}"
+
 EMACS_SUFFIX="emacs-${SLOT}-cvs"
 
 src_unpack() {
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 8b187373253b..6433a092d07e 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.12 2007/05/23 10:29:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.13 2007/05/29 06:26:35 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -14,10 +14,13 @@ WANT_AUTOMAKE="latest"
 inherit autotools cvs elisp-common eutils flag-o-matic
 
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-SRC_URI=""
 HOMEPAGE="http://www.gnu.org/software/emacs/"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
+SRC_URI=""
 
+LICENSE="GPL-2 FDL-1.2"
+SLOT="23"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
+IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
 RESTRICT="strip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
@@ -41,8 +44,10 @@ RDEPEND="sys-libs/ncurses
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? (
-				motif? ( x11-libs/openmotif )
-				!motif? ( lesstif? ( x11-libs/lesstif ) )
+				motif? (
+					lesstif? ( x11-libs/lesstif )
+					!lesstif? ( x11-libs/openmotif )
+				)
 			)
 		)
 	)"
@@ -52,9 +57,6 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/editor"
 
-SLOT="23"
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86 ~ppc"
 S="${WORKDIR}/${ECVS_LOCALNAME}"
 
 src_unpack() {