removed virtual/x11 from dependencies

Package-Manager: portage-2.1.2-r9

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ff2602b8df198436d0cd0f70af83af3026acf955..d3e5013be8e896ed18b8c89483027478a77d57ac 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.124 2007/03/02 19:27:05 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.125 2007/03/02 20:50:01 opfer Exp $
+
+  02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
+  emacs-18.59-r1.ebuild, emacs-21.4-r4.ebuild, emacs-21.4-r7.ebuild:
+  removed virtual/x11 from dependencies
 
   02 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   -files/emacs-18.59-gcc4.patch, -files/emacs-18.59-gentoo.patch,

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 7e56605e50f03cd8d935e414b1ae6a73290a4edd..2300d2d0aae43b16f92f8064402e805575d1a64b 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -58,22 +58,22 @@ DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d23
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r1.ebuild 2972 RMD160 8969b89b83619a3bb54f922d0a6d829849b38e90 SHA1 fe227ca33eaa596ff3d57942f24e997aeb8b22a9 SHA256 4fd0bb77cdf325fd8e4ffa48e522a9ed6b8133efc5bb2663b24f0a0992294a32
-MD5 11b716757f0d6c02544eb3462e7aec72 emacs-18.59-r1.ebuild 2972
-RMD160 8969b89b83619a3bb54f922d0a6d829849b38e90 emacs-18.59-r1.ebuild 2972
-SHA256 4fd0bb77cdf325fd8e4ffa48e522a9ed6b8133efc5bb2663b24f0a0992294a32 emacs-18.59-r1.ebuild 2972
-EBUILD emacs-21.4-r4.ebuild 4576 RMD160 9d13437e4792cb077f3c0f58ac21b5f23367ba09 SHA1 ac279cb763925caf5e5e39cfaa15670228896b39 SHA256 69a9266c3e94c3b1f90f23d6036a5fda18447a84836814308a6394e1326c4f12
-MD5 d587ed63604257a78b4ef1c44573a601 emacs-21.4-r4.ebuild 4576
-RMD160 9d13437e4792cb077f3c0f58ac21b5f23367ba09 emacs-21.4-r4.ebuild 4576
-SHA256 69a9266c3e94c3b1f90f23d6036a5fda18447a84836814308a6394e1326c4f12 emacs-21.4-r4.ebuild 4576
-EBUILD emacs-21.4-r7.ebuild 5740 RMD160 8b3e7d5c5131578a747a557698e20fa1f1bc0afd SHA1 b8772bfd58739c224fe935c455d55d704b9bae1f SHA256 92c536b96b10a34b1e3a378d796acb920b6aa4d2370180c05121201e6ba3cd42
-MD5 44ab97cff17e355d80cfab6659205aa2 emacs-21.4-r7.ebuild 5740
-RMD160 8b3e7d5c5131578a747a557698e20fa1f1bc0afd emacs-21.4-r7.ebuild 5740
-SHA256 92c536b96b10a34b1e3a378d796acb920b6aa4d2370180c05121201e6ba3cd42 emacs-21.4-r7.ebuild 5740
-MISC ChangeLog 18966 RMD160 343c4852102f9d48a0576d0b3c53652f576285e0 SHA1 88c888f2b513b369b02f65bbc7d05f4b066feb45 SHA256 871531167cd9c470994d7fada90db113d431aceeff5afa750429db28d7756722
-MD5 83bfcab5d51c6f868834828596e39bce ChangeLog 18966
-RMD160 343c4852102f9d48a0576d0b3c53652f576285e0 ChangeLog 18966
-SHA256 871531167cd9c470994d7fada90db113d431aceeff5afa750429db28d7756722 ChangeLog 18966
+EBUILD emacs-18.59-r1.ebuild 2953 RMD160 9609f43728c00b566bde4e29bf63704ebbd5423d SHA1 6cb1ac7fdd25fcedb38ee1093a6e5b9fdf8db8e8 SHA256 ad0a276741aeca1a70ff95100b1475e5163fc830db1a6c512c0c07bd33c15a0a
+MD5 7c4e4f1870a935210efd16c2fb42d6f8 emacs-18.59-r1.ebuild 2953
+RMD160 9609f43728c00b566bde4e29bf63704ebbd5423d emacs-18.59-r1.ebuild 2953
+SHA256 ad0a276741aeca1a70ff95100b1475e5163fc830db1a6c512c0c07bd33c15a0a emacs-18.59-r1.ebuild 2953
+EBUILD emacs-21.4-r4.ebuild 4515 RMD160 f621bad59a4042184d0aea77ce18f74a2fac0ade SHA1 8b87b45d0a6955c95b29f8a15a65d4390f7b7cdf SHA256 8b957d00e145fbf12ed9efdd5c26d1805bff00f9b4ad85ee4e3f3953110d052d
+MD5 e79d57ad0b713539ad2675b1a44b65a6 emacs-21.4-r4.ebuild 4515
+RMD160 f621bad59a4042184d0aea77ce18f74a2fac0ade emacs-21.4-r4.ebuild 4515
+SHA256 8b957d00e145fbf12ed9efdd5c26d1805bff00f9b4ad85ee4e3f3953110d052d emacs-21.4-r4.ebuild 4515
+EBUILD emacs-21.4-r7.ebuild 5681 RMD160 634b214c10273915a65f5dff78740a6ba03a2ca3 SHA1 08b8d38d8007652408a90b0126f95e8bd9949500 SHA256 55ee405a47c8d26e4219a6b7ddb5c0bbf642f28a2f7a894f43c6cf8beea5a5de
+MD5 b34c870910c67af5ad7e92efeb32160c emacs-21.4-r7.ebuild 5681
+RMD160 634b214c10273915a65f5dff78740a6ba03a2ca3 emacs-21.4-r7.ebuild 5681
+SHA256 55ee405a47c8d26e4219a6b7ddb5c0bbf642f28a2f7a894f43c6cf8beea5a5de emacs-21.4-r7.ebuild 5681
+MISC ChangeLog 19131 RMD160 69e09b36fb94aabd19250a82ddaf8afeacef1dd1 SHA1 dd50f54b5d3c62fbb5c1d12e1c38e8e89cd5fc8d SHA256 3f0775402034b6d010e8d2f19add1d11a3ff2f62b28c30fd309e912d9033f26c
+MD5 48602f50c371a1b648366630ba581bf9 ChangeLog 19131
+RMD160 69e09b36fb94aabd19250a82ddaf8afeacef1dd1 ChangeLog 19131
+SHA256 3f0775402034b6d010e8d2f19add1d11a3ff2f62b28c30fd309e912d9033f26c ChangeLog 19131
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -90,7 +90,7 @@ SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF6HpYNQqtfCuFneMRAiDeAJ92oO6Z9uyfHTsQUkN4GtZTTZd1PQCfR03J
-mt+MsbEzbQ2evrp6pnGbiPo=
-=Hl3V
+iD8DBQFF6I3LNQqtfCuFneMRAs4sAJwOa2x6FDPP3zLD7o5w/IqreqQNlACfbLT3
+Sdr2I5P05oQ8nstHBVxK8Bc=
+=eA9W
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-18.59-r1.ebuild b/app-editors/emacs/emacs-18.59-r1.ebuild
index f09e527b1d3b3f9ca2f5008321db42a16cccfdd4..12515dc1d7d078c28069229447fdb4f3a7bb0ff9 100644 (file)
--- a/app-editors/emacs/emacs-18.59-r1.ebuild
+++ b/app-editors/emacs/emacs-18.59-r1.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/emacs-18.59-r1.ebuild,v 1.2 2007/03/02 19:27:05 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r1.ebuild,v 1.3 2007/03/02 20:50:01 opfer Exp $
 
 inherit eutils toolchain-funcs flag-o-matic alternatives
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86"
 IUSE="X"
 
 DEPEND="sys-libs/ncurses
