Update dependencies based on the recent work on net-im/kopete. Fix modular X dependen...

Package-Manager: portage-2.1_pre5-r4

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 35d7d0f1414948fb11b734eba15f1cf15ad6d5d5..2c273bf47eaf0642bf4c843122fb241c4225ab66 100644 (file)
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.50 2006/03/05 22:02:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.51 2006/03/07 19:15:28 flameeyes Exp $
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.5.1-r1.ebuild:
+  Update dependencies based on the recent work on net-im/kopete. Fix modular X
+  dependencies.
 
 *kopete-3.5.1-r1 (05 Mar 2006)
 

diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 6819ac930a46bbaf0120030b940de4e8c894d3c8..35051835c05b5bd32ab861558ff9ce4e66484f97 100644 (file)
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b11c92093ce42055af39b76ea86489bb ChangeLog 6914
-RMD160 efc218476073d588ea42a9d91e8a390e83d4a5ac ChangeLog 6914
-SHA256 2718d4df3e5cab6f800c5e5262537cd045f297a051b62f80f3893d1e78c2120a ChangeLog 6914
+MD5 4727300136c6c22d3ab9341bb8b1f684 ChangeLog 7087
+RMD160 5dcdeaf49d10b9df06e4fafd2b289b8b656cf899 ChangeLog 7087
+SHA256 e51f75902b6ff4273f70e7089e5e921c9202f42dd320a9af7a5bf3ea14806d3c ChangeLog 7087
 MD5 100ba684bf2f7b3bd7061b488264a21d files/configure-fix-kdenetwork-gadu.patch 2626
 RMD160 e348401fcbe734b2e0d5ba767a3f64b31abf31dc files/configure-fix-kdenetwork-gadu.patch 2626
 SHA256 b71d184ff9c44bfeb2f8e90e75145ae5c77ff5a5f23165eca3c538374d40ef3b files/configure-fix-kdenetwork-gadu.patch 2626
@@ -52,9 +52,9 @@ SHA256 de51d6f25b786d62a0faa9eb30d6a2cc0d044db0b813f1df793175d8e0601131 kopete-3
 MD5 9163a9daf7e63d1196ab4ad33d7285d8 kopete-3.5.0.ebuild 999
 RMD160 9beb32cc03704f88e29cd186f53129ff9951f8ab kopete-3.5.0.ebuild 999
 SHA256 5d8bb2987e1daa85778c2c70dde2bfe1f60cffa49c0bc81f2359edf3af78bf37 kopete-3.5.0.ebuild 999
-MD5 f6c26091ffc5d9ae8671b8528ca1e6a8 kopete-3.5.1-r1.ebuild 1060
-RMD160 944913100357aeb9ba48b78331e7f2c24bbf9e57 kopete-3.5.1-r1.ebuild 1060
-SHA256 039654d3416df7b86eeb340e85de9852fe5f8ffdbae022d6700c623b7fd31d21 kopete-3.5.1-r1.ebuild 1060
+MD5 fa9e6f5a89533e912f65283628c06213 kopete-3.5.1-r1.ebuild 1544
+RMD160 84a63b6fb6eb4513357b73d0b964b04ace1fb86e kopete-3.5.1-r1.ebuild 1544
+SHA256 7d8c5e6a91b5a069736817771c423a3e194c6fce8b6e50751db5c9c59387810f kopete-3.5.1-r1.ebuild 1544
 MD5 1867e76514d764fcaa25db263d3dff65 kopete-3.5.1.ebuild 999
 RMD160 3392e00fd5c9b61167c200ce9c90ac2ca611fb26 kopete-3.5.1.ebuild 999
 SHA256 a288a6b2b6109a5e9ca196a44a0d748ee265bdf987a1f75ce0d3b9c27f2ecf77 kopete-3.5.1.ebuild 999
@@ -64,7 +64,7 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEC1+7AiZjviIA2XgRAoqaAKC/5vhL8Qi1OlWkh7h7veRaVmrDSgCfR5lJ
-Jc+hlxMpCSDd0pFJ5Xt9KR0=
-=pwkp
+iD8DBQFEDdvgAiZjviIA2XgRAuJKAJ4gEAYIPCpcGMWmI0pXe30yEv3FQwCdEANS
+XeguWHnOq+U/ge9XWMfcpT8=
+=if+l
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kopete/kopete-3.5.1-r1.ebuild b/kde-base/kopete/kopete-3.5.1-r1.ebuild
index 869d86c565ea2d67feb8ef4985c1df7121be3e07..5649bb946a431ffc24028a45e15e323c04cf5494 100644 (file)
--- a/kde-base/kopete/kopete-3.5.1-r1.ebuild
+++ b/kde-base/kopete/kopete-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/kopete/kopete-3.5.1-r1.ebuild,v 1.1 2006/03/05 22:02:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.1-r1.ebuild,v 1.2 2006/03/07 19:15:28 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -13,14 +13,35 @@ HOMEPAGE="http://kopete.kde.org/"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="sametime ssl xmms"
 
-DEPEND="dev-libs/libxslt
+# The kernel_linux? ( ) conditional dependencies are for webcams, not supported
+# on other kernels AFAIK
+BOTH_DEPEND="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 )"
-RDEPEND="$DEPEND
-       ssl? ( app-crypt/qca-tls )
-       !net-im/kopete"
+       xmms? ( media-sound/xmms )
+       || ( (
+               x11-libs/libX11
+               x11-libs/libXext
+               x11-libs/libXrender
+               x11-libs/libXScrnSaver
+               ) virtual/x11 )
+       kernel_linux? ( virtual/opengl )"
+
+RDEPEND="${BOTH_DEPEND}
+       ssl? ( app-crypt/qca-tls )"
+
+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 )"
 
 PATCHES="${FILESDIR}/${PN}-3.5.x-msn-filetransfer.patch"
 
@@ -29,7 +50,7 @@ src_compile() {
        # Maybe we can enable it in the future.
        # The nowlistening plugin has xmms support.
        local myconf="$(use_enable sametime sametime-plugin)
-                     $(use_with xmms) --without-external-libgadu"
+               $(use_with xmms) --without-external-libgadu"
 
        kde-meta_src_compile
 }