Added patches kindly provided by KingTaco to solve licence incompatibility issues as per bug 198762.

Package-Manager: portage-2.1.3.19

4 files changed, 48 insertions, 31 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 38ae65e0b567..855376c51c69 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.492 2007/11/03 16:11:18 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.493 2007/11/11 17:52:52 philantrop Exp $
+
+  11 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  kdelibs-3.5.7-r3.ebuild, kdelibs-3.5.8-r1.ebuild:
+  Added patches kindly provided by KingTaco to solve licence incompatibility
+  issues as per bug 198762.
 
 *kdelibs-3.5.8-r1 (03 Nov 2007)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9d98d380373c..fe8885272539 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CVE-2007-1564-kdelibs-3.5.6.diff 2835 RMD160 894a9c5f51da21022b9448da957893a57384c065 SHA1 a296f0dff11007f835bdbca23b259ad8483aa4c9 SHA256 2def5a86817220df9c701d9ad22059c9ef884273a44fee3e12d7b269d8b8e52c
 MD5 62872147c2d369feb3d9077e9b32b03d files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
 RMD160 894a9c5f51da21022b9448da957893a57384c065 files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
@@ -95,26 +98,26 @@ EBUILD kdelibs-3.5.7-r2.ebuild 5984 RMD160 fa5e281e5293d486de7ab15050cdbd111f4a4
 MD5 abc22b8dbcf8600918be1b9d33fb2082 kdelibs-3.5.7-r2.ebuild 5984
 RMD160 fa5e281e5293d486de7ab15050cdbd111f4a45f4 kdelibs-3.5.7-r2.ebuild 5984
 SHA256 941db1e66422eaf481f27af94e76dd861cd0b5fb145e04d7871343f431c48512 kdelibs-3.5.7-r2.ebuild 5984
-EBUILD kdelibs-3.5.7-r3.ebuild 6070 RMD160 aaaaf735d9318d08043d5c8858876f85818f1e39 SHA1 bae24c99e607452f99a28cd849d9c9a27a92edb0 SHA256 68ddbabf0433576983bbe289fed36b90d0cc1bd01870fd45349850bd09e1e05c
-MD5 7f719193a1ba06ab1dc9a33bf5c4dde5 kdelibs-3.5.7-r3.ebuild 6070
-RMD160 aaaaf735d9318d08043d5c8858876f85818f1e39 kdelibs-3.5.7-r3.ebuild 6070
-SHA256 68ddbabf0433576983bbe289fed36b90d0cc1bd01870fd45349850bd09e1e05c kdelibs-3.5.7-r3.ebuild 6070
+EBUILD kdelibs-3.5.7-r3.ebuild 6163 RMD160 d3b4983153674538ef5b5febd0b651b69afc3a3f SHA1 8e048861515dfc6f582c070fafd0b74655c95c5e SHA256 255a8b058c1bd701c6345b83dbe436897f77240a8f2fb99aeb2a29961748c038
+MD5 9b4f30e6de90837b80d9bbe97b33a603 kdelibs-3.5.7-r3.ebuild 6163
+RMD160 d3b4983153674538ef5b5febd0b651b69afc3a3f kdelibs-3.5.7-r3.ebuild 6163
+SHA256 255a8b058c1bd701c6345b83dbe436897f77240a8f2fb99aeb2a29961748c038 kdelibs-3.5.7-r3.ebuild 6163
 EBUILD kdelibs-3.5.7.ebuild 6010 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 SHA1 fe2cd018d634674f793aa38ebdc13d8dec6708a7 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9
 MD5 36327ad34df10d38d9db0845cae8b5a3 kdelibs-3.5.7.ebuild 6010
 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 kdelibs-3.5.7.ebuild 6010
 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9 kdelibs-3.5.7.ebuild 6010
-EBUILD kdelibs-3.5.8-r1.ebuild 5974 RMD160 f424dcb99c98a8d7a5487e66594cc319b7c49768 SHA1 c6fbdf5a60013f8fd1884f96d9efe2b9b540285f SHA256 3f10fc8f08107c247261e9f1ef8b3b6abe6ae62f905b2399f6e8e6a6a20a47f8
-MD5 6f3de9ed1cdf1fa322c11fe9429d692c kdelibs-3.5.8-r1.ebuild 5974
-RMD160 f424dcb99c98a8d7a5487e66594cc319b7c49768 kdelibs-3.5.8-r1.ebuild 5974
-SHA256 3f10fc8f08107c247261e9f1ef8b3b6abe6ae62f905b2399f6e8e6a6a20a47f8 kdelibs-3.5.8-r1.ebuild 5974
+EBUILD kdelibs-3.5.8-r1.ebuild 6064 RMD160 6f772b2a8bcb2c578bb5200f2d0f27fc65b94a78 SHA1 f7b4bd67a93217af9c17ffada4b8efce04bf2e0d SHA256 bb7dd3ecd48e5a6bf6d5da3b7dd0e47acd8663386345847e09ef6de4b497886f
+MD5 53457a5e64352589e626bf7d3c191ed6 kdelibs-3.5.8-r1.ebuild 6064
+RMD160 6f772b2a8bcb2c578bb5200f2d0f27fc65b94a78 kdelibs-3.5.8-r1.ebuild 6064
+SHA256 bb7dd3ecd48e5a6bf6d5da3b7dd0e47acd8663386345847e09ef6de4b497886f kdelibs-3.5.8-r1.ebuild 6064
 EBUILD kdelibs-3.5.8.ebuild 5971 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc SHA1 ce4c0049ab32e4bfc17ea9939c067f3c060aa3f2 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7
 MD5 832f29cc7666ce4dd82b229e40a9a4bb kdelibs-3.5.8.ebuild 5971
 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc kdelibs-3.5.8.ebuild 5971
 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7 kdelibs-3.5.8.ebuild 5971