-       X? ( || ( x11-libs/libX11 virtual/x11 ) )"
+       X? ( x11-libs/libX11 )"
 PROVIDE="virtual/emacs virtual/editor"
 
 MY_BASEDIR="/usr/share/emacs/${PV}"

diff --git a/app-editors/emacs/emacs-21.4-r4.ebuild b/app-editors/emacs/emacs-21.4-r4.ebuild
index 8f96cfcea6cd8d306111a9753a66b74ddb472fee..e389549ed9609ea942a8528e84bce9e51cee1ca5 100644 (file)
--- a/app-editors/emacs/emacs-21.4-r4.ebuild
+++ b/app-editors/emacs/emacs-21.4-r4.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/emacs-21.4-r4.ebuild,v 1.12 2007/03/02 18:38:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r4.ebuild,v 1.13 2007/03/02 20:50:01 opfer Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -15,26 +15,23 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="X Xaw3d leim lesstif motif nls nosendmail"
 
 RDEPEND="sys-libs/ncurses
-       X? ( || ( ( x11-libs/libXext
-                               x11-libs/libICE
-                               x11-libs/libSM
-                               x11-libs/libXmu
-                               x11-libs/libXpm
-                               || ( media-fonts/font-adobe-100dpi
-                                       media-fonts/font-adobe-75dpi )
-                       )
-                       virtual/x11
-               )
-               >=media-libs/giflib-4.1.0.1b
-               >=media-libs/jpeg-6b-r2
-               >=media-libs/tiff-3.5.5-r3
-               >=media-libs/libpng-1.2.1
-               !arm? (
-               Xaw3d? ( x11-libs/Xaw3d )
-               !Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
-               motif? (
-                       lesstif? ( x11-libs/lesstif )
-                       !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+       X? ( x11-libs/libXext
+                       x11-libs/libICE
+                       x11-libs/libSM
+                       x11-libs/libXmu
+                       x11-libs/libXpm
+                       || ( media-fonts/font-adobe-100dpi
+                               media-fonts/font-adobe-75dpi )
+                       >=media-libs/giflib-4.1.0.1b
+                       >=media-libs/jpeg-6b-r2
+                       >=media-libs/tiff-3.5.5-r3
+                       >=media-libs/libpng-1.2.1
+                       !arm? (
+                               Xaw3d? ( x11-libs/Xaw3d )
+                               !Xaw3d? ( x11-libs/libXaw )
+                               motif? (
+                                       lesstif? ( x11-libs/lesstif )
+                               !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
                )
        )
        nls? ( sys-devel/gettext )
@@ -42,7 +39,7 @@ RDEPEND="sys-libs/ncurses
 
 DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.58
-       X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
+       X? ( x11-misc/xbitmaps )"
 
 PROVIDE="virtual/emacs virtual/editor"
 

diff --git a/app-editors/emacs/emacs-21.4-r7.ebuild b/app-editors/emacs/emacs-21.4-r7.ebuild
index 67a55abf103bfddcdc552ee55b99a86afc1ae83a..b753c77f36d10c0ab6f29f70cb63d5225037c8bd 100644 (file)
--- a/app-editors/emacs/emacs-21.4-r7.ebuild
+++ b/app-editors/emacs/emacs-21.4-r7.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/emacs-21.4-r7.ebuild,v 1.2 2007/03/02 18:38:54 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r7.ebuild,v 1.3 2007/03/02 20:50:01 opfer Exp $
 
 inherit flag-o-matic eutils alternatives toolchain-funcs
 
@@ -15,34 +15,31 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-
 IUSE="X Xaw3d leim lesstif motif nls nosendmail"
 
 RDEPEND="sys-libs/ncurses
-       X? ( || ( ( x11-libs/libXext
-                               x11-libs/libICE
-                               x11-libs/libSM
-                               x11-libs/libXmu
-                               x11-libs/libXpm
-                               || ( media-fonts/font-adobe-100dpi
+       X? ( x11-libs/libXext
+                       x11-libs/libICE
+                       x11-libs/libSM
+                       x11-libs/libXmu
+                       x11-libs/libXpm
+                       || ( media-fonts/font-adobe-100dpi
                                        media-fonts/font-adobe-75dpi )
+                       >=media-libs/giflib-4.1.0.1b
+                       >=media-libs/jpeg-6b-r2
+                       >=media-libs/tiff-3.5.5-r3
+                       >=media-libs/libpng-1.2.1
+                       !arm? (
+                               Xaw3d? ( x11-libs/Xaw3d )
+                               !Xaw3d? ( x11-libs/libXaw )
+                               motif? (
+                                       lesstif? ( x11-libs/lesstif )
+                               !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
                        )
-                       virtual/x11
-               )
-               >=media-libs/giflib-4.1.0.1b
-               >=media-libs/jpeg-6b-r2
-               >=media-libs/tiff-3.5.5-r3
-               >=media-libs/libpng-1.2.1
-               !arm? (
-               Xaw3d? ( x11-libs/Xaw3d )
-               !Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
-               motif? (
-                       lesstif? ( x11-libs/lesstif )
-                       !lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-               )
        )
        nls? ( sys-devel/gettext )
        !nosendmail? ( virtual/mta )"
 
 DEPEND="${RDEPEND}
        >=sys-devel/autoconf-2.58
-       X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
+       X? ( x11-misc/xbitmaps )"
 
 PROVIDE="virtual/emacs virtual/editor"