Depend on x11-libs/openmotif explicitely for USE=motif.

Package-Manager: portage-2.1.5.2

6 files changed, 22 insertions, 22 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ac5ee1153a1a..2aa1a9090402 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.258 2008/05/31 13:42:48 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.259 2008/06/01 11:49:14 ulm Exp $
+
+  01 Jun 2008; Ulrich Mueller <ulm@gentoo.org> emacs-21.4-r15.ebuild,
+  emacs-21.4-r17.ebuild, emacs-22.1-r4.ebuild, emacs-22.2-r2.ebuild:
+  Depend on x11-libs/openmotif explicitely for USE=motif.
 
   31 May 2008; Christian Faulhammer <opfer@gentoo.org>
   -emacs-18.59-r4.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f21b77bf4d82..499a9cf74f81 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -21,16 +21,16 @@ DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19
 DIST emacs-22.2.tar.gz 38694318 RMD160 ec2da7cd7065cbd76773e544da1d1495f33d6ea1 SHA1 7a371332cb8400d44e8eb31f19e432bbc93523a0 SHA256 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r5.ebuild 2492 RMD160 35f9f3dcf2ef3988ef7e833f325e2699adf28a03 SHA1 07e504828a991f2347313fca766a074b8d701d7c SHA256 ec1754b91ec688700dff64e2f03e84feb6cb1c75217665aef0c0d1dfc352e7e6
-EBUILD emacs-21.4-r15.ebuild 5610 RMD160 fe29223f7e215bbb6dd583e380203d46bad2763b SHA1 97d2512d1b128a2a38d95047dd2712c3bf941d33 SHA256 bbf623f7d8793ceb4c665078e411f915bc3ccacf1501f78542acf9d9bd5fac3c
-EBUILD emacs-21.4-r17.ebuild 5623 RMD160 b496634abdaf26a4c2c465eee03867950bd1d15d SHA1 71da99aee152ab6a82ef148007d1b1a5929df312 SHA256 e44d19cef37dcdb77e6874bd7eddcb0499fc931a7a84c8f3ce33dc12d928d392
-EBUILD emacs-22.1-r4.ebuild 8112 RMD160 43b5252e54649807630f0989b6ba6c1e71892230 SHA1 f9de872a9e14b6f62fb44b816473943abbf57d5f SHA256 8a33993a7bed688a69d74a752ea14322b0ae57cebb9a624cdaf1f5e77ca7007a
-EBUILD emacs-22.2-r2.ebuild 8217 RMD160 8f63924bfe8ceaf2217b13da93705d9ba38cd3c8 SHA1 a599de38705a05895eb8e765924d225867561f36 SHA256 09559e2fc1670a24071ad42b1b2e4c1dfc65dc4ebc145a2c7a69c04424e05f63
-MISC ChangeLog 37182 RMD160 59724fe7498752c8a389adbafd3d8d3cbbbd0649 SHA1 e9d3996d64dff05e92f1db491197198ca2b7f043 SHA256 767419b4198afb0b7c48b0b9ea80b278c5f6737769e0008ec219d719e97d6a47
+EBUILD emacs-21.4-r15.ebuild 5615 RMD160 8983e96a2d2cdeb6487edcee4357e806a8ba4283 SHA1 cf7758924b959350ed3d61d924659eb449ca0380 SHA256 78f1e9afe47177a88fe67f854bec2ab28f471e3ea8d4258b1e325dadbac052c5
+EBUILD emacs-21.4-r17.ebuild 5621 RMD160 866a0e7c75edcdc5e07ff0dc70234556a22ffc70 SHA1 f8ed073ca7eb6dff85e28e612a495b75dae43e96 SHA256 9fbf4a4912f72422c73e2e4fb2c6164bc4efc62328a5ecf320f7d603d57e82ff
+EBUILD emacs-22.1-r4.ebuild 8110 RMD160 c6fbefdab6a7b3209868bdda86033b0a142d5a3d SHA1 b08156a8608928e2c781cb9ad064ac3148f59a7b SHA256 b340741e924d527f301297862875424e07a84d03b9bd890ad1614e8ac3b1b073
+EBUILD emacs-22.2-r2.ebuild 8208 RMD160 4d7bcad18c06d671b411525b718783dba9dc5999 SHA1 6575a84a74a9e7b1d243cebf29568f196be6475b SHA256 b280d482c581e415ba8a8ab0a35d2337e428dfc3532788aa9456976080b331dc
+MISC ChangeLog 37378 RMD160 66b038c2e8bef6616b2a920f901e8fc605dcaeae SHA1 fdb0b774e1ed2663ce66643427373ddda341721a SHA256 29c09010baa1c1ced73f1d0c83d3c0b11dc50b2aa57a367878706e910d7b9b8e
 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkhBVeAACgkQNQqtfCuFnePCZgCfWr0wYBSXno/7d/RGvXuLZg4E
