Depend on virtual/motif and remove lesstif USE flag.

Package-Manager: portage-2.1.3_rc4

4 files changed, 23 insertions, 35 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 9e7f2e1f3885..a6658b359773 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.140 2007/06/17 14:51:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.141 2007/06/19 08:05:06 ulm Exp $
+
+  19 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Depend on virtual/motif and remove lesstif USE flag.
 
   17 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.0-r6.ebuild:
   Skip Xaw3d headers patch for unicode-2 branch, too. Fixes #182326.
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index bd70fe2dff62..495186b3257e 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
 MD5 2f28d7e33295c25205c50466d3deac65 files/emacs-cvs-Xaw3d-headers.patch 2045
 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 files/emacs-cvs-Xaw3d-headers.patch 2045
@@ -22,18 +19,18 @@ EBUILD emacs-cvs-22.0.990.ebuild 7426 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd
 MD5 923a512c786c0f667600a277ddf7070e emacs-cvs-22.0.990.ebuild 7426
 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 emacs-cvs-22.0.990.ebuild 7426
 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e emacs-cvs-22.0.990.ebuild 7426
-EBUILD emacs-cvs-22.1.50.ebuild 7587 RMD160 5c96a0affe4791f24f1139bdee07da1e301817e1 SHA1 6309aa4af7f965dc641d4a57f68a982be3dff128 SHA256 58312c39ab8b43a07a58cc8365a9bce019cbc8e9ffb74b56c9d28fffc9b85361
-MD5 59e5126efe31d70015d152bcdba25e1d emacs-cvs-22.1.50.ebuild 7587
-RMD160 5c96a0affe4791f24f1139bdee07da1e301817e1 emacs-cvs-22.1.50.ebuild 7587
-SHA256 58312c39ab8b43a07a58cc8365a9bce019cbc8e9ffb74b56c9d28fffc9b85361 emacs-cvs-22.1.50.ebuild 7587
-EBUILD emacs-cvs-23.0.0-r6.ebuild 7754 RMD160 de2a48b7ac3ef6a307ab1c84c07ba8e60b4174e3 SHA1 4714b6fdc0a514bf6965d73be35eeeaa815def03 SHA256 7359fe8d0c04efe431251e0783d37ea7ee86a103eaf169e7c7ac7437f4691928
-MD5 ab2cc70c775fed717659baa5ff03e78a emacs-cvs-23.0.0-r6.ebuild 7754
-RMD160 de2a48b7ac3ef6a307ab1c84c07ba8e60b4174e3 emacs-cvs-23.0.0-r6.ebuild 7754
-SHA256 7359fe8d0c04efe431251e0783d37ea7ee86a103eaf169e7c7ac7437f4691928 emacs-cvs-23.0.0-r6.ebuild 7754
-MISC ChangeLog 26777 RMD160 cfc6805899fbea8b60dd7dc114435f1aa75ed999 SHA1 06d2830bac23b719a6a28f4273ae586547865e84 SHA256 ce1f0df7ebe9787c7b6c0ec81cab923e03c3c50e6c34626dfb42e5b253936173
-MD5 93d7cf68132eb52daa3aafb07f0cfb4e ChangeLog 26777
-RMD160 cfc6805899fbea8b60dd7dc114435f1aa75ed999 ChangeLog 26777
-SHA256 ce1f0df7ebe9787c7b6c0ec81cab923e03c3c50e6c34626dfb42e5b253936173 ChangeLog 26777
+EBUILD emacs-cvs-22.1.50.ebuild 7516 RMD160 cd329ccdfd75c5b4a3895f30c8ad1ebf05df8d00 SHA1 46f5ea28652e5cbbd3a78db9c75cb16dc05ad0f7 SHA256 e3707c8c165926c4e2d5baa76f33cbabe3a824df88d46e3ac99972b4fde5f0f9
+MD5 7af8f7d4a31fa0c05e390c87deffb276 emacs-cvs-22.1.50.ebuild 7516
+RMD160 cd329ccdfd75c5b4a3895f30c8ad1ebf05df8d00 emacs-cvs-22.1.50.ebuild 7516
+SHA256 e3707c8c165926c4e2d5baa76f33cbabe3a824df88d46e3ac99972b4fde5f0f9 emacs-cvs-22.1.50.ebuild 7516
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7683 RMD160 b512e3922917890fa98f891878994ad002d5a214 SHA1 825c4c0f8c65c73a3910c9730ff96d79c13e56a8 SHA256 cecc45706813941b46646f528493110249c57a97b7033b276ef5dda029d17d10
+MD5 8eec92e7945474fc86fcb63686e07650 emacs-cvs-23.0.0-r6.ebuild 7683
+RMD160 b512e3922917890fa98f891878994ad002d5a214 emacs-cvs-23.0.0-r6.ebuild 7683
+SHA256 cecc45706813941b46646f528493110249c57a97b7033b276ef5dda029d17d10 emacs-cvs-23.0.0-r6.ebuild 7683
+MISC ChangeLog 26936 RMD160 fb2a6cc32587efef885869abab503e424d03e4a8 SHA1 06c3a054956b6c938809f7f15d2616c38e8e9aa2 SHA256 81291bee8721a13a7a8e756465523ec41af1fc880c66f0f0e9eca4eaffe2b045
+MD5 55b09180ead8ea561048c80fea57305c ChangeLog 26936
+RMD160 fb2a6cc32587efef885869abab503e424d03e4a8 ChangeLog 26936
+SHA256 81291bee8721a13a7a8e756465523ec41af1fc880c66f0f0e9eca4eaffe2b045 ChangeLog 26936
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -47,10 +44,3 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r6 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r6 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r6 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGdUpeOeoy/oIi7uwRAo1+AJ9Jm7X5+q7k/eXYYttFh6Tr7uCiIQCg1LZ8
-feCnfoKKKPCSZXc4M5YIXHU=
-=fa94
------END PGP SIGNATURE-----
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 6a87ae3b9491..7a7c42b729ac 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.19 2007/06/14 18:27:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.20 2007/06/19 08:05:06 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -20,7 +20,7 @@ SRC_URI=""
 LICENSE="GPL-2 FDL-1.2"
 SLOT="22"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa gif gpm gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+IUSE="alsa gif gpm gtk gzip-el hesiod jpeg 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"
@@ -44,10 +44,7 @@ RDEPEND="sys-libs/ncurses
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? (
-				motif? (
-					lesstif? ( x11-libs/lesstif )
-					!lesstif? ( x11-libs/openmotif )
-				)
+				motif? ( virtual/motif )
 			)
 		)
 	)"
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 a27cf127892c..9a6eb796205d 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.25 2007/06/17 14:51:03 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.26 2007/06/19 08:05:06 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -20,7 +20,7 @@ SRC_URI=""
 LICENSE="GPL-2 FDL-1.2"
 SLOT="23"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa gif gpm gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
+IUSE="alsa gif gpm gtk gzip-el hesiod jpeg 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"
@@ -45,10 +45,7 @@ RDEPEND="sys-libs/ncurses
 		!gtk? (
 			Xaw3d? ( x11-libs/Xaw3d )
 			!Xaw3d? (
-				motif? (
-					lesstif? ( x11-libs/lesstif )
-					!lesstif? ( x11-libs/openmotif )
-				)
+				motif? ( virtual/motif )
 			)
 		)
 	)"