-MISC ChangeLog 79636 RMD160 cc0e16b9e5c7fec168d9f90c74b6786156a88cb2 SHA1 1bb52cb3b7b5918da0b4e97786efb1df6f15d121 SHA256 2443d76383fd47651b7163f64002caeb47c5d7d0954c8867836dc906ca80d957
-MD5 19e1036921adc2157f61bd63efa4d933 ChangeLog 79636
-RMD160 cc0e16b9e5c7fec168d9f90c74b6786156a88cb2 ChangeLog 79636
-SHA256 2443d76383fd47651b7163f64002caeb47c5d7d0954c8867836dc906ca80d957 ChangeLog 79636
+MISC ChangeLog 79849 RMD160 3e278fcd24bd445e79a2d2f289a9b3fb87105abb SHA1 639aed189ec9290e6cdcd174ae206d4ba5fc4019 SHA256 af629e55176a9045ede5b0c76233ed83e43e456d0a78de6b5cb3617ce000a1b6
+MD5 f84a6e23e60dfdb924b6a51d56af8c69 ChangeLog 79849
+RMD160 3e278fcd24bd445e79a2d2f289a9b3fb87105abb ChangeLog 79849
+SHA256 af629e55176a9045ede5b0c76233ed83e43e456d0a78de6b5cb3617ce000a1b6 ChangeLog 79849
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -152,3 +155,10 @@ SHA256 dcb4b10aed20b014dcf94dda5f9c9f038725a3c2c76e025863abf7e327e297c0 files/di
 MD5 045d21239aae2d8475ecc135f0556897 files/digest-kdelibs-3.5.8-r1 807
 RMD160 a62a27af50bec9cd7997c5323ce601b983e9a7c2 files/digest-kdelibs-3.5.8-r1 807
 SHA256 72a97de753479bd8eef7faa3e43fe4c0881b386a78f16b009cb986c3524ccabf files/digest-kdelibs-3.5.8-r1 807
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHN0F+CkvF58q80IkRAnh4AJ0cC0o0JREVn2y9ND8GnbY11CsPzQCghaXj
+/UPdyKDX8OtBabh96ZUDRg8=
+=q4t8
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild b/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild
index dd59a1cbb183..b7acc05c8860 100644
--- a/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild,v 1.7 2007/09/26 10:31:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.7-r3.ebuild,v 1.8 2007/11/11 17:52:52 philantrop Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -14,8 +14,8 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
+IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+	avahi kernel_linux fam lua kdehiddenvisibility"
 
 # Added aspell-en as dependency to work around bug 131512.
 # Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
@@ -37,7 +37,7 @@ RDEPEND="$(qt_min_version 3.3.3)
 	kerberos? ( virtual/krb5 )
 	jpeg2k? ( media-libs/jasper )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
+	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
 	fam? ( virtual/fam )
 	virtual/ghostscript
 	utempter? ( sys-libs/libutempter )
@@ -55,7 +55,8 @@ RDEPEND="${RDEPEND}
 	x11-apps/rgb
 	x11-apps/iceauth"
 
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
+		bindist? ( kde-misc/kdnssd-avahi )"
 
 # Testing code is rather broken and merely for developer purposes, so disable it.
 RESTRICT="test"
@@ -128,10 +129,10 @@ src_compile() {
 			$(use_enable kernel_linux sendfile) --enable-mitshm
 			$(use_with spell aspell)"
 
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
+	if use avahi || use bindist ; then
 		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-dnssd"
 	fi
 
 	if has_version x11-apps/rgb; then
@@ -170,7 +171,7 @@ src_install() {
 	fi
 
 	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
+	if use avahi || use bindist ; then
 		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
 	fi
 
diff --git a/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild
index c00e8120d40a..ab862122278a 100644
--- a/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild,v 1.1 2007/11/03 16:11:19 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild,v 1.2 2007/11/11 17:52:52 philantrop Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -14,8 +14,8 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
-avahi kernel_linux fam lua kdehiddenvisibility"
+IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+	avahi kernel_linux fam lua kdehiddenvisibility"
 
 # Added aspell-en as dependency to work around bug 131512.
 # Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
@@ -37,7 +37,7 @@ RDEPEND="$(qt_min_version 3.3.3)
 	kerberos? ( virtual/krb5 )
 	jpeg2k? ( media-libs/jasper )
 	openexr? ( >=media-libs/openexr-1.2.2-r2 )
-	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi )
+	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
 	fam? ( virtual/fam )
 	virtual/ghostscript
 	utempter? ( sys-libs/libutempter )
@@ -55,7 +55,8 @@ RDEPEND="${RDEPEND}
 	x11-apps/rgb
 	x11-apps/iceauth"
 
-PDEPEND="avahi? ( kde-misc/kdnssd-avahi )"
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
+		bindist? ( kde-misc/kdnssd-avahi )"
 
 # Testing code is rather broken and merely for developer purposes, so disable it.
 RESTRICT="test"
@@ -125,10 +126,10 @@ src_compile() {
 			$(use_enable kernel_linux sendfile) --enable-mitshm
 			$(use_with spell aspell)"
 
-	if ! use avahi; then
-		myconf="${myconf} --enable-dnssd"
-	else
+	if use avahi || use bindist ; then
 		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-dnssd"
 	fi
 
 	if has_version x11-apps/rgb; then
@@ -167,7 +168,7 @@ src_install() {
 	fi
 
 	# Get rid of the disabled version of the kdnsd libraries
-	if use avahi; then
+	if use avahi || use bindist ; then
 		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
 	fi