Added checks for jingle deps, fixes bug 169438. Added conditional PDEPEND on net-im/kopete-otr for encryption. Dropped KEYWORDS alpha, hppa, ia64, ppc64 and sparc because of that. Filed bug 176926 about this.

Package-Manager: portage-2.1.2.5

4 files changed, 126 insertions, 5 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 614278fd21ef..fee3d2db8515 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.256 2007/04/29 17:16:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.257 2007/05/03 16:35:35 philantrop Exp $
+
+*kdenetwork-3.5.6-r1 (03 May 2007)
+
+  03 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +kdenetwork-3.5.6-r1.ebuild:
+  Added checks for jingle deps, fixes bug 169438. Added conditional PDEPEND on
+  net-im/kopete-otr for encryption. Dropped KEYWORDS alpha, hppa, ia64, ppc64
+  and sparc because of that. Filed bug 176926 about this.
 
   29 Apr 2007; Carsten Lohrke <carlo@gentoo.org> kdenetwork-3.5.6.ebuild:
   Remove virtual/x11 dependency.
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 5ca97d3e4cd5..6df4804d061e 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kdenetwork-3.5.5-linux-headers-2.6.18.patch 799 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 SHA1 642a54568612c62543759eab4550b4db03a42bb0 SHA256 1e282677beb1bec1c32e12c2c289e498b487b9f0bd0fa9c7b38a4944d48d6e9a
 MD5 c4a46d3f1920fbef1afaf9d47f1edc6b files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
 RMD160 1e12373bef6f0a69d9b5d453c9a63b84f7b48645 files/kdenetwork-3.5.5-linux-headers-2.6.18.patch 799
@@ -17,14 +20,18 @@ EBUILD kdenetwork-3.5.5-r2.ebuild 2484 RMD160 dd19c490eafd4fc09ba5c13bf751bb1a9d
 MD5 b757b4ff64b152c6fd30885a9c9a9d72 kdenetwork-3.5.5-r2.ebuild 2484
 RMD160 dd19c490eafd4fc09ba5c13bf751bb1a9db8352b kdenetwork-3.5.5-r2.ebuild 2484
 SHA256 e1e7791d11313ef1777cc16f54d10a2c549de59ea2c7d3d5be552753f04141d5 kdenetwork-3.5.5-r2.ebuild 2484
+EBUILD kdenetwork-3.5.6-r1.ebuild 2532 RMD160 204a4b80d0cf6c9fecdbf1c5be3793b37fe3c6c2 SHA1 f7cddcaf9c90922a6af29e41fa11bf28f07e2647 SHA256 e734520ebf7ad32a8ddf166d31299b16bfee71a9cbc96d1b2e6d6fcf6a250eb4
+MD5 e370b8c295f21fc3db67fa8fbe44c719 kdenetwork-3.5.6-r1.ebuild 2532
+RMD160 204a4b80d0cf6c9fecdbf1c5be3793b37fe3c6c2 kdenetwork-3.5.6-r1.ebuild 2532
+SHA256 e734520ebf7ad32a8ddf166d31299b16bfee71a9cbc96d1b2e6d6fcf6a250eb4 kdenetwork-3.5.6-r1.ebuild 2532
 EBUILD kdenetwork-3.5.6.ebuild 2403 RMD160 66f4707fc196c4b579e76f12c655c08554820a85 SHA1 b9facd56a7afe07a113ff904aaccdc4bbc0c5034 SHA256 4af58438c4935c35af954a8b4e1f76da745773ab1b74d12666077df6dc5ebe81
 MD5 66e02efe2f1f903568deb40df4779c73 kdenetwork-3.5.6.ebuild 2403
 RMD160 66f4707fc196c4b579e76f12c655c08554820a85 kdenetwork-3.5.6.ebuild 2403
 SHA256 4af58438c4935c35af954a8b4e1f76da745773ab1b74d12666077df6dc5ebe81 kdenetwork-3.5.6.ebuild 2403
