Fix X dependencies.

Package-Manager: portage-2.1.3_rc8

4 files changed, 35 insertions, 33 deletions

diff --git a/app-editors/qemacs/ChangeLog b/app-editors/qemacs/ChangeLog
index 8581d27977b1..29654fe38848 100644
--- a/app-editors/qemacs/ChangeLog
+++ b/app-editors/qemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/qemacs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.28 2007/07/22 08:58:00 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/ChangeLog,v 1.29 2007/07/22 18:47:18 ulm Exp $
+
+  22 Jul 2007; Ulrich Mueller <ulm@gentoo.org> qemacs-0.3.1-r3.ebuild,
+  qemacs-0.3.2_pre20070226.ebuild:
+  Fix X dependencies.
 
   22 Jul 2007; David Shakaryan <omp@gentoo.org> qemacs-0.3.1-r3.ebuild:
   Remove virtual/x11 from dependencies.
diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest
index 157c16ef1c71..2b724246ab19 100644
--- a/app-editors/qemacs/Manifest
+++ b/app-editors/qemacs/Manifest
@@ -63,18 +63,18 @@ RMD160 0082bc3ca8514c9ba9ce8fb591628eb940a145a6 files/qemacs-0.3.2_pre20070226-t
 SHA256 84383cf13c294c29333547b7e7d4cd18cb30303687c3d8cc6024d47a24c9e6aa files/qemacs-0.3.2_pre20070226-tty_utf8.patch 1298
 DIST qemacs-0.3.1.tar.gz 809124 RMD160 05eaddf872cbf6c187a63c80ed1eb02a23a1a13d SHA1 70671e905f65c8402af6a9938a12db29c8954710 SHA256 a3db57e09729d8c83be5ff9ab028ece173d8f5f10aaf61ca41f88aecb64996c7
 DIST qemacs-0.3.2_pre20070226.tar.bz2 806174 RMD160 024982b3c62093c6377be2836ee0d5d7c12cd55b SHA1 e909fd36b1eda59f21a7d0cd63b4f0a535b0c0a1 SHA256 0611c5fee1f7c6538fa1c5b4108f1968f5f05eeb9165b84c72d4c6d7dd8556af
-EBUILD qemacs-0.3.1-r3.ebuild 3574 RMD160 9fb8317a24a4cd924c8dc66d958c180274a07eb2 SHA1 1949649c10f8960c32f8d1019c8c1da148562e27 SHA256 9c121d910063cce98198d85263bac15ede11a523ac245ca8d61d2a3e61bb0040
-MD5 6cccbb9ab39ecfacfca08e5a9033e76c qemacs-0.3.1-r3.ebuild 3574
-RMD160 9fb8317a24a4cd924c8dc66d958c180274a07eb2 qemacs-0.3.1-r3.ebuild 3574
-SHA256 9c121d910063cce98198d85263bac15ede11a523ac245ca8d61d2a3e61bb0040 qemacs-0.3.1-r3.ebuild 3574
-EBUILD qemacs-0.3.2_pre20070226.ebuild 3212 RMD160 f6d3beda94041a60bc121e1f97a9a295e65f89d5 SHA1 ee1949671cb1bec6f1184f9893de7be957d35363 SHA256 bfedd521c1c42761dd68883a2cbbabb0c53a5dadf8ac91d2c912be9b8005a093
-MD5 6d2243e616097b1ca78f901c3d2313e0 qemacs-0.3.2_pre20070226.ebuild 3212
-RMD160 f6d3beda94041a60bc121e1f97a9a295e65f89d5 qemacs-0.3.2_pre20070226.ebuild 3212
-SHA256 bfedd521c1c42761dd68883a2cbbabb0c53a5dadf8ac91d2c912be9b8005a093 qemacs-0.3.2_pre20070226.ebuild 3212
-MISC ChangeLog 4799 RMD160 ac3563a278030cbb63849c2023834fa1f57ec369 SHA1 34d3958dc86f0fc9715e2c4ea06586543a00ce98 SHA256 efba7b73fe90183852f8ed7fef2bf64bd9346093562608b002b74ff3b00536f8
-MD5 b8a34a343644f8c1af61227963d94ae1 ChangeLog 4799
-RMD160 ac3563a278030cbb63849c2023834fa1f57ec369 ChangeLog 4799
-SHA256 efba7b73fe90183852f8ed7fef2bf64bd9346093562608b002b74ff3b00536f8 ChangeLog 4799
+EBUILD qemacs-0.3.1-r3.ebuild 3472 RMD160 7f2216cb44e0e7dea2e9216c68a9e11da651ef78 SHA1 8214420366556b66e1167065ba356bdb3de623d1 SHA256 81ff26fcc2c5ea5e00250bb318f9b11d4c1ad77c75fbd10b9587179161162b8a
+MD5 d5954214fd8c2a53aa16ba55ddb36c78 qemacs-0.3.1-r3.ebuild 3472
+RMD160 7f2216cb44e0e7dea2e9216c68a9e11da651ef78 qemacs-0.3.1-r3.ebuild 3472
+SHA256 81ff26fcc2c5ea5e00250bb318f9b11d4c1ad77c75fbd10b9587179161162b8a qemacs-0.3.1-r3.ebuild 3472
+EBUILD qemacs-0.3.2_pre20070226.ebuild 3121 RMD160 ce4c887eba214b7a1eccdd83fabc58c8abfa1f17 SHA1 8490844f71284db14d60c3581dfdba556af82c42 SHA256 73b013c382fa84f290ea3b5df8b5d9e907cd715d28f398c18149674e467471bf
+MD5 4871b31bb12c336a55c927854160e7d3 qemacs-0.3.2_pre20070226.ebuild 3121
+RMD160 ce4c887eba214b7a1eccdd83fabc58c8abfa1f17 qemacs-0.3.2_pre20070226.ebuild 3121
+SHA256 73b013c382fa84f290ea3b5df8b5d9e907cd715d28f398c18149674e467471bf qemacs-0.3.2_pre20070226.ebuild 3121
+MISC ChangeLog 4928 RMD160 8ab5beff390c3537c6ccf9d088296f02196a480a SHA1 ba1306ec791c2e3d094910ca7e3ab297fda3da60 SHA256 6b1b0ec62bb9f4e54bdfac7ea86da5511f2ed0d35ba377fc491c1bc699b2aa80
+MD5 1bf64b20824ac300ac93ef84d2749103 ChangeLog 4928
+RMD160 8ab5beff390c3537c6ccf9d088296f02196a480a ChangeLog 4928
+SHA256 6b1b0ec62bb9f4e54bdfac7ea86da5511f2ed0d35ba377fc491c1bc699b2aa80 ChangeLog 4928
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -86,9 +86,9 @@ MD5 3f30fa4c00a2234c228d0e8c48f3a586 files/digest-qemacs-0.3.2_pre20070226 277
 RMD160 eb92b8a221a441c82d896649bdf3e80ad575364f files/digest-qemacs-0.3.2_pre20070226 277
 SHA256 7c91ed001b105cabc8416de6093e0c03758b7e0b9fc3c601a22ddd7927162475 files/digest-qemacs-0.3.2_pre20070226 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGoxwWvSApE0uP4UsRAlUtAJ9d6s3PSUyn87Xf+rF/vqpb4dN+9wCghSI5
