Fix for bug #136167.

Package-Manager: portage-2.1

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 76b3a1dcce415e01ff5eec03e5ffac4ed1f2c832..b99872aec7402cba394935e20ffaa5827b62f36e 100644 (file)
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # 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.64 2006/06/01 19:26:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.65 2006/06/15 00:00:01 carlo Exp $
+
+*kopete-3.5.3-r1 (14 Jun 2006)
+
+  14 Jun 2006; Carsten Lohrke <carlo@gentoo.org> +kopete-3.5.3-r1.ebuild:
+  Fix for bug #136167.
 
 *kopete-3.5.3 (01 Jun 2006)
 

diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index f831789228f2648c5897e50a09d3fa1324d1ae5f..d3a4b6bebeb388c6ce07dc5d5fab267c1eccbbfb 100644 (file)
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX configure-fix-kdenetwork-gadu.patch 2626 RMD160 e348401fcbe734b2e0d5ba767a3f64b31abf31dc SHA1 44ea1fb88aee6042d7c7d1f04a159977478453a7 SHA256 b71d184ff9c44bfeb2f8e90e75145ae5c77ff5a5f23165eca3c538374d40ef3b
 MD5 100ba684bf2f7b3bd7061b488264a21d files/configure-fix-kdenetwork-gadu.patch 2626
 RMD160 e348401fcbe734b2e0d5ba767a3f64b31abf31dc files/configure-fix-kdenetwork-gadu.patch 2626
@@ -14,6 +11,7 @@ MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
 RMD160 e97ecb2f463f98a14857352647800d6402629146 files/disable-meanwhile.diff 351
 SHA256 4331c4edfe1e81ad1372dee39940e2fb12bf35b12dc298ebe5b8fb435ad35434 files/disable-meanwhile.diff 351
 DIST kdenetwork-3.4.3.tar.bz2 7364627 RMD160 b417ff363c71b30f6151e65360d615c167c90ebb SHA256 132ed4d297c3b4f00053b2fd1691478dbdf574dc3d8b5cbe40510210eed6ee32
+DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf SHA1 cacc9ad8137e5c9e44bda1faa05e26cf2450f4e6 SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b
 DIST kdenetwork-3.5.2.tar.bz2 7524328 RMD160 7c924c66fb71af001795f55be47a9e75405742ca SHA1 7c013939cce68c31f51d66143dc2092db7db2cbd SHA256 e716de377d254fb666417a54407ff3e99c407d0507c13cda8077367f1b8b43eb
 DIST kdenetwork-3.5.3.tar.bz2 7524718 RMD160 0c57f39652946c577ad0d6ec7f4fc593fe38a0bc SHA1 237820320c02839b1b24e401230b7b2d812aa433 SHA256 f0323e33226b30ca30bfee05a9b6da8a1de964c9593d134294f83a54db0f4f3c
 EBUILD kopete-3.4.3.ebuild 1062 RMD160 470bd1a22f5ef92acabf006e475136a954c14661 SHA1 ac7616112a21a7757e21b88fd8165645cf73253a SHA256 301509bb95e244801c96a430f82fbf01391e063e450c6bf25bdccac3762c069d
@@ -24,14 +22,18 @@ EBUILD kopete-3.5.2.ebuild 1489 RMD160 e92f3eb1d2a2331fe08e7f77990e97b004fc0f83
 MD5 e74ceab791405d6f2a287a75e11ee134 kopete-3.5.2.ebuild 1489
 RMD160 e92f3eb1d2a2331fe08e7f77990e97b004fc0f83 kopete-3.5.2.ebuild 1489
 SHA256 a9e46bc626735130ad32ecd51b8feeec10ff26b1cc5a5a356f895b9b32fff692 kopete-3.5.2.ebuild 1489
+EBUILD kopete-3.5.3-r1.ebuild 1572 RMD160 33ffbb108136c96be94e0e80759f3edbee87a851 SHA1 b4a7aff42a77f9e6316526efca9186cae0528b91 SHA256 b436781368eb1bf6a059573d79d0cfc5c442d7d74217376aa2f791050f2ff269
+MD5 1e748afb009f4d6740eaaa2d1efb5fe1 kopete-3.5.3-r1.ebuild 1572
+RMD160 33ffbb108136c96be94e0e80759f3edbee87a851 kopete-3.5.3-r1.ebuild 1572
+SHA256 b436781368eb1bf6a059573d79d0cfc5c442d7d74217376aa2f791050f2ff269 kopete-3.5.3-r1.ebuild 1572
 EBUILD kopete-3.5.3.ebuild 1499 RMD160 f638ee6292e1fbda6399eda9b0e56039ed7de245 SHA1 35c9ba03eef9610766fc744ffd992c26cd41daff SHA256 197ca5177d98ed302805e387881ac4af3d9c05cc9926099a25865ed5ad58244c
 MD5 55fee7684d9498c95e63a210dfdc1ae0 kopete-3.5.3.ebuild 1499
 RMD160 f638ee6292e1fbda6399eda9b0e56039ed7de245 kopete-3.5.3.ebuild 1499
 SHA256 197ca5177d98ed302805e387881ac4af3d9c05cc9926099a25865ed5ad58244c kopete-3.5.3.ebuild 1499
