Drop virtual/x11 dependency.

Package-Manager: portage-2.1.3_rc8

6 files changed, 42 insertions, 56 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index de269700498e..e03cd941677a 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.33 2007/06/29 22:01:39 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.34 2007/07/22 10:07:43 calchan Exp $
+
+  22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> texmaker-1.11-r1.ebuild,
+  texmaker-1.30.ebuild, texmaker-1.40.ebuild, texmaker-1.50-r1.ebuild:
+  Drop virtual/x11 dependency.
 
   29 Jun 2007; Lars Weiler <pylon@gentoo.org> texmaker-1.50-r1.ebuild:
   Stable on ppc; bug #183633.
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 35834c41bcd9..8f5acb764c3e 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,30 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST texmaker-1.11.tar.bz2 697937 RMD160 163a640971c5c5f094ddf9cea121a8d9eb429547 SHA1 f178c3fdbe1ce2329308b7d305f78255593936b1 SHA256 d30b7d678925dd84e5755958f0399fda7db2aec61d96db8ca397177f1f3512bb
 DIST texmaker-1.3.tar.bz2 696467 RMD160 c1b83ceacc7badf32ac416fa4ffc9a9d054f8a52 SHA1 95284573463ca5953aea96737bb512e3a7878ac1 SHA256 5ff2b874c0a6d2b7f473761de2c8263d716cbb08f43930a0ba97c9dc11eb6caa
 DIST texmaker-1.4.tar.bz2 763550 RMD160 fe000aaccf9e43e81a1120f8c7d54cb8f1d58338 SHA1 c227bc18c0360cd28bf5fc026d317dedad865aa1 SHA256 8be212f14de5b59967b1313103532344da8a1f9f5f99768ddb2dc3ce77f6f736
 DIST texmaker-1.5.tar.bz2 760385 RMD160 2a4f023f2a0ce0c169364f4120224f1927eb056b SHA1 e1f3a4fae8d6e23de4c00059a96c76b38aa67e1f SHA256 8c31f599065d78abcc324d6c8dfb29eff0ce7a9cf1509138be8760ec97f8cc0e
