Added conditional PDEPEND on net-im/kopete-otr for encryption. Dropped KEYWORDS alpha...

Package-Manager: portage-2.1.2.5

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 8420c19ae8acc88be7fc447b61c73f8d26db2a9c..f0d4ba5a938c9ccd1d1f81ee4f9dd6000a05e0db 100644 (file)
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.106 2007/04/29 16:34:48 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.107 2007/05/01 21:54:52 philantrop Exp $
+
+*kopete-3.5.6-r1 (01 May 2007)
+
+  01 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +kopete-3.5.6-r1.ebuild:
+  Added conditional PDEPEND on net-im/kopete-otr for encryption.
+  Dropped KEYWORDS alpha, ia64, ppc64, sparc, x86-fbsd because of the new
+  use-conditional RDEPEND net-im/kopete-otr. Filed bug 176731 about this.
 
   29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> kopete-3.5.6.ebuild:
   Remove virtual/x11 dependency.

diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 05fc03cc2b3a10acc8200565572285df2ba18268..e4950bcf20e00d6b535d30acbddb0a792852b7ae 100644 (file)
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnomemeeting-ekiga.patch 2073 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 SHA1 13cdedb9087de6757a11f8bf03dd2a992ae37ffe SHA256 5f908d8491a286db761d4c7e0bc07da05ad0ec7cc5c94bc69533706bbd8d552c
 MD5 9e1eafd475bca7ccb4c199e2fbdca02a files/gnomemeeting-ekiga.patch 2073
 RMD160 d8e695ed5a8a6f2fd6819b965dccade6d288a938 files/gnomemeeting-ekiga.patch 2073
@@ -21,14 +24,18 @@ EBUILD kopete-3.5.5-r2.ebuild 4092 RMD160 de9e91dcb0e074f09bcb69b9d5b4f29f7a60cd
 MD5 21fe022aa8b0d5dbd9ba1089cad41f0f kopete-3.5.5-r2.ebuild 4092
 RMD160 de9e91dcb0e074f09bcb69b9d5b4f29f7a60cd2f kopete-3.5.5-r2.ebuild 4092
 SHA256 2709f3659ba42ea8ea51447cd552dde1becc44e24a758fe31bf74f4e6835c278 kopete-3.5.5-r2.ebuild 4092
+EBUILD kopete-3.5.6-r1.ebuild 4038 RMD160 bcdeb007c7e69ab38ece57df3be65504bdb9a103 SHA1 90100dc693050a8ec5934f60a58ad07de490fe29 SHA256 b9c776c9007a6294a53fab1f49c10ae4c1794f74d02e04a96b8821a6f33b7580
+MD5 51067954f3f49de6f43b60c4ecca49ab kopete-3.5.6-r1.ebuild 4038
+RMD160 bcdeb007c7e69ab38ece57df3be65504bdb9a103 kopete-3.5.6-r1.ebuild 4038
+SHA256 b9c776c9007a6294a53fab1f49c10ae4c1794f74d02e04a96b8821a6f33b7580 kopete-3.5.6-r1.ebuild 4038
 EBUILD kopete-3.5.6.ebuild 4030 RMD160 bf2e2a4e7b4ea2a5423b9de8e2326ffc5ec2d0f3 SHA1 6c5a2395ca4965c062fd59639bdc2e5117274162 SHA256 e6b0f43101d6a044a9669956294750975ffbba3edbcc646a6080c558ff856373
 MD5 e215c55fd269879e955a5482d58a9a61 kopete-3.5.6.ebuild 4030
 RMD160 bf2e2a4e7b4ea2a5423b9de8e2326ffc5ec2d0f3 kopete-3.5.6.ebuild 4030
 SHA256 e6b0f43101d6a044a9669956294750975ffbba3edbcc646a6080c558ff856373 kopete-3.5.6.ebuild 4030
-MISC ChangeLog 15188 RMD160 1d7e61432acbc9af7b8b4cbf0330dcd3d88b0106 SHA1 1ba261359682a4f808936304e17b318ab6d3c6c7 SHA256 42c08ad61ec534ef20283ec6fe52f04e0b5ccba9d281c97c8c7a9ba5404a2dd7
-MD5 e14971166c8b7eef41c51fe68d983daf ChangeLog 15188
-RMD160 1d7e61432acbc9af7b8b4cbf0330dcd3d88b0106 ChangeLog 15188
-SHA256 42c08ad61ec534ef20283ec6fe52f04e0b5ccba9d281c97c8c7a9ba5404a2dd7 ChangeLog 15188
+MISC ChangeLog 15521 RMD160 c60a7034101d56891b03327616c02261e898bf19 SHA1 00afd0f1db22af3c1ed2174114325228208c673a SHA256 965a35bb09d61b09fc629da7c87024da9e85d86e3c634a21d51d48a2d98506c7
+MD5 290af11e6aa31e0a825c0001942ab1ce ChangeLog 15521
+RMD160 c60a7034101d56891b03327616c02261e898bf19 ChangeLog 15521
+SHA256 965a35bb09d61b09fc629da7c87024da9e85d86e3c634a21d51d48a2d98506c7 ChangeLog 15521
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -39,3 +46,13 @@ SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/di
 MD5 9c271bcadc2cafa882bd69b0f27b357c files/digest-kopete-3.5.6 533
 RMD160 115da1fd5d1202b1ee40a5cdfb2dd8aecbf7553b files/digest-kopete-3.5.6 533
 SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/digest-kopete-3.5.6 533
