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

(Portage version: 2.1.3.19)

3 files changed, 26 insertions, 19 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/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