-EBUILD texmaker-1.11-r1.ebuild 1570 RMD160 b275ed6259c97650017afae6062b98cfe572f1ad SHA1 9ccfdc347604fc665710d008ae17a11e8ecaa717 SHA256 f5ece32cd38152369242b79374fa0ec0de7fc6e3421fa7e3a6df180860204fb6
-MD5 1e3a1c8102d1f5a095de8ff12f1cacad texmaker-1.11-r1.ebuild 1570
-RMD160 b275ed6259c97650017afae6062b98cfe572f1ad texmaker-1.11-r1.ebuild 1570
-SHA256 f5ece32cd38152369242b79374fa0ec0de7fc6e3421fa7e3a6df180860204fb6 texmaker-1.11-r1.ebuild 1570
-EBUILD texmaker-1.30.ebuild 1728 RMD160 e520199bb922a5c87d9248833fe2e818066455e7 SHA1 e387670a75dec9d6654471ebc26a9605fe12ff2d SHA256 ca2a29191b1f3aad40c91fe130973b282eed59e94c9f2b99ee53e39c0b511b59
-MD5 3ca7a4ae5f9b90c8b70c04ace2301bb8 texmaker-1.30.ebuild 1728
-RMD160 e520199bb922a5c87d9248833fe2e818066455e7 texmaker-1.30.ebuild 1728
-SHA256 ca2a29191b1f3aad40c91fe130973b282eed59e94c9f2b99ee53e39c0b511b59 texmaker-1.30.ebuild 1728
-EBUILD texmaker-1.40.ebuild 1825 RMD160 43977415503f39ad55250e255c62dd0e07400ffa SHA1 4b86011d5f028fda0979f417292f1e3994d8f679 SHA256 09594ea2c18de2280fce7e3fde157691f54a822735ed2c9a287f181afd0e80e0
-MD5 d1dcfeae8357b3c54f2a862cceab8164 texmaker-1.40.ebuild 1825
-RMD160 43977415503f39ad55250e255c62dd0e07400ffa texmaker-1.40.ebuild 1825
-SHA256 09594ea2c18de2280fce7e3fde157691f54a822735ed2c9a287f181afd0e80e0 texmaker-1.40.ebuild 1825
-EBUILD texmaker-1.50-r1.ebuild 2028 RMD160 adb625f19434b436ea702a44dad4b18a403100df SHA1 0fc37d4759c2c88458c37c7b7ee4a318551210fb SHA256 77aae6b1c8b5149ed2c61a773a493d9bd8d95e564b06a7cccd7f6a2a2b890a1f
-MD5 00ecb7e208e6bfedc939dfca8b3026d0 texmaker-1.50-r1.ebuild 2028
-RMD160 adb625f19434b436ea702a44dad4b18a403100df texmaker-1.50-r1.ebuild 2028
-SHA256 77aae6b1c8b5149ed2c61a773a493d9bd8d95e564b06a7cccd7f6a2a2b890a1f texmaker-1.50-r1.ebuild 2028
-MISC ChangeLog 4603 RMD160 4e341a3fc36a639d4b1001b7a4b52ddb708f8c5d SHA1 512f25f63b8763730d179261af61ce32df7679da SHA256 ac4efe6a71890c148da283db193420b72f2e24716e65dda508b81ecca2bb0857
-MD5 85c1096d8ad6ff3bb9ebe9cd186f3ccf ChangeLog 4603
-RMD160 4e341a3fc36a639d4b1001b7a4b52ddb708f8c5d ChangeLog 4603
-SHA256 ac4efe6a71890c148da283db193420b72f2e24716e65dda508b81ecca2bb0857 ChangeLog 4603
+EBUILD texmaker-1.11-r1.ebuild 1539 RMD160 1096db4eecc84a62163a8576b941c9f068a05878 SHA1 59019420b7ad3574cd06a5dfc9d6caf25fef4950 SHA256 91cb2adf4dc6c79820ea0dd930ba29e40f9bbc8a358fa9a25133bafe60c20dd3
+MD5 b44efec74c0df53eed741a8b3be1400e texmaker-1.11-r1.ebuild 1539
+RMD160 1096db4eecc84a62163a8576b941c9f068a05878 texmaker-1.11-r1.ebuild 1539
+SHA256 91cb2adf4dc6c79820ea0dd930ba29e40f9bbc8a358fa9a25133bafe60c20dd3 texmaker-1.11-r1.ebuild 1539
+EBUILD texmaker-1.30.ebuild 1695 RMD160 3f9c3e5c15097d699bcab10d3fa0df25aea115fd SHA1 1dda0cd492a389b5e8f198033e022f244fc54ed8 SHA256 dd434fd6f272c85cd15b1f460889c95a7f83bccc9c211a284cefbd548e0271b6
+MD5 d8d8ef34558dd12170d0f715afdf7088 texmaker-1.30.ebuild 1695
+RMD160 3f9c3e5c15097d699bcab10d3fa0df25aea115fd texmaker-1.30.ebuild 1695
+SHA256 dd434fd6f272c85cd15b1f460889c95a7f83bccc9c211a284cefbd548e0271b6 texmaker-1.30.ebuild 1695
+EBUILD texmaker-1.40.ebuild 1791 RMD160 d6308faac4e4950aaab37f85f062eff5f354070e SHA1 0854103c82eadc1a65d93f8c98b0e45b3142f1c5 SHA256 9817c279c3ddcc7879e5b9279413316046a57a350746cdaa3fb5257bc56c79a4
+MD5 66a0abafd67550561a586704984eab82 texmaker-1.40.ebuild 1791
+RMD160 d6308faac4e4950aaab37f85f062eff5f354070e texmaker-1.40.ebuild 1791
+SHA256 9817c279c3ddcc7879e5b9279413316046a57a350746cdaa3fb5257bc56c79a4 texmaker-1.40.ebuild 1791
+EBUILD texmaker-1.50-r1.ebuild 1995 RMD160 3527f47ac278be67af869af267475d55d072c191 SHA1 8e32e8e6c511ed26f9eca99effe9cb90275c4a85 SHA256 2b92abe03755db1c301b8d2833b02755f0238457fb70329b437a145bb2bcc4e3
+MD5 9540f900b07fe4ab31394f9b97706e32 texmaker-1.50-r1.ebuild 1995
+RMD160 3527f47ac278be67af869af267475d55d072c191 texmaker-1.50-r1.ebuild 1995
+SHA256 2b92abe03755db1c301b8d2833b02755f0238457fb70329b437a145bb2bcc4e3 texmaker-1.50-r1.ebuild 1995
+MISC ChangeLog 4784 RMD160 421b7f3a01e2a7b2c25498637faff22af50a5824 SHA1 2c8241b1074983839a4baa502fb9bd5c4f141a6a SHA256 d5b99b6c75a8bb2b72d80f6d79a429bf30b0f51cab33ac113223133effba02cb
+MD5 6b08be6a38258b883bbc77ee140b6803 ChangeLog 4784
+RMD160 421b7f3a01e2a7b2c25498637faff22af50a5824 ChangeLog 4784
+SHA256 d5b99b6c75a8bb2b72d80f6d79a429bf30b0f51cab33ac113223133effba02cb ChangeLog 4784
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 MD5 504d11dd034a4ba8f06e8e7c633d13ba metadata.xml 156
 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 metadata.xml 156