+MD5 9c271bcadc2cafa882bd69b0f27b357c files/digest-kopete-3.5.6-r1 533
+RMD160 115da1fd5d1202b1ee40a5cdfb2dd8aecbf7553b files/digest-kopete-3.5.6-r1 533
+SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/digest-kopete-3.5.6-r1 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGN7dKCkvF58q80IkRApHWAKCs0JkBirWjeA2B0ISRES0XHHTZ6gCfa6LX
+Lb6DlHz7jkzOm7AoV7J++AI=
+=igdP
+-----END PGP SIGNATURE-----

diff --git a/kde-base/kopete/files/digest-kopete-3.5.6-r1 b/kde-base/kopete/files/digest-kopete-3.5.6-r1
new file mode 100644 (file)
index 0000000..83ac15f
--- /dev/null
+++ b/kde-base/kopete/files/digest-kopete-3.5.6-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 0f428cccc4ea16aa53c427530874c591 kdenetwork-3.5.6.tar.bz2 9245468
+RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 kdenetwork-3.5.6.tar.bz2 9245468
+SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e kdenetwork-3.5.6.tar.bz2 9245468

diff --git a/kde-base/kopete/kopete-3.5.6-r1.ebuild b/kde-base/kopete/kopete-3.5.6-r1.ebuild
new file mode 100644 (file)
index 0000000..a9c6b6e
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.6-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.6-r1.ebuild,v 1.1 2007/05/01 21:54:52 philantrop Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="3.5.0 $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="~amd64 ~ppc ~x86"
+IUSE="jingle sametime ssl xscreensaver slp kernel_linux latex crypt
+               winpopup sms irc yahoo gadu groupwise netmeeting statistics autoreplace
+               connectionstatus contactnotes translator webpresence texteffect highlight
+               alias autoreplace history nowlistening addbookmarks kdehiddenvisibility"
+
+# 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-1.0* )
+       jingle? (
+               >=media-libs/speex-1.1.6
+               dev-libs/expat
+               ~net-libs/ortp-0.7.1 )
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXrender
+       xscreensaver? ( x11-libs/libXScrnSaver )
+       kernel_linux? ( virtual/opengl )
+       sms? ( app-mobilephone/gsmlib )"
+
+RDEPEND="${BOTH_DEPEND}
+       ssl? ( app-crypt/qca-tls )
+       !kde-base/kopete
+       !kde-base/kdenetwork
+       latex? ( virtual/tetex
+               media-gfx/imagemagick )
+       crypt? ( app-crypt/gnupg )"
+#      gnomemeeting is deprecated and ekiga is not yet ~ppc64
+#      only needed for calling
+#      netmeeting? ( net-im/gnomemeeting )"
+
+PDEPEND="crypt? ( net-im/kopete-otr )"
+
+DEPEND="${BOTH_DEPEND}
+       kernel_linux? ( virtual/os-headers )
+       x11-proto/videoproto
+       kernel_linux? ( x11-libs/libXv )
+       xscreensaver? ( x11-proto/scrnsaverproto )"
+
+pkg_setup() {
+       if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+               eerror "To support Video4Linux webcams in this package is required to have"
+               eerror "=x11-libs/qt-3* compiled with OpenGL support."
+               eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+               die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+       fi
+}
+
+kopete_disable() {
+       einfo "Disabling $2 $1"
+       sed -i -e "s/$2//" "${S}/kopete/$1s/Makefile.am"
+}
+
+src_unpack() {
+       kde-meta_src_unpack
+
+       epatch "${FILESDIR}/kopete-0.12_alpha1-xscreensaver.patch"
+       # use ekiga instead of gnomemeeting by default
+       epatch "${FILESDIR}/gnomemeeting-ekiga.patch"
+
+       epatch "${FILESDIR}/${PN}-3.5.5-icqfix.patch"
+
+       epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+
+       use latex || kopete_disable plugin latex
+       use crypt || kopete_disable plugin cryptography
+       use netmeeting || kopete_disable plugin netmeeting
+       use statistics || kopete_disable plugin statistics
+       use autoreplace || kopete_disable plugin autoreplace
+       use connectionstatus || kopete_disable plugin connectionstatus
+       use contactnotes || kopete_disable plugin contactnotes
+       use translator || kopete_disable plugin translator
+       use webpresence || kopete_disable plugin webpresence
+       use texteffect || kopete_disable plugin texteffect
+       use highlight || kopete_disable plugin highlight
+       use alias || kopete_disable plugin alias
+       use addbookmarks || kopete_disable plugin addbookmarks
+       use history || kopete_disable plugin history
+       use nowlistening || kopete_disable plugin nowlistening
+
+       use winpopup || kopete_disable protocol winpopup
+       use gadu || kopete_disable protocol '\$(GADU)'
+       use irc || kopete_disable protocol irc
+       use groupwise || kopete_disable protocol groupwise
+       use yahoo || kopete_disable protocol yahoo
+
+       rm -f "${S}/configure"
+}
+
+src_compile() {
+       # External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
+       # Maybe we can enable it in the future.
+       local myconf="$(use_enable jingle)
+               $(use_enable sametime sametime-plugin)
+               --without-xmms --without-external-libgadu
+               $(use_with xscreensaver) $(use_enable sms smsgsm)
+               $(use_enable debug testbed)"
+
+       kde_src_compile
+}
+
+src_install() {
+       kde_src_install
+
+       rm -f "${D}${KDEDIR}"/bin/{stun,relay}server
+}