Added a bindist USE flag, to disable net-misc/mDNSResponder, as per policy. Handle CMake arguments for the zeroconf USE flag correctly.

Package-Manager: portage-2.1.4

3 files changed, 27 insertions, 13 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 7139287f36b0..30cbb087681d 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.280 2008/01/23 01:14:35 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.281 2008/01/28 09:49:39 ingmar Exp $
+
+  28 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  kdenetwork-4.0.0-r1.ebuild:
+  Added a bindist USE flag, to disable net-misc/mDNSResponder, as per policy.
+  Handle CMake arguments for the zeroconf USE flag correctly.
 
 *kdenetwork-4.0.0-r1 (23 Jan 2008)
 
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 2a92254f07ea..f691fc8969ad 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -68,14 +68,14 @@ EBUILD kdenetwork-3.5.8.ebuild 3002 RMD160 128710e5978d8e0c581c95d9c382caf9574cb
 MD5 3f69e399ce0bf1e6d14955fead673a43 kdenetwork-3.5.8.ebuild 3002
 RMD160 128710e5978d8e0c581c95d9c382caf9574cb773 kdenetwork-3.5.8.ebuild 3002
 SHA256 6f6f9ffcc48f7f85b109d36bb25d80c8e6bd883626487cd032f1846ef4294aac kdenetwork-3.5.8.ebuild 3002
-EBUILD kdenetwork-4.0.0-r1.ebuild 4431 RMD160 80ad7dc02aaa7bd1ae956e8119222debf1f0b8a9 SHA1 27bf34172688881cc4798738b9e971e42a9d50bc SHA256 a9d986d8157e2864875936ae6e01f5a3d024fd16c010fbabd9a54e438a394d5f
-MD5 21c498d392d9e8e688b5b743ec50be80 kdenetwork-4.0.0-r1.ebuild 4431
-RMD160 80ad7dc02aaa7bd1ae956e8119222debf1f0b8a9 kdenetwork-4.0.0-r1.ebuild 4431
-SHA256 a9d986d8157e2864875936ae6e01f5a3d024fd16c010fbabd9a54e438a394d5f kdenetwork-4.0.0-r1.ebuild 4431
-MISC ChangeLog 38869 RMD160 b80b478d8af8f0f91250295f5bdc57b2e1833bac SHA1 bc7bc02355e0ac3dedec9bfcf4ab8906c9452ba4 SHA256 5727bf1a704cb53747cab9c63927c2fd7504fee073032f13d1aea409804c8be2
-MD5 2ed5bd5df9e579c19d25e612242a8a5e ChangeLog 38869
-RMD160 b80b478d8af8f0f91250295f5bdc57b2e1833bac ChangeLog 38869
-SHA256 5727bf1a704cb53747cab9c63927c2fd7504fee073032f13d1aea409804c8be2 ChangeLog 38869
+EBUILD kdenetwork-4.0.0-r1.ebuild 4765 RMD160 ec102edcf631abff44651fcad154451446eb086c SHA1 ae275d4ba8b8bbcc87fea18baef16a6f1f39f152 SHA256 6b66d4a1417e10a66f295e3b5d4594dffdaab20d76609316853880204a17bbe2
+MD5 7b377753fbaeab3839219ad06ca16196 kdenetwork-4.0.0-r1.ebuild 4765
+RMD160 ec102edcf631abff44651fcad154451446eb086c kdenetwork-4.0.0-r1.ebuild 4765
+SHA256 6b66d4a1417e10a66f295e3b5d4594dffdaab20d76609316853880204a17bbe2 kdenetwork-4.0.0-r1.ebuild 4765
+MISC ChangeLog 39092 RMD160 828ba2e9991bae54cdf6322980f4118a66b8b86f SHA1 52ccb0b7996bb416e1d4ef45a978cae43c853b60 SHA256 e9f55a05c03806538e597679878dedaefefd037b41f77196b5e4cbd86fd32e04
+MD5 4984915f5ea088d4b7ff84f9b7e42376 ChangeLog 39092
+RMD160 828ba2e9991bae54cdf6322980f4118a66b8b86f ChangeLog 39092
+SHA256 e9f55a05c03806538e597679878dedaefefd037b41f77196b5e4cbd86fd32e04 ChangeLog 39092
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild b/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild
index 824ded1d7147..c912229b7e68 100644
--- a/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild,v 1.1 2008/01/23 01:14:35 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-4.0.0-r1.ebuild,v 1.2 2008/01/28 09:49:39 ingmar Exp $
 
 EAPI="1"
 
@@ -10,7 +10,7 @@ DESCRIPTION="KDE network applications: Kopete, KPPP, KGet,..."
 HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS="~amd64 ~x86"
-IUSE="+addbookmarks +alias +autoreplace +contactnotes debug gadu groupwise
+IUSE="+addbookmarks +alias +autoreplace bindist +contactnotes debug gadu groupwise
 +highlight +history htmlhandbook +jabber jpeg latex +msn +nowlistening oscar
 +plasma ppp +privacy qq slp sms ssl +statistics testbed +texteffect +translator
 +urlpicpreview vnc +webpresence winpopup yahoo zeroconf"
@@ -42,7 +42,7 @@ COMMONDEPEND="
 	statistics? ( dev-db/sqlite:3 )
 	vnc? ( >=net-libs/libvncserver-0.9 )
 	webpresence? ( dev-libs/libxml2 dev-libs/libxslt )
-	zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) )
+	zeroconf? ( || ( net-dns/avahi bindist? ( net-misc/mDNSResponder ) ) )
 "
 #	telepathy? ( net-libs/decibel )
 
@@ -68,6 +68,16 @@ src_compile() {
 	sed -e '/X-KDE-PluginInfo-Category\[.*/d' \
 		-i "${S}"/kopete/protocols/*/kopete_*.desktop || die "Sed failed."
 
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	fi
+
 	# kdenetwork looks for 'xmms' which isn't in the official portage tree.
 	# I've disabled this check to prevent linking to user-installed things.
 	mycmakeargs="${mycmakeargs}
@@ -108,7 +118,6 @@ src_compile() {
 		$(cmake-utils_use_with webpresence)
 		$(cmake-utils_use_with winpopup)
 		$(cmake-utils_use_with yahoo)
-		$(cmake-utils_use_with zeroconf DNSSD)
 	"
 	#	$(cmake-utils_use_with messenger)
 	#	$(cmake-utils_use_with telepathy)