-8aRptx/gRdXIUrA8yy/nDlY=
-=Vg6/
+iD8DBQFGo6YtOeoy/oIi7uwRAmD2AJ9T4tRM2zAIe2YS3DxXV7zYQRfjjwCfYXUM
+zYL2TdMVFwDRQ28d6PF66KI=
+=1XRz
 -----END PGP SIGNATURE-----
diff --git a/app-editors/qemacs/qemacs-0.3.1-r3.ebuild b/app-editors/qemacs/qemacs-0.3.1-r3.ebuild
index 1b5cec06438a..a85e4ba0dccc 100644
--- a/app-editors/qemacs/qemacs-0.3.1-r3.ebuild
+++ b/app-editors/qemacs/qemacs-0.3.1-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1-r3.ebuild,v 1.8 2007/07/22 08:58:00 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.1-r3.ebuild,v 1.9 2007/07/22 18:47:18 ulm Exp $
 
 inherit eutils versionator flag-o-matic
 
-DESCRIPTION="QEmacs (for Quick Emacs) is a very small but powerful UNIX editor."
+DESCRIPTION="QEmacs (for Quick Emacs) is a very small but powerful UNIX editor"
 HOMEPAGE="http://fabrice.bellard.free.fr/qemacs/"
 SRC_URI="http://fabrice.bellard.free.fr/qemacs/${P}.tar.gz"
 
@@ -13,13 +13,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="X png unicode xv"
 
-# For those so inclined, the libXv dep can probably
-# be made conditional on the xv USE flag somehow.
-RDEPEND="X? ( x11-libs/libXv )
+DEPEND="X? ( x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv ) )
 	png? ( =media-libs/libpng-1.2* )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXft
-		x11-proto/xextproto )"
+
+RDEPEND="${DEPEND}"
 PROVIDE="virtual/editor"
 
 src_unpack() {
diff --git a/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild b/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild
index 74801594fba2..5e0f0f740e13 100644
--- a/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild
+++ b/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild,v 1.3 2007/06/24 21:05:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/qemacs/qemacs-0.3.2_pre20070226.ebuild,v 1.4 2007/07/22 18:47:18 ulm Exp $
 
 inherit eutils versionator flag-o-matic
 
-DESCRIPTION="Quick Emacs is a very small but powerful UNIX editor."
+DESCRIPTION="QEmacs (for Quick Emacs) is a very small but powerful UNIX editor"
 HOMEPAGE="http://fabrice.bellard.free.fr/qemacs/"
 SRC_URI="http://fabrice.bellard.free.fr/qemacs/${P}.tar.bz2"
 
@@ -14,13 +14,12 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X png unicode xv"
 RESTRICT="strip"
 
-# For those so inclined, the libXv dep can probably
-# be made conditional on the xv USE flag somehow.
-RDEPEND="X? ( x11-libs/libXv )
+DEPEND="X? ( x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv ) )
 	png? ( =media-libs/libpng-1.2* )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXft
-				x11-proto/xextproto )"
+
+RDEPEND="${DEPEND}"
 PROVIDE="virtual/editor"
 
 src_unpack() {