Fix openmotif dependency.

(Portage version: 2.1.9.14/cvs/Linux x86_64)

11 files changed, 27 insertions, 21 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index adccd05e5a53..31bd8d996925 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.386 2010/10/10 15:10:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.387 2010/10/10 17:13:21 ulm Exp $
+
+  10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r19.ebuild,
+  emacs-21.4-r20.ebuild, emacs-21.4-r21.ebuild, emacs-22.3-r3.ebuild,
+  emacs-22.3-r4.ebuild, emacs-22.3-r5.ebuild, emacs-23.1-r2.ebuild,
+  emacs-23.1-r3.ebuild, emacs-23.2.ebuild, emacs-23.2-r1.ebuild:
+  Fix openmotif dependency.
 
   10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r21.ebuild:
   Fix path for installation of Info dir.
diff --git a/app-editors/emacs/emacs-21.4-r19.ebuild b/app-editors/emacs/emacs-21.4-r19.ebuild
index 600f1f7fde4a..780b9d1d5788 100644
--- a/app-editors/emacs/emacs-21.4-r19.ebuild
+++ b/app-editors/emacs/emacs-21.4-r19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.15 2010/01/22 17:50:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.16 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -31,7 +31,7 @@ DEPEND="sys-libs/ncurses
 		>=media-libs/tiff-3.5.5-r3
 		>=media-libs/libpng-1.2.1
 		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 	)"
 
 RDEPEND="${DEPEND}
diff --git a/app-editors/emacs/emacs-21.4-r20.ebuild b/app-editors/emacs/emacs-21.4-r20.ebuild
index 634a45cf6e46..474e33f545a7 100644
--- a/app-editors/emacs/emacs-21.4-r20.ebuild
+++ b/app-editors/emacs/emacs-21.4-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r20.ebuild,v 1.9 2010/09/19 17:44:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r20.ebuild,v 1.10 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -31,7 +31,7 @@ DEPEND="sys-libs/ncurses
 		>=media-libs/tiff-3.5.5-r3
 		>=media-libs/libpng-1.2.1
 		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 	)"
 
 RDEPEND="${DEPEND}
diff --git a/app-editors/emacs/emacs-21.4-r21.ebuild b/app-editors/emacs/emacs-21.4-r21.ebuild
index 893b76fa6ee0..60deb7bef185 100644
--- a/app-editors/emacs/emacs-21.4-r21.ebuild
+++ b/app-editors/emacs/emacs-21.4-r21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.2 2010/10/10 15:10:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r21.ebuild,v 1.3 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -31,7 +31,7 @@ DEPEND="sys-libs/ncurses
 		>=media-libs/tiff-3.5.5-r3
 		>=media-libs/libpng-1.2.1
 		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+		!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 	)"
 
 RDEPEND="${DEPEND}
diff --git a/app-editors/emacs/emacs-22.3-r3.ebuild b/app-editors/emacs/emacs-22.3-r3.ebuild
index adc76c337b29..aff9ea3523b3 100644
--- a/app-editors/emacs/emacs-22.3-r3.ebuild
+++ b/app-editors/emacs/emacs-22.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.16 2010/01/25 18:43:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r3.ebuild,v 1.17 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 		)
 	)"
 
diff --git a/app-editors/emacs/emacs-22.3-r4.ebuild b/app-editors/emacs/emacs-22.3-r4.ebuild
index 98f0831d13bf..a636de8eaff9 100644
--- a/app-editors/emacs/emacs-22.3-r4.ebuild
+++ b/app-editors/emacs/emacs-22.3-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r4.ebuild,v 1.11 2010/09/19 17:44:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r4.ebuild,v 1.12 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 		)
 	)"
 
diff --git a/app-editors/emacs/emacs-22.3-r5.ebuild b/app-editors/emacs/emacs-22.3-r5.ebuild
index f0379f64a285..f8f1bab3cbbc 100644
--- a/app-editors/emacs/emacs-22.3-r5.ebuild
+++ b/app-editors/emacs/emacs-22.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r5.ebuild,v 1.1 2010/09/25 13:55:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r5.ebuild,v 1.2 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -35,7 +35,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 		)
 	)"
 
diff --git a/app-editors/emacs/emacs-23.1-r2.ebuild b/app-editors/emacs/emacs-23.1-r2.ebuild
index 4f6748cffeec..488a80924805 100644
--- a/app-editors/emacs/emacs-23.1-r2.ebuild
+++ b/app-editors/emacs/emacs-23.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.18 2010/02/21 17:20:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r2.ebuild,v 1.19 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -66,7 +66,7 @@ RDEPEND="!=app-editors/emacs-vcs-23.0*
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 		)
 	)"
 
diff --git a/app-editors/emacs/emacs-23.1-r3.ebuild b/app-editors/emacs/emacs-23.1-r3.ebuild
index 140adddbd1c7..5e37cb2abd1e 100644
--- a/app-editors/emacs/emacs-23.1-r3.ebuild
+++ b/app-editors/emacs/emacs-23.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.13 2010/09/19 17:44:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.1-r3.ebuild,v 1.14 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -64,7 +64,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 		)
 	)"
 
diff --git a/app-editors/emacs/emacs-23.2-r1.ebuild b/app-editors/emacs/emacs-23.2-r1.ebuild
index a6ae2807f7d7..6834d8f3d6e4 100644
--- a/app-editors/emacs/emacs-23.2-r1.ebuild
+++ b/app-editors/emacs/emacs-23.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r1.ebuild,v 1.1 2010/09/25 13:55:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r1.ebuild,v 1.2 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -62,7 +62,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 		)
 	)"
 
diff --git a/app-editors/emacs/emacs-23.2.ebuild b/app-editors/emacs/emacs-23.2.ebuild
index 27e0785fbdcc..b8aa6564f9ee 100644
--- a/app-editors/emacs/emacs-23.2.ebuild
+++ b/app-editors/emacs/emacs-23.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2.ebuild,v 1.5 2010/09/22 07:35:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2.ebuild,v 1.6 2010/10/10 17:13:21 ulm Exp $
 
 EAPI=2
 
@@ -62,7 +62,7 @@ RDEPEND="sys-libs/ncurses
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
+			!Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
 		)
 	)"