Remove the libkdnssd libraries when kdnssd-avahi is supposed to provide them. Add...

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 522ae3e4f356df11748cff31394962f283161003..35fc627e5cb73515298fc1430bc7ad06dd4e7698 100644 (file)
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.384 2006/11/17 18:36:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.385 2006/11/18 13:41:38 flameeyes Exp $
+
+  18 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  kdelibs-3.5.5-r6.ebuild:
+  Remove the libkdnssd libraries when kdnssd-avahi is supposed to provide
+  them. Add ~x86-fbsd keyword.
 
 *kdelibs-3.5.5-r6 (17 Nov 2006)
 

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 2492b0c06a344b48b2a61d5666a647546f8bca30..06dc6ab1a3280172d69c43fc98d1fd6cc874783d 100644 (file)
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -93,18 +93,18 @@ EBUILD kdelibs-3.5.5-r5.ebuild 5487 RMD160 397b44f923cf89c7146c1029e1294ead6d0b4
 MD5 314b63520ee363f5ba5480dec8feba6d kdelibs-3.5.5-r5.ebuild 5487
 RMD160 397b44f923cf89c7146c1029e1294ead6d0b46d5 kdelibs-3.5.5-r5.ebuild 5487
 SHA256 2259a06d83f307b880f31e352910d7b3ccbd6360ec4a1e968099bc225913af05 kdelibs-3.5.5-r5.ebuild 5487
-EBUILD kdelibs-3.5.5-r6.ebuild 5605 RMD160 55cfac3d5069e317c15e5b77849ebad412eeb7c5 SHA1 3d1acd13218b6282fc1c15186a5e36148dd5566c SHA256 3a6e704a4604b473a3e8d154e9e4c00439edc17f01b6c84ba533aed0b859fc26
-MD5 01a2facb72213b6a4f08afb0862abc8a kdelibs-3.5.5-r6.ebuild 5605
-RMD160 55cfac3d5069e317c15e5b77849ebad412eeb7c5 kdelibs-3.5.5-r6.ebuild 5605
-SHA256 3a6e704a4604b473a3e8d154e9e4c00439edc17f01b6c84ba533aed0b859fc26 kdelibs-3.5.5-r6.ebuild 5605
+EBUILD kdelibs-3.5.5-r6.ebuild 5766 RMD160 112acd71e888b9dea991b48fb22b5019218c4f29 SHA1 d97758b420d26c1fc9764dabc8d60b332f84a1b5 SHA256 6b208b233d027c9fc5732f39b4352e9cd7bafab2e1b9440e24d30dbc8a3677c9
+MD5 9674e47a50f75f956317fe32be079ebd kdelibs-3.5.5-r6.ebuild 5766
+RMD160 112acd71e888b9dea991b48fb22b5019218c4f29 kdelibs-3.5.5-r6.ebuild 5766
+SHA256 6b208b233d027c9fc5732f39b4352e9cd7bafab2e1b9440e24d30dbc8a3677c9 kdelibs-3.5.5-r6.ebuild 5766
 EBUILD kdelibs-3.5.5.ebuild 5226 RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 SHA1 47579463860ce4d0ddfc1bbd996e1a6b827583a3 SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938
 MD5 973be63836556a69d870bcb58d7ca9eb kdelibs-3.5.5.ebuild 5226
 RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 kdelibs-3.5.5.ebuild 5226
 SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938 kdelibs-3.5.5.ebuild 5226
-MISC ChangeLog 63446 RMD160 7932c51303969d81e1c7adb11ce7b47245b0ef87 SHA1 974c654cbfdc96e47e5198810eb77f62386d0896 SHA256 f008e21d0bcdb3c1ffe9ac1e5e9574ba6dacbcba705a19296afaf271d2970b10
-MD5 e1d483c36e63ee05369dfb22c3417a3d ChangeLog 63446
-RMD160 7932c51303969d81e1c7adb11ce7b47245b0ef87 ChangeLog 63446
-SHA256 f008e21d0bcdb3c1ffe9ac1e5e9574ba6dacbcba705a19296afaf271d2970b10 ChangeLog 63446
+MISC ChangeLog 63632 RMD160 2ad6ef0d7de7d319964250726937c1f3b0cecb57 SHA1 f1eddef9eb72c090db09d8c249e90addaf5caff1 SHA256 27613848a3e765f1799e5b9de8e517867e2f31d083f52d51f8591c5fa05f4c31
+MD5 d48bccdc7dd3b16c695cb98316045672 ChangeLog 63632
+RMD160 2ad6ef0d7de7d319964250726937c1f3b0cecb57 ChangeLog 63632
+SHA256 27613848a3e765f1799e5b9de8e517867e2f31d083f52d51f8591c5fa05f4c31 ChangeLog 63632
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -136,7 +136,7 @@ SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXgG3AiZjviIA2XgRApqWAJ9nx3U3DB9RYz82RO9aN9hgLqLf6wCgo1nG
-nF/rBypL1aHZulH9hvvLiZQ=
-=pvGg
+iD8DBQFFXw2iAiZjviIA2XgRAtq7AKC33h/llpTDS1hLPeKm6DJalFZmVQCcD4sE
+ZC789ACBcCgHLj2aHrrurzU=
+=vY8G
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild
index 82bda041276073fc23fed88bfc251d3af375de21..b799fed1adcca90a90d33d4f4c4f9bd1d42fafec 100644 (file)
--- a/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild,v 1.1 2006/11/17 18:36:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r6.ebuild,v 1.2 2006/11/18 13:41:38 flameeyes Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86-fbsd"
 IUSE="acl alsa arts cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
 zeroconf avahi kernel_linux fam lua linguas_he"
 
@@ -158,6 +158,11 @@ src_install() {
                dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
        fi
 
+       # Get rid of the disabled version of the kdnsd libraries
+       if use zeroconf && use avahi; then
+               rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+       fi
+
        dodir /etc/env.d
 
        # List all the multilib libdirs