-MISC ChangeLog 34848 RMD160 b2b51d01b93095c0e7d5c3f4d5da63764df33adb SHA1 690d09853d02f957c808570940dac8ae1174e26c SHA256 5f80fde705c12201bf0aae1ec048700890f73225c0fb95f25b186c72dc9b3306
-MD5 7742c4d19614e15b70a065e5d01f00d2 ChangeLog 34848
-RMD160 b2b51d01b93095c0e7d5c3f4d5da63764df33adb ChangeLog 34848
-SHA256 5f80fde705c12201bf0aae1ec048700890f73225c0fb95f25b186c72dc9b3306 ChangeLog 34848
+MISC ChangeLog 35191 RMD160 fcb9fa046c72421cd3474184a308eb1ac89ea87a SHA1 9955ecdbaa48a9af405161b8d707b3e90056c0c8 SHA256 45ac0a64d2b26876a9c9d25bb3bc09d29b949e6fc19a8db9a6b77bae70740601
+MD5 9cf6cf3f8daa214c062fcd69c2f002dd ChangeLog 35191
+RMD160 fcb9fa046c72421cd3474184a308eb1ac89ea87a ChangeLog 35191
+SHA256 45ac0a64d2b26876a9c9d25bb3bc09d29b949e6fc19a8db9a6b77bae70740601 ChangeLog 35191
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -38,3 +45,13 @@ SHA256 59d2b99e43fa26211edb734d620ed0b5b040082147055efd44504be0a40ddd80 files/di
 MD5 9c271bcadc2cafa882bd69b0f27b357c files/digest-kdenetwork-3.5.6 533
 RMD160 115da1fd5d1202b1ee40a5cdfb2dd8aecbf7553b files/digest-kdenetwork-3.5.6 533
 SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/digest-kdenetwork-3.5.6 533
+MD5 9c271bcadc2cafa882bd69b0f27b357c files/digest-kdenetwork-3.5.6-r1 533
+RMD160 115da1fd5d1202b1ee40a5cdfb2dd8aecbf7553b files/digest-kdenetwork-3.5.6-r1 533
+SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/digest-kdenetwork-3.5.6-r1 533
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGOg9mCkvF58q80IkRApvIAJwKA63+ioDBHxmGZqz8xCqiNz+TxACgm1Xh
+ftVUdvF2tgojW697GK6Sd10=
+=yepq
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.6-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.6-r1
new file mode 100644
index 000000000000..83ac15f107eb
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-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/kdenetwork/kdenetwork-3.5.6-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild
new file mode 100644
index 000000000000..f7c3467db5e5
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.6-r1.ebuild,v 1.1 2007/05/03 16:35:35 philantrop Exp $
+
+inherit kde-dist eutils flag-o-matic
+
+DESCRIPTION="KDE network applications: Kopete, KPPP, KGet,..."
+
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt jingle kdehiddenvisibility rdesktop sametime slp ssl wifi"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
+
+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-1.0* )
+	jingle? (
+		>=media-libs/speex-1.1.6
+		dev-libs/expat
+		~net-libs/ortp-0.7.1 )
+	slp? ( net-libs/openslp )
+	wifi? ( net-wireless/wireless-tools )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXScrnSaver
+	kernel_linux? ( virtual/opengl )"
+
+RDEPEND="${BOTH_DEPEND}
+	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
+	dev-lang/perl
+	ssl? ( dev-perl/IO-Socket-SSL
+		app-crypt/qca-tls )
+	net-dialup/ppp
+	crypt? ( app-crypt/gnupg )"
+
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	x11-proto/videoproto
+	x11-proto/xproto
+	kernel_linux? ( x11-libs/libXv )
+	x11-proto/scrnsaverproto"
+
+PDEPEND="crypt? ( net-im/kopete-otr )"
+
+PATCHES="${FILESDIR}/kopete-3.5.5-icqfix.patch
+	${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+
+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
+}
+
+src_compile() {
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	local myconf="--with-libidn
+					$(use_enable sametime sametime-plugin)
+					$(use_enable slp) $(use_with wifi) $(use_enable jingle)
+					--without-xmms --without-external-libgadu"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod u+s "${D}/${KDEDIR}/bin/reslisa"
+
+	# empty config file needed for lisa to work with default settings
+	dodir /etc
+	touch "${D}/etc/lisarc"
+
+	# lisa, reslisa initscripts
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/lisa" > "${T}/lisa"
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" "${WORKDIR}/patches/reslisa" > "${T}/reslisa"
+	doinitd "${T}/lisa" "${T}/reslisa"
+
+	newconfd "${WORKDIR}/patches/lisa.conf" lisa
+	newconfd "${WORKDIR}/patches/reslisa.conf" reslisa
+}