Fix modular-X deps properly. "use? || (...)" is not valid, it should be "use? ( || (...) )".

(Portage version: 2.1_pre3-r1)

5 files changed, 21 insertions, 22 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 8e83378029c5..5831f4411586 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.59 2006/01/26 02:13:34 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.60 2006/01/26 05:45:01 robbat2 Exp $
+
+  26 Jan 2006; Robin H. Johnson <robbat2@gentoo.org> xemacs-21.4.17.ebuild:
+  Fix modular-X deps properly. "use? || (...)" is not valid, it should be
+  "use? ( || (...) )".
 
 *xemacs-21.4.17 (26 Jan 2006)
 
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 842313340ebb..ea4a5f01a7e1 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fdbbea1a8ef759720782044b671082b3 ChangeLog 10420
 MD5 df382940daa67bb8888fbae22d617cb4 files/README.Gentoo 1426
 MD5 6d3780dc77d3dd7c017d8864d2f0b07d files/digest-xemacs-21.4.12 130
@@ -26,12 +23,5 @@ MD5 c49d5e1449c0ae8eade0e5ec6e3224a1 xemacs-21.4.15-r1.ebuild 5046
 MD5 1e7f35e3642c3b31d3e72ec64731e488 xemacs-21.4.15-r2.ebuild 5111
 MD5 c8b16d9ce480a33720c9b4ad7b510b63 xemacs-21.4.15-r3.ebuild 5210
 MD5 a4f298f675fc5c0ed0ceaa6bfecce583 xemacs-21.4.15.ebuild 3835
-MD5 0e55cb5badddd5fc35215c82ff6b856d xemacs-21.4.17.ebuild 5036
+MD5 f0d97ab3a63a8119f5cadfa3703d281c xemacs-21.4.17.ebuild 5044
 MD5 7dc7dbe3b86bdf29083a4a85a4f232d5 xemacs-21.4.9.ebuild 4179
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD2DBcyiNZaEAZA+ARAu77AJ0V8OgGGepGJOUUJQ2CSQwuZPIpIgCeL/LC
-rp5fb6MVn+pboaYFNDqpzZw=
-=4dok
------END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/xemacs-21.4.17.ebuild b/app-editors/xemacs/xemacs-21.4.17.ebuild
index afa52829808b..dad7fcb62092 100644
--- a/app-editors/xemacs/xemacs-21.4.17.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.17.ebuild,v 1.1 2006/01/26 02:13:34 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.17.ebuild,v 1.2 2006/01/26 05:45:01 robbat2 Exp $
 
 inherit eutils
 
@@ -28,7 +28,7 @@ DEPEND="virtual/libc
 	nas? ( media-libs/nas )
 	dnd? ( x11-libs/dnd )
 	motif? ( >=x11-libs/openmotif-2.1.30 )
-	athena? || ( ( $X_DEPEND  x11-libs/libXaw ) virtual/x11 )
+	athena? ( || ( ( $X_DEPEND  x11-libs/libXaw ) virtual/x11 ) )
 	Xaw3d? ( x11-libs/Xaw3d )
 	neXt? ( x11-libs/neXtaw )
 	xface? ( media-libs/compface )
@@ -38,7 +38,7 @@ DEPEND="virtual/libc
 	canna? ( app-i18n/canna )
 	!amd64? ( freewnn? ( app-i18n/freewnn ) )
 	>=sys-libs/ncurses-5.2
-	X? || ( ( $X_DEPEND ) virtual/x11 )"
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )"
 
 PDEPEND="app-xemacs/xemacs-base
 	mule? ( app-xemacs/mule-base )"
diff --git a/media-video/motioneye/ChangeLog b/media-video/motioneye/ChangeLog
index 43b7c077dd61..d3508fac9cd1 100644
--- a/media-video/motioneye/ChangeLog
+++ b/media-video/motioneye/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/motioneye
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.7 2006/01/25 11:00:38 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/ChangeLog,v 1.8 2006/01/26 05:49:05 robbat2 Exp $
+
+  26 Jan 2006; Robin H. Johnson <robbat2@gentoo.org>
+  motioneye-1.3-r1.ebuild:
+  Fix modular-X deps properly. "use? || (...)" is not valid, it should be
+  "use? ( || (...) )".
 
   25 Jan 2006; Patrick Kursawe <phosphan@gentoo.org> -motioneye-1.3.ebuild:
   No need to have two ~x86 versions in the tree.
diff --git a/media-video/motioneye/motioneye-1.3-r1.ebuild b/media-video/motioneye/motioneye-1.3-r1.ebuild
index 62355f0df3e2..62d356576b93 100644
--- a/media-video/motioneye/motioneye-1.3-r1.ebuild
+++ b/media-video/motioneye/motioneye-1.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.3-r1.ebuild,v 1.1 2006/01/23 11:24:06 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motioneye/motioneye-1.3-r1.ebuild,v 1.2 2006/01/26 05:49:05 robbat2 Exp $
 
 inherit eutils
 
@@ -12,17 +12,17 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="X"
 RDEPEND="X? ( || (
+					( x11-libs/libX11 )
 					virtual/x11
-					x11-libs/libX11
 				)
-		media-libs/imlib )"
+			media-libs/imlib )"
 
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
-	X? || (
-		x11-proto/xextproto
+	X? ( || (
+		( x11-proto/xextproto )
 		virtual/x11
-		)
+		) )
 	app-text/docbook-sgml-utils"
 
 src_compile() {