-fygAniNV53GhdR2mRC4AO55BfE/9UMwS
-=uMJx
+iEYEARECAAYFAkhCjOgACgkQOeoy/oIi7uyPuwCeNh64SlJMfmKNA0ocTCG7mT99
+FMoAoKi0tE7QDmj1KKN7zVJEjExi7E8z
+=2wUO
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r15.ebuild b/app-editors/emacs/emacs-21.4-r15.ebuild
index 495deb208618..93233788583d 100644
--- a/app-editors/emacs/emacs-21.4-r15.ebuild
+++ b/app-editors/emacs/emacs-21.4-r15.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/emacs-21.4-r15.ebuild,v 1.3 2008/05/12 18:35:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r15.ebuild,v 1.4 2008/06/01 11:49:14 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/ncurses
 		>=media-libs/tiff-3.5.5-r3
 		>=media-libs/libpng-1.2.1
 		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( virtual/motif ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 	)
 	sendmail? ( virtual/mta )
 	>=app-admin/eselect-emacs-1.2"
diff --git a/app-editors/emacs/emacs-21.4-r17.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild
index 67df6cbac2cb..49f64336901d 100644
--- a/app-editors/emacs/emacs-21.4-r17.ebuild
+++ b/app-editors/emacs/emacs-21.4-r17.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/emacs-21.4-r17.ebuild,v 1.7 2008/05/16 19:58:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.8 2008/06/01 11:49:14 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/ncurses
 		>=media-libs/tiff-3.5.5-r3
 		>=media-libs/libpng-1.2.1
 		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( virtual/motif ) )
+		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 	)
 	sendmail? ( virtual/mta )
 	>=app-admin/eselect-emacs-1.2"
diff --git a/app-editors/emacs/emacs-22.1-r4.ebuild b/app-editors/emacs/emacs-22.1-r4.ebuild
index 5c0a86b94af3..4209a7f4ab4e 100644
--- a/app-editors/emacs/emacs-22.1-r4.ebuild
+++ b/app-editors/emacs/emacs-22.1-r4.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/emacs-22.1-r4.ebuild,v 1.2 2008/04/22 17:48:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r4.ebuild,v 1.3 2008/06/01 11:49:14 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -37,9 +37,7 @@ RDEPEND="!<app-editors/emacs-cvs-22.1
 		gtk? ( =x11-libs/gtk+-2* )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 		)
 	)"
 
diff --git a/app-editors/emacs/emacs-22.2-r2.ebuild b/app-editors/emacs/emacs-22.2-r2.ebuild
index 2121bbd8bd85..b05626640c7d 100644
--- a/app-editors/emacs/emacs-22.2-r2.ebuild
+++ b/app-editors/emacs/emacs-22.2-r2.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/emacs-22.2-r2.ebuild,v 1.7 2008/05/16 19:58:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2-r2.ebuild,v 1.8 2008/06/01 11:49:14 ulm Exp $
 
 inherit autotools elisp-common eutils flag-o-matic
 
@@ -35,9 +35,7 @@ RDEPEND="!<app-editors/emacs-cvs-22.1
 		gtk? ( =x11-libs/gtk+-2* )
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
+			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
 		)
 	)"