-MISC ChangeLog 8715 RMD160 63b30471aa04784f8b9ca1846e7e1734e23b69b1 SHA1 7cce0a215844d45e805936d8f07f4e57fbd5f3f7 SHA256 e339c7beecc78b33050b123ce703bcbf78cd0674bfa0f3ac1e1ef19719658d02
-MD5 e1d19b996fbfbeba5f353a1570cccc98 ChangeLog 8715
-RMD160 63b30471aa04784f8b9ca1846e7e1734e23b69b1 ChangeLog 8715
-SHA256 e339c7beecc78b33050b123ce703bcbf78cd0674bfa0f3ac1e1ef19719658d02 ChangeLog 8715
+MISC ChangeLog 8841 RMD160 fc2c4173fcd0e1a743467a13c80cc8d560947ea5 SHA1 dd83bd8850f6703a03b25e73c4abe960ec9819a0 SHA256 a028850c19e1fab2958d987e8d7d1ac524da98037b7d2b01626c89971cee3fed
+MD5 f7ef21e5619055cf72fe309264aa2871 ChangeLog 8841
+RMD160 fc2c4173fcd0e1a743467a13c80cc8d560947ea5 ChangeLog 8841
+SHA256 a028850c19e1fab2958d987e8d7d1ac524da98037b7d2b01626c89971cee3fed ChangeLog 8841
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -45,10 +47,6 @@ SHA256 62e96a8a0d7a0612c90f34910550fd8cc4fa7dba4d787baafbf765e03edc995b files/di
 MD5 e0041fe5e45bf082dc05d4afd464a60d files/digest-kopete-3.5.3 256
 RMD160 b64f5070b1537bdb6c431aae1354f096ae2e2a64 files/digest-kopete-3.5.3 256
 SHA256 d60a7111a4960cd7c963507edabf8eeaf0381da128f37b23c85ce666b95c8ee1 files/digest-kopete-3.5.3 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEfz9lAiZjviIA2XgRAvkeAJ4idN/50a/ak4cTH28IwsoBfMaaxgCgwSFt
-GkR6fg03gsytKgcWtlZrgFw=
-=oDe6
------END PGP SIGNATURE-----
+MD5 8981c30e8f75d11ae65f7cffd71f8532 files/digest-kopete-3.5.3-r1 533
+RMD160 c8677158a0059cec5fe6683c3e0342ce562f758f files/digest-kopete-3.5.3-r1 533
+SHA256 6b69107cd0da9f5855f2ce1f8ca41066fc27fdeb33b56d00f35902079be1bb64 files/digest-kopete-3.5.3-r1 533

diff --git a/kde-base/kopete/files/digest-kopete-3.5.3-r1 b/kde-base/kopete/files/digest-kopete-3.5.3-r1
new file mode 100644 (file)
index 0000000..0d9cb09
--- /dev/null
+++ b/kde-base/kopete/files/digest-kopete-3.5.3-r1
@@ -0,0 +1,6 @@
+MD5 07d313f91154d3c2f4620b921277fdc8 kdenetwork-3.5-patchset-01.tar.bz2 2986
+RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf kdenetwork-3.5-patchset-01.tar.bz2 2986
+SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b kdenetwork-3.5-patchset-01.tar.bz2 2986
+MD5 119af91a048c34d9a917a1898f215554 kdenetwork-3.5.3.tar.bz2 7524718
+RMD160 0c57f39652946c577ad0d6ec7f4fc593fe38a0bc kdenetwork-3.5.3.tar.bz2 7524718
+SHA256 f0323e33226b30ca30bfee05a9b6da8a1de964c9593d134294f83a54db0f4f3c kdenetwork-3.5.3.tar.bz2 7524718

diff --git a/kde-base/kopete/kopete-3.5.3-r1.ebuild b/kde-base/kopete/kopete-3.5.3-r1.ebuild
new file mode 100644 (file)
index 0000000..e1cf221
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.3-r1.ebuild
@@ -0,0 +1,57 @@
+# 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.3-r1.ebuild,v 1.1 2006/06/15 00:00:01 carlo Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+       mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="sametime ssl xmms"
+
+# 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 )
+       || ( (
+               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 )"
+
+src_compile() {
+       # External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
+       # 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"
+
+       kde-meta_src_compile
+}