From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Tue, 7 Mar 2006 19:25:31 +0000 (+0000)
Subject: Update dependencies with kopete's modular xorg dependencies.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b898b9566b8f14dd57f18d7ed6d0c43ee40891fe;p=gentoo.git

Update dependencies with kopete's modular xorg dependencies.
Package-Manager: portage-2.1_pre5-r4
---

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index a5cb67e47af5..ac87f716c338 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.189 2006/03/05 22:31:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.190 2006/03/07 19:25:31 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdenetwork-3.5.1-r1.ebuild:
+  Update dependencies with kopete's modular xorg dependencies.
 
 *kdenetwork-3.5.1-r1 (05 Mar 2006)
 
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 5babf646d9b9..99dc0b45e1f0 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 19ff1feb23e083684562d026385bd873 ChangeLog 24854
-RMD160 9ab9364a8619a800052e736fa419b03cdf490733 ChangeLog 24854
-SHA256 1439ffccbf77882ab30f245d2aceb89fe4651fca2b1e7342b146efb6043e0e96 ChangeLog 24854
+MD5 5e82211b9d5a1502203f2991815b8054 ChangeLog 25001
+RMD160 b3a1a344251608be8606fb6868711f1d93a92781 ChangeLog 25001
+SHA256 5b1fce3711bede3b21a56f8e126688d441a47d1e72b96da778a75de78b7d8036 ChangeLog 25001
 MD5 c6db44a9df98a9927235b28065adb065 files/digest-kdenetwork-3.3.2-r2 149
 RMD160 4b80037ca2c6007f616ed23141ff56fe1a852dd6 files/digest-kdenetwork-3.3.2-r2 149
 SHA256 d7447e6c9992a6c87a49158e8038856a3ec3f21883ca98ba41f111cfbbc1779c files/digest-kdenetwork-3.3.2-r2 149
@@ -73,9 +73,9 @@ SHA256 ac90cbc3ee10deff765a89a9cbf65b3f4a1583ecbebf9b59ad761806e9216f20 kdenetwo
 MD5 45dc358f9d30bc7a8e2903d7ed24ab8b kdenetwork-3.5.0.ebuild 1802
 RMD160 0b619a684ce73a3c14154e92d1cc4a53dee16cc5 kdenetwork-3.5.0.ebuild 1802
 SHA256 d7afb7c5d87a78ba9cf35b8e0b90b7a3ba385b5635b41615afe42ff844adfe7c kdenetwork-3.5.0.ebuild 1802
-MD5 3629de22cb7c8c0a8fa0b5d0037c0638 kdenetwork-3.5.1-r1.ebuild 1856
-RMD160 6b367da832a734a92c0cbae528e0117d867b1331 kdenetwork-3.5.1-r1.ebuild 1856
-SHA256 0bf1ce52bfa9b04206dc5ba254b025f97fbfc7ab260c452c09f2ab6aa6f0ea78 kdenetwork-3.5.1-r1.ebuild 1856
+MD5 cf4c02aaa6d8542535e2e8da45494894 kdenetwork-3.5.1-r1.ebuild 2082
+RMD160 1d573fa5f9317438338e13c660d9a70a1162e9d1 kdenetwork-3.5.1-r1.ebuild 2082
+SHA256 e4702d1c6b05ba3d48285ced0d17af37d9fa8e0868df9d1f2c923f6cab4c619d kdenetwork-3.5.1-r1.ebuild 2082
 MD5 4f05147f44023371fbeeef3dc6bda061 kdenetwork-3.5.1.ebuild 1803
 RMD160 9d3b119b04811ea9ea26698b200820a239e4628c kdenetwork-3.5.1.ebuild 1803
 SHA256 951d6c56af19bb0f14dd1db0edbf91a8a7bba9014f0b3d46e9db7309e6078839 kdenetwork-3.5.1.ebuild 1803
@@ -85,7 +85,7 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEC2aJAiZjviIA2XgRAsa/AKC4bxQR+2vEGaEiq7idtGRSLyn89wCeIa6L
-j98U0L4nie5waxNwb2GwoRk=
-=cgvv
+iD8DBQFEDd47AiZjviIA2XgRAgLDAKDczlLvTYxQ1l7y9z4ss452BB3JbwCgzEQ4
+UnWv/y9gSZJUiZZurikxNek=
+=us3N
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild
index 041c014bbf13..49573729b489 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild,v 1.1 2006/03/05 22:31:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.1-r1.ebuild,v 1.2 2006/03/07 19:25:31 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -9,27 +9,39 @@ DESCRIPTION="KDE network apps: kopete, kppp, kget..."
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="rdesktop sametime slp ssl wifi xmms"
 
-DEPEND="~kde-base/kdebase-${PV}
+BOTH_DEPEND="~kde-base/kdebase-${PV}
 	dev-libs/libxslt
 	dev-libs/libxml2
 	net-dns/libidn
 	>=dev-libs/glib-2
+	app-crypt/qca
 	sametime? ( =net-libs/meanwhile-0.4* )
+	xmms? ( media-sound/xmms )
 	slp? ( net-libs/openslp )
 	wifi? ( net-wireless/wireless-tools )
-	xmms? ( media-sound/xmms )"
-# glib: for webcam support in Kopete.
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		x11-libs/libXScrnSaver
+		) virtual/x11 )
+	kernel_linux? ( virtual/opengl )"
 
-RDEPEND="${DEPEND}
+RDEPEND="${BOTH_DEPEND}
 	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
 	dev-lang/perl
-	ssl? ( app-crypt/qca-tls
-	       dev-perl/IO-Socket-SSL )"
-# perl: for KSirc.
-# qca-tls: for Kopete jabber plugin.
-# IO-Socket-SSL: for SSL support in KSirc.
+	ssl? ( dev-perl/IO-Socket-SSL
+		app-crypt/qca-tls )"
 
-DEPEND="${DEPEND}
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	|| ( (
+			x11-proto/videoproto
+			x11-proto/xextproto
+			x11-proto/xproto
+			kernel_linux? ( x11-libs/libXv )
+			x11-proto/scrnsaverproto
+		) virtual/x11 )
 	dev-util/pkgconfig"
 
 PATCHES="${FILESDIR}/kppp-3.5.0-bindnow.patch