6 files changed, 12 insertions, 88 deletions
diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild
index fe3b694ce59..56163b0f4ae 100644
--- a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild
@@ -19,9 +19,9 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS=""
 LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
-lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
-+udisks +upower upnp zeroconf"
+IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
++upower upnp zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -84,12 +84,7 @@ COMMONDEPEND="
 	ssl? ( dev-libs/openssl )
 	udev? ( sys-fs/udev )
 	upnp? ( media-libs/herqq )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			!bindist? ( net-misc/mDNSResponder )
-		)
-	)
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 "
 DEPEND="${COMMONDEPEND}
 	doc? ( app-doc/doxygen )
@@ -193,10 +188,8 @@ src_configure() {
 	if use zeroconf; then
 		if has_version net-dns/avahi; then
 			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
 		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+			die "USE=\"zeroconf\" enabled but net-dns/avahi wasn't found."
 		fi
 	else
 		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index fe3b694ce59..cb3f98eb4a6 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -19,9 +19,9 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS=""
 LICENSE="LGPL-2.1"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jpeg2k kerberos
-lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev
-+udisks +upower upnp zeroconf"
+IUSE="3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k kerberos lzma
+mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +udisks
++upower upnp zeroconf"
 
 REQUIRED_USE="
 	udisks? ( udev )
@@ -84,12 +84,7 @@ COMMONDEPEND="
 	ssl? ( dev-libs/openssl )
 	udev? ( sys-fs/udev )
 	upnp? ( media-libs/herqq )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			!bindist? ( net-misc/mDNSResponder )
-		)
-	)
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
 "
 DEPEND="${COMMONDEPEND}
 	doc? ( app-doc/doxygen )
@@ -193,10 +188,8 @@ src_configure() {
 	if use zeroconf; then
 		if has_version net-dns/avahi; then
 			mycmakeargs=(-DWITH_Avahi=ON -DWITH_DNSSD=OFF)
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=ON)
 		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+			die "USE=\"zeroconf\" but net-dns/avahi wasn't found."
 		fi
 	else
 		mycmakeargs=(-DWITH_Avahi=OFF -DWITH_DNSSD=OFF)
diff --git a/kde-base/krdc/krdc-4.8.49.9999.ebuild b/kde-base/krdc/krdc-4.8.49.9999.ebuild
index c74ba6b9b3b..f9dc4c0b736 100644
--- a/kde-base/krdc/krdc-4.8.49.9999.ebuild
+++ b/kde-base/krdc/krdc-4.8.49.9999.ebuild
@@ -18,12 +18,7 @@ IUSE="debug jpeg rdesktop vnc zeroconf"
 DEPEND="
 	jpeg? ( virtual/jpeg )
 	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? (
-		|| (
-			net-dns/avahi
-			net-misc/mDNSResponder
-		)
-	)
+	zeroconf? ( net-dns/avahi )
 "
 RDEPEND="${DEPEND}
 	rdesktop? ( net-misc/rdesktop )
diff --git a/kde-base/krdc/krdc-9999.ebuild b/kde-base/krdc/krdc-9999.ebuild
index c74ba6b9b3b..f9dc4c0b736 100644
--- a/kde-base/krdc/krdc-9999.ebuild
+++ b/kde-base/krdc/krdc-9999.ebuild
@@ -18,12 +18,7 @@ IUSE="debug jpeg rdesktop vnc zeroconf"
 DEPEND="
 	jpeg? ( virtual/jpeg )
 	vnc? ( >=net-libs/libvncserver-0.9 )
-	zeroconf? (
-		|| (
-			net-dns/avahi
-			net-misc/mDNSResponder
-		)
-	)
+	zeroconf? ( net-dns/avahi )
 "
 RDEPEND="${DEPEND}
 	rdesktop? ( net-misc/rdesktop )
diff --git a/kde-base/kreversi/kreversi-9999.ebuild b/kde-base/kreversi/kreversi-9999.ebuild
index 54003a80e11..999db39cf27 100644
--- a/kde-base/kreversi/kreversi-9999.ebuild
+++ b/kde-base/kreversi/kreversi-9999.ebuild
@@ -12,29 +12,3 @@ inherit games-ggz kde4-meta
 DESCRIPTION="KDE Board Game"
 KEYWORDS=""
 IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		${PN}/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}
diff --git a/kde-base/ksquares/ksquares-9999.ebuild b/kde-base/ksquares/ksquares-9999.ebuild
index bec4ca7a4bd..f83425a61f8 100644
--- a/kde-base/ksquares/ksquares-9999.ebuild
+++ b/kde-base/ksquares/ksquares-9999.ebuild
@@ -11,29 +11,3 @@ inherit games-ggz kde4-meta
 DESCRIPTION="KSquares is an implementation of the game squares for KDE4"
 KEYWORDS=""
 IUSE="debug"
-
-src_prepare() {
-	# cmake is doing this really weird
-	sed -i \
-		-e "s:register_ggz_module:#register_ggz_module:g" \
-		${PN}/src/CMakeLists.txt || die "ggz removal failed"
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-	# and also we have to prepare the ggz dir
-	insinto "${GGZ_MODDIR}"
-	newins ${PN}/src/module.dsc ${P}.dsc
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-	games-ggz_pkg_postinst
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-	games-ggz_pkg_postrm
-}