From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S0Zj1-0008Hb-Do for garchives@archives.gentoo.org; Thu, 23 Feb 2012 14:32:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E652FE0BD3; Thu, 23 Feb 2012 14:32:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A43FAE0BD3 for ; Thu, 23 Feb 2012 14:32:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD7AF1B4009 for ; Thu, 23 Feb 2012 14:32:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6D043E53FF for ; Thu, 23 Feb 2012 14:32:41 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1330007520.df27162ee44c23ff08c09142f45297e9251d18ce.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdelibs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild kde-base/kdelibs/kdelibs-9999.ebuild X-VCS-Directories: kde-base/kdelibs/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: df27162ee44c23ff08c09142f45297e9251d18ce X-VCS-Branch: master Date: Thu, 23 Feb 2012 14:32:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e4f4d9cf-f1db-4da6-b775-909fdd5aeaab X-Archives-Hash: 742a04bd89d022bcf5372456d0a02104 commit: df27162ee44c23ff08c09142f45297e9251d18ce Author: Johannes Huber gentoo org> AuthorDate: Thu Feb 23 14:32:00 2012 +0000 Commit: Johannes Huber gentoo org> CommitDate: Thu Feb 23 14:32:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Ddf27162e [kde-base/kdelibs] Remove dep on net-misc/mDNSResponder wrt bug 405385. (Portage version: 2.2.0_alpha88/git/Linux x86_64, unsigned Manifest commi= t) --- kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild | 17 +++++------------ kde-base/kdelibs/kdelibs-9999.ebuild | 17 +++++------------ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/kde-base/kdelibs/kdelibs-4.8.49.9999.ebuild b/kde-base/kdeli= bs/kdelibs-4.8.49.9999.ebuild index fe3b694..56163b0 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=3D"http://www.kde.org/" =20 KEYWORDS=3D"" LICENSE=3D"LGPL-2.1" -IUSE=3D"3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jp= eg2k kerberos -lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +ude= v -+udisks +upower upnp zeroconf" +IUSE=3D"3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k ker= beros lzma +mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +ud= isks ++upower upnp zeroconf" =20 REQUIRED_USE=3D" udisks? ( udev ) @@ -84,12 +84,7 @@ COMMONDEPEND=3D" 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=3D"${COMMONDEPEND} doc? ( app-doc/doxygen ) @@ -193,10 +188,8 @@ src_configure() { if use zeroconf; then if has_version net-dns/avahi; then mycmakeargs=3D(-DWITH_Avahi=3DON -DWITH_DNSSD=3DOFF) - elif has_version net-misc/mDNSResponder; then - mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DON) else - die "USE=3D\"zeroconf\" enabled but neither net-dns/avahi nor net-mis= c/mDNSResponder were found." + die "USE=3D\"zeroconf\" enabled but net-dns/avahi wasn't found." fi else mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DOFF) diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdel= ibs-9999.ebuild index fe3b694..cb3f98e 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -19,9 +19,9 @@ HOMEPAGE=3D"http://www.kde.org/" =20 KEYWORDS=3D"" LICENSE=3D"LGPL-2.1" -IUSE=3D"3dnow acl alsa altivec bindist +bzip2 debug doc fam +handbook jp= eg2k kerberos -lzma mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +ude= v -+udisks +upower upnp zeroconf" +IUSE=3D"3dnow acl alsa altivec +bzip2 debug doc fam +handbook jpeg2k ker= beros lzma +mmx nls openexr +policykit semantic-desktop spell sse sse2 ssl +udev +ud= isks ++upower upnp zeroconf" =20 REQUIRED_USE=3D" udisks? ( udev ) @@ -84,12 +84,7 @@ COMMONDEPEND=3D" 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=3D"${COMMONDEPEND} doc? ( app-doc/doxygen ) @@ -193,10 +188,8 @@ src_configure() { if use zeroconf; then if has_version net-dns/avahi; then mycmakeargs=3D(-DWITH_Avahi=3DON -DWITH_DNSSD=3DOFF) - elif has_version net-misc/mDNSResponder; then - mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DON) else - die "USE=3D\"zeroconf\" enabled but neither net-dns/avahi nor net-mis= c/mDNSResponder were found." + die "USE=3D\"zeroconf\" but net-dns/avahi wasn't found." fi else mycmakeargs=3D(-DWITH_Avahi=3DOFF -DWITH_DNSSD=3DOFF)