@@ -41,10 +38,3 @@ SHA256 c649aabf89be10c561da77246042971930d1cbbe90a66666e29b9e78a911dad9 files/di
 MD5 6e7164283ac59481659ba1b6e0ade0a6 files/digest-texmaker-1.50-r1 241
 RMD160 d27cfb3c5a3448df62b9b4b9a8da11971a57d86e files/digest-texmaker-1.50-r1 241
 SHA256 4d289e1c6c8fcd8e39b28df370844b676bb6c9fc906918f91af2684837798891 files/digest-texmaker-1.50-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGhYFJ6IPkARlRZfQRAiKpAJ4mmZhFK43B9xfe/kpNMJqG+6Nk3gCeIzD3
-nfSRxT2JyZTNeTt1cKwynV4=
-=Jne8
------END PGP SIGNATURE-----
diff --git a/app-office/texmaker/texmaker-1.11-r1.ebuild b/app-office/texmaker/texmaker-1.11-r1.ebuild
index b72ad9127320..67b6997d86a5 100644
--- a/app-office/texmaker/texmaker-1.11-r1.ebuild
+++ b/app-office/texmaker/texmaker-1.11-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-office/texmaker/texmaker-1.11-r1.ebuild,v 1.9 2007/01/25 06:03:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.11-r1.ebuild,v 1.10 2007/07/22 10:07:43 calchan Exp $
 
 inherit kde-functions eutils
 
@@ -17,10 +17,8 @@ KEYWORDS="amd64 ppc sparc x86"
 
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/libX11
-			   x11-libs/libXext )
-			virtual/x11
-		)"
+DEPEND="x11-libs/libX11
+	x11-libs/libXext"
 
 RDEPEND="${DEPEND}
 	virtual/tetex
diff --git a/app-office/texmaker/texmaker-1.30.ebuild b/app-office/texmaker/texmaker-1.30.ebuild
index 62049c5b3e2e..4012d9e760b9 100644
--- a/app-office/texmaker/texmaker-1.30.ebuild
+++ b/app-office/texmaker/texmaker-1.30.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-office/texmaker/texmaker-1.30.ebuild,v 1.6 2007/01/25 06:03:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.30.ebuild,v 1.7 2007/07/22 10:07:43 calchan Exp $
 
 inherit eutils versionator qt4
 
@@ -29,11 +29,9 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/libX11
-			   x11-libs/libXext )
-			virtual/x11
-		)
-		$(qt4_min_version 4.1)"
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	$(qt4_min_version 4.1)"
 
 RDEPEND="${DEPEND}
 	virtual/tetex
diff --git a/app-office/texmaker/texmaker-1.40.ebuild b/app-office/texmaker/texmaker-1.40.ebuild
index f74076c5e5b0..b5a7165f1296 100644
--- a/app-office/texmaker/texmaker-1.40.ebuild
+++ b/app-office/texmaker/texmaker-1.40.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-office/texmaker/texmaker-1.40.ebuild,v 1.3 2007/01/25 06:03:17 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.40.ebuild,v 1.4 2007/07/22 10:07:43 calchan Exp $
 
 inherit eutils versionator qt4
 
@@ -29,12 +29,10 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/libX11
-			   x11-libs/libXext )
-			virtual/x11
-		)
-		app-text/aspell
-		$(qt4_min_version 4.1.4)"
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	app-text/aspell
+	$(qt4_min_version 4.1.4)"
 
 RDEPEND="${DEPEND}
 	virtual/tetex
diff --git a/app-office/texmaker/texmaker-1.50-r1.ebuild b/app-office/texmaker/texmaker-1.50-r1.ebuild
index 3e18ec786ea4..a86b3d506c45 100644
--- a/app-office/texmaker/texmaker-1.50-r1.ebuild
+++ b/app-office/texmaker/texmaker-1.50-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-office/texmaker/texmaker-1.50-r1.ebuild,v 1.6 2007/06/29 22:01:39 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.50-r1.ebuild,v 1.7 2007/07/22 10:07:43 calchan Exp $
 
 inherit eutils versionator qt4
 
@@ -29,12 +29,10 @@ KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
 
 IUSE=""
 
-DEPEND="|| ( ( x11-libs/libX11
-			   x11-libs/libXext )
-			virtual/x11
-		)
-		app-text/aspell
-		>=x11-libs/qt-4.2.2"
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	app-text/aspell
+	>=x11-libs/qt-4.2.2"
 
 RDEPEND="${DEPEND}
 	virtual/tetex