diff options
39 files changed, 48 insertions, 36 deletions
diff --git a/Documentation/package.accept_keywords/.kde-4.11.49.9999/kdenetwork-4.11 b/Documentation/package.accept_keywords/.kde-4.11.49.9999/kdenetwork-4.11 index cd0a91745fc..d4651cabad8 100644 --- a/Documentation/package.accept_keywords/.kde-4.11.49.9999/kdenetwork-4.11 +++ b/Documentation/package.accept_keywords/.kde-4.11.49.9999/kdenetwork-4.11 @@ -1,7 +1,7 @@ ~kde-base/kdenetwork-filesharing-4.11.49.9999 ** ~kde-base/kdenetwork-meta-4.11.49.9999 ** -~kde-base/kdnssd-4.11.49.9999 ** ~kde-base/kget-4.11.49.9999 ** ~kde-base/kopete-4.11.49.9999 ** ~kde-base/krdc-4.11.49.9999 ** ~kde-base/krfb-4.11.49.9999 ** +~kde-base/zeroconf-ioslave-4.11.49.9999 ** diff --git a/Documentation/package.accept_keywords/.kde-4.12.49.9999/kdenetwork-4.12 b/Documentation/package.accept_keywords/.kde-4.12.49.9999/kdenetwork-4.12 index 52e17fafc47..265e68f5ae0 100644 --- a/Documentation/package.accept_keywords/.kde-4.12.49.9999/kdenetwork-4.12 +++ b/Documentation/package.accept_keywords/.kde-4.12.49.9999/kdenetwork-4.12 @@ -1,7 +1,7 @@ ~kde-base/kdenetwork-filesharing-4.12.49.9999 ** ~kde-base/kdenetwork-meta-4.12.49.9999 ** -~kde-base/kdnssd-4.12.49.9999 ** ~kde-base/kget-4.12.49.9999 ** ~kde-base/kopete-4.12.49.9999 ** ~kde-base/krdc-4.12.49.9999 ** ~kde-base/krfb-4.12.49.9999 ** +~kde-base/zeroconf-ioslave-4.12.49.9999 ** diff --git a/Documentation/package.accept_keywords/.kde-4.13.49.9999/kdenetwork-4.13 b/Documentation/package.accept_keywords/.kde-4.13.49.9999/kdenetwork-4.13 index 45fcc7e82a7..e02c5124ac6 100644 --- a/Documentation/package.accept_keywords/.kde-4.13.49.9999/kdenetwork-4.13 +++ b/Documentation/package.accept_keywords/.kde-4.13.49.9999/kdenetwork-4.13 @@ -1,7 +1,7 @@ ~kde-base/kdenetwork-filesharing-4.13.49.9999 ** ~kde-base/kdenetwork-meta-4.13.49.9999 ** -~kde-base/kdnssd-4.13.49.9999 ** ~kde-base/kget-4.13.49.9999 ** ~kde-base/kopete-4.13.49.9999 ** ~kde-base/krdc-4.13.49.9999 ** ~kde-base/krfb-4.13.49.9999 ** +~kde-base/zeroconf-ioslave-4.13.49.9999 ** diff --git a/Documentation/package.accept_keywords/.kde-live/kdenetwork-live b/Documentation/package.accept_keywords/.kde-live/kdenetwork-live index ec81ad9150f..d1157efb670 100644 --- a/Documentation/package.accept_keywords/.kde-live/kdenetwork-live +++ b/Documentation/package.accept_keywords/.kde-live/kdenetwork-live @@ -1,7 +1,7 @@ ~kde-base/kdenetwork-filesharing-9999 ** ~kde-base/kdenetwork-meta-9999 ** -~kde-base/kdnssd-9999 ** ~kde-base/kget-9999 ** ~kde-base/kopete-9999 ** ~kde-base/krdc-9999 ** ~kde-base/krfb-9999 ** +~kde-base/zeroconf-ioslave-9999 ** diff --git a/Documentation/package.accept_keywords/kde-4.11.49.9999.keywords b/Documentation/package.accept_keywords/kde-4.11.49.9999.keywords index 2894374fdf8..c54577df593 100644 --- a/Documentation/package.accept_keywords/kde-4.11.49.9999.keywords +++ b/Documentation/package.accept_keywords/kde-4.11.49.9999.keywords @@ -224,11 +224,11 @@ ~kde-base/mplayerthumbs-4.11.49.9999 ** ~kde-base/kdenetwork-filesharing-4.11.49.9999 ** ~kde-base/kdenetwork-meta-4.11.49.9999 ** -~kde-base/kdnssd-4.11.49.9999 ** ~kde-base/kget-4.11.49.9999 ** ~kde-base/kopete-4.11.49.9999 ** ~kde-base/krdc-4.11.49.9999 ** ~kde-base/krfb-4.11.49.9999 ** +~kde-base/zeroconf-ioslave-4.11.49.9999 ** ~kde-base/kfloppy-4.11.49.9999 ** ~kde-base/kppp-4.11.49.9999 ** ~kde-base/akonadiconsole-4.11.49.9999 ** diff --git a/Documentation/package.accept_keywords/kde-4.11.keywords b/Documentation/package.accept_keywords/kde-4.11.keywords index 85eb3b3a588..fae30f4dbbf 100644 --- a/Documentation/package.accept_keywords/kde-4.11.keywords +++ b/Documentation/package.accept_keywords/kde-4.11.keywords @@ -224,11 +224,11 @@ <kde-base/mplayerthumbs-4.11.50 <kde-base/kdenetwork-filesharing-4.11.50 <kde-base/kdenetwork-meta-4.11.50 -<kde-base/kdnssd-4.11.50 <kde-base/kget-4.11.50 <kde-base/kopete-4.11.50 <kde-base/krdc-4.11.50 <kde-base/krfb-4.11.50 +<kde-base/zeroconf-ioslave-4.11.50 <kde-base/kfloppy-4.11.50 <kde-base/kppp-4.11.50 <kde-base/akonadiconsole-4.11.50 diff --git a/Documentation/package.accept_keywords/kde-4.12.49.9999.keywords b/Documentation/package.accept_keywords/kde-4.12.49.9999.keywords index 2a58ba053e4..ef155d5d23f 100644 --- a/Documentation/package.accept_keywords/kde-4.12.49.9999.keywords +++ b/Documentation/package.accept_keywords/kde-4.12.49.9999.keywords @@ -223,11 +223,11 @@ ~kde-base/mplayerthumbs-4.12.49.9999 ** ~kde-base/kdenetwork-filesharing-4.12.49.9999 ** ~kde-base/kdenetwork-meta-4.12.49.9999 ** -~kde-base/kdnssd-4.12.49.9999 ** ~kde-base/kget-4.12.49.9999 ** ~kde-base/kopete-4.12.49.9999 ** ~kde-base/krdc-4.12.49.9999 ** ~kde-base/krfb-4.12.49.9999 ** +~kde-base/zeroconf-ioslave-4.12.49.9999 ** ~kde-base/kfloppy-4.12.49.9999 ** ~kde-base/kppp-4.12.49.9999 ** ~kde-base/akonadiconsole-4.12.49.9999 ** diff --git a/Documentation/package.accept_keywords/kde-4.12.keywords b/Documentation/package.accept_keywords/kde-4.12.keywords index 68225cc4d0c..59c96096c1a 100644 --- a/Documentation/package.accept_keywords/kde-4.12.keywords +++ b/Documentation/package.accept_keywords/kde-4.12.keywords @@ -223,11 +223,11 @@ <kde-base/mplayerthumbs-4.12.50 <kde-base/kdenetwork-filesharing-4.12.50 <kde-base/kdenetwork-meta-4.12.50 -<kde-base/kdnssd-4.12.50 <kde-base/kget-4.12.50 <kde-base/kopete-4.12.50 <kde-base/krdc-4.12.50 <kde-base/krfb-4.12.50 +<kde-base/zeroconf-ioslave-4.12.50 <kde-base/kfloppy-4.12.50 <kde-base/kppp-4.12.50 <kde-base/akonadiconsole-4.12.50 diff --git a/Documentation/package.accept_keywords/kde-4.13.49.9999.keywords b/Documentation/package.accept_keywords/kde-4.13.49.9999.keywords index 478afd79ae0..bd32ea9366c 100644 --- a/Documentation/package.accept_keywords/kde-4.13.49.9999.keywords +++ b/Documentation/package.accept_keywords/kde-4.13.49.9999.keywords @@ -226,11 +226,11 @@ ~kde-base/mplayerthumbs-4.13.49.9999 ** ~kde-base/kdenetwork-filesharing-4.13.49.9999 ** ~kde-base/kdenetwork-meta-4.13.49.9999 ** -~kde-base/kdnssd-4.13.49.9999 ** ~kde-base/kget-4.13.49.9999 ** ~kde-base/kopete-4.13.49.9999 ** ~kde-base/krdc-4.13.49.9999 ** ~kde-base/krfb-4.13.49.9999 ** +~kde-base/zeroconf-ioslave-4.13.49.9999 ** ~kde-base/kfloppy-4.13.49.9999 ** ~kde-base/kppp-4.13.49.9999 ** ~kde-base/akonadiconsole-4.13.49.9999 ** diff --git a/Documentation/package.accept_keywords/kde-4.13.keywords b/Documentation/package.accept_keywords/kde-4.13.keywords index a8464da4fa5..873caf9fee4 100644 --- a/Documentation/package.accept_keywords/kde-4.13.keywords +++ b/Documentation/package.accept_keywords/kde-4.13.keywords @@ -226,11 +226,11 @@ <kde-base/mplayerthumbs-4.13.50 <kde-base/kdenetwork-filesharing-4.13.50 <kde-base/kdenetwork-meta-4.13.50 -<kde-base/kdnssd-4.13.50 <kde-base/kget-4.13.50 <kde-base/kopete-4.13.50 <kde-base/krdc-4.13.50 <kde-base/krfb-4.13.50 +<kde-base/zeroconf-ioslave-4.13.50 <kde-base/kfloppy-4.13.50 <kde-base/kppp-4.13.50 <kde-base/akonadiconsole-4.13.50 diff --git a/Documentation/package.accept_keywords/kde-live.keywords b/Documentation/package.accept_keywords/kde-live.keywords index 7c23cdb2aff..3e7e735fdc6 100644 --- a/Documentation/package.accept_keywords/kde-live.keywords +++ b/Documentation/package.accept_keywords/kde-live.keywords @@ -243,11 +243,11 @@ ~kde-base/mplayerthumbs-9999 ** ~kde-base/kdenetwork-filesharing-9999 ** ~kde-base/kdenetwork-meta-9999 ** -~kde-base/kdnssd-9999 ** ~kde-base/kget-9999 ** ~kde-base/kopete-9999 ** ~kde-base/krdc-9999 ** ~kde-base/krfb-9999 ** +~kde-base/zeroconf-ioslave-9999 ** ~kde-base/kfloppy-9999 ** ~kde-base/kppp-9999 ** ~kde-base/akonadiconsole-9999 ** diff --git a/Documentation/package.mask/kde-4.11 b/Documentation/package.mask/kde-4.11 index 7c9f17e39c1..d4af6a1ba62 100644 --- a/Documentation/package.mask/kde-4.11 +++ b/Documentation/package.mask/kde-4.11 @@ -224,11 +224,11 @@ >=kde-base/mplayerthumbs-4.11 >=kde-base/kdenetwork-filesharing-4.11 >=kde-base/kdenetwork-meta-4.11 ->=kde-base/kdnssd-4.11 >=kde-base/kget-4.11 >=kde-base/kopete-4.11 >=kde-base/krdc-4.11 >=kde-base/krfb-4.11 +>=kde-base/zeroconf-ioslave-4.11 >=kde-base/kfloppy-4.11 >=kde-base/kppp-4.11 >=kde-base/akonadiconsole-4.11 diff --git a/Documentation/package.mask/kde-4.12 b/Documentation/package.mask/kde-4.12 index 3baa73a42bb..b4fb68363a4 100644 --- a/Documentation/package.mask/kde-4.12 +++ b/Documentation/package.mask/kde-4.12 @@ -223,11 +223,11 @@ >=kde-base/mplayerthumbs-4.12 >=kde-base/kdenetwork-filesharing-4.12 >=kde-base/kdenetwork-meta-4.12 ->=kde-base/kdnssd-4.12 >=kde-base/kget-4.12 >=kde-base/kopete-4.12 >=kde-base/krdc-4.12 >=kde-base/krfb-4.12 +>=kde-base/zeroconf-ioslave-4.12 >=kde-base/kfloppy-4.12 >=kde-base/kppp-4.12 >=kde-base/akonadiconsole-4.12 diff --git a/Documentation/package.mask/kde-4.13 b/Documentation/package.mask/kde-4.13 index 681c5b92e6c..2488fe3a371 100644 --- a/Documentation/package.mask/kde-4.13 +++ b/Documentation/package.mask/kde-4.13 @@ -226,11 +226,11 @@ >=kde-base/mplayerthumbs-4.13 >=kde-base/kdenetwork-filesharing-4.13 >=kde-base/kdenetwork-meta-4.13 ->=kde-base/kdnssd-4.13 >=kde-base/kget-4.13 >=kde-base/kopete-4.13 >=kde-base/krdc-4.13 >=kde-base/krfb-4.13 +>=kde-base/zeroconf-ioslave-4.13 >=kde-base/kfloppy-4.13 >=kde-base/kppp-4.13 >=kde-base/akonadiconsole-4.13 diff --git a/Documentation/package.mask/kde-live b/Documentation/package.mask/kde-live index 65baaa212ee..3907ca55065 100644 --- a/Documentation/package.mask/kde-live +++ b/Documentation/package.mask/kde-live @@ -243,11 +243,11 @@ ~kde-base/mplayerthumbs-9999 ~kde-base/kdenetwork-filesharing-9999 ~kde-base/kdenetwork-meta-9999 -~kde-base/kdnssd-9999 ~kde-base/kget-9999 ~kde-base/kopete-9999 ~kde-base/krdc-9999 ~kde-base/krfb-9999 +~kde-base/zeroconf-ioslave-9999 ~kde-base/kfloppy-9999 ~kde-base/kppp-9999 ~kde-base/akonadiconsole-9999 diff --git a/Documentation/package.unmask/kde-4.11 b/Documentation/package.unmask/kde-4.11 index 6e10ac3b1d9..5aef4a7c419 100644 --- a/Documentation/package.unmask/kde-4.11 +++ b/Documentation/package.unmask/kde-4.11 @@ -224,11 +224,11 @@ <kde-base/mplayerthumbs-4.11.50 <kde-base/kdenetwork-filesharing-4.11.50 <kde-base/kdenetwork-meta-4.11.50 -<kde-base/kdnssd-4.11.50 <kde-base/kget-4.11.50 <kde-base/kopete-4.11.50 <kde-base/krdc-4.11.50 <kde-base/krfb-4.11.50 +<kde-base/zeroconf-ioslave-4.11.50 <kde-base/kfloppy-4.11.50 <kde-base/kppp-4.11.50 <kde-base/akonadiconsole-4.11.50 diff --git a/Documentation/package.unmask/kde-4.12 b/Documentation/package.unmask/kde-4.12 index bbd768593da..627335209ba 100644 --- a/Documentation/package.unmask/kde-4.12 +++ b/Documentation/package.unmask/kde-4.12 @@ -223,11 +223,11 @@ <kde-base/mplayerthumbs-4.12.50 <kde-base/kdenetwork-filesharing-4.12.50 <kde-base/kdenetwork-meta-4.12.50 -<kde-base/kdnssd-4.12.50 <kde-base/kget-4.12.50 <kde-base/kopete-4.12.50 <kde-base/krdc-4.12.50 <kde-base/krfb-4.12.50 +<kde-base/zeroconf-ioslave-4.12.50 <kde-base/kfloppy-4.12.50 <kde-base/kppp-4.12.50 <kde-base/akonadiconsole-4.12.50 diff --git a/Documentation/package.unmask/kde-4.13 b/Documentation/package.unmask/kde-4.13 index 92b43fa5e87..da78fab20ff 100644 --- a/Documentation/package.unmask/kde-4.13 +++ b/Documentation/package.unmask/kde-4.13 @@ -226,11 +226,11 @@ <kde-base/mplayerthumbs-4.13.50 <kde-base/kdenetwork-filesharing-4.13.50 <kde-base/kdenetwork-meta-4.13.50 -<kde-base/kdnssd-4.13.50 <kde-base/kget-4.13.50 <kde-base/kopete-4.13.50 <kde-base/krdc-4.13.50 <kde-base/krfb-4.13.50 +<kde-base/zeroconf-ioslave-4.13.50 <kde-base/kfloppy-4.13.50 <kde-base/kppp-4.13.50 <kde-base/akonadiconsole-4.13.50 diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live index 65baaa212ee..3907ca55065 100644 --- a/Documentation/package.unmask/kde-live +++ b/Documentation/package.unmask/kde-live @@ -243,11 +243,11 @@ ~kde-base/mplayerthumbs-9999 ~kde-base/kdenetwork-filesharing-9999 ~kde-base/kdenetwork-meta-9999 -~kde-base/kdnssd-9999 ~kde-base/kget-9999 ~kde-base/kopete-9999 ~kde-base/krdc-9999 ~kde-base/krfb-9999 +~kde-base/zeroconf-ioslave-9999 ~kde-base/kfloppy-9999 ~kde-base/kppp-9999 ~kde-base/akonadiconsole-9999 diff --git a/kde-base/kcontrol/kcontrol-4.12.49.9999.ebuild b/kde-base/kcontrol/kcontrol-4.12.49.9999.ebuild index 8a9453e3939..e46515fc6c0 100644 --- a/kde-base/kcontrol/kcontrol-4.12.49.9999.ebuild +++ b/kde-base/kcontrol/kcontrol-4.12.49.9999.ebuild @@ -13,6 +13,6 @@ KEYWORDS="" IUSE="debug" RDEPEND=" - $(add_kdebase_dep kdnssd) $(add_kdebase_dep khotkeys '' 4.11) + $(add_kdebase_dep zeroconf-ioslave) " diff --git a/kde-base/kcontrol/kcontrol-4.12.90.ebuild b/kde-base/kcontrol/kcontrol-4.12.90.ebuild index a2226155713..499929fcb58 100644 --- a/kde-base/kcontrol/kcontrol-4.12.90.ebuild +++ b/kde-base/kcontrol/kcontrol-4.12.90.ebuild @@ -13,6 +13,6 @@ KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="debug" RDEPEND=" - $(add_kdebase_dep kdnssd) $(add_kdebase_dep khotkeys '' 4.11) + $(add_kdebase_dep zeroconf-ioslave) " diff --git a/kde-base/kcontrol/kcontrol-4.13.49.9999.ebuild b/kde-base/kcontrol/kcontrol-4.13.49.9999.ebuild index 8a9453e3939..e46515fc6c0 100644 --- a/kde-base/kcontrol/kcontrol-4.13.49.9999.ebuild +++ b/kde-base/kcontrol/kcontrol-4.13.49.9999.ebuild @@ -13,6 +13,6 @@ KEYWORDS="" IUSE="debug" RDEPEND=" - $(add_kdebase_dep kdnssd) $(add_kdebase_dep khotkeys '' 4.11) + $(add_kdebase_dep zeroconf-ioslave) " diff --git a/kde-base/kcontrol/kcontrol-9999.ebuild b/kde-base/kcontrol/kcontrol-9999.ebuild index 7c934ed5caa..dec7e2ffbc5 100644 --- a/kde-base/kcontrol/kcontrol-9999.ebuild +++ b/kde-base/kcontrol/kcontrol-9999.ebuild @@ -13,6 +13,6 @@ KEYWORDS="" IUSE="debug" RDEPEND=" - $(add_kdebase_dep kdnssd) $(add_kdebase_dep khotkeys) + $(add_kdebase_dep zeroconf-ioslave) " diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.49.9999.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.49.9999.ebuild index bf6b425f540..0fa8e11473c 100644 --- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.49.9999.ebuild +++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.49.9999.ebuild @@ -12,10 +12,10 @@ IUSE="ppp" RDEPEND=" $(add_kdebase_dep kdenetwork-filesharing) - $(add_kdebase_dep kdnssd) $(add_kdebase_dep kget) $(add_kdebase_dep kopete) $(add_kdebase_dep krdc) $(add_kdebase_dep krfb) + $(add_kdebase_dep zeroconf-ioslave) ppp? ( $(add_kdebase_dep kppp) ) " diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.90.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.90.ebuild index d47b4a03cb8..19c3c7d68d2 100644 --- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.90.ebuild +++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.12.90.ebuild @@ -12,10 +12,10 @@ IUSE="ppp" RDEPEND=" $(add_kdebase_dep kdenetwork-filesharing) - $(add_kdebase_dep kdnssd) $(add_kdebase_dep kget) $(add_kdebase_dep kopete) $(add_kdebase_dep krdc) $(add_kdebase_dep krfb) + $(add_kdebase_dep zeroconf-ioslave) ppp? ( $(add_kdebase_dep kppp) ) " diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-4.13.49.9999.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-4.13.49.9999.ebuild index bf6b425f540..0fa8e11473c 100644 --- a/kde-base/kdenetwork-meta/kdenetwork-meta-4.13.49.9999.ebuild +++ b/kde-base/kdenetwork-meta/kdenetwork-meta-4.13.49.9999.ebuild @@ -12,10 +12,10 @@ IUSE="ppp" RDEPEND=" $(add_kdebase_dep kdenetwork-filesharing) - $(add_kdebase_dep kdnssd) $(add_kdebase_dep kget) $(add_kdebase_dep kopete) $(add_kdebase_dep krdc) $(add_kdebase_dep krfb) + $(add_kdebase_dep zeroconf-ioslave) ppp? ( $(add_kdebase_dep kppp) ) " diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild index bf6b425f540..0fa8e11473c 100644 --- a/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild +++ b/kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild @@ -12,10 +12,10 @@ IUSE="ppp" RDEPEND=" $(add_kdebase_dep kdenetwork-filesharing) - $(add_kdebase_dep kdnssd) $(add_kdebase_dep kget) $(add_kdebase_dep kopete) $(add_kdebase_dep krdc) $(add_kdebase_dep krfb) + $(add_kdebase_dep zeroconf-ioslave) ppp? ( $(add_kdebase_dep kppp) ) " diff --git a/kde-base/kdnssd/Manifest b/kde-base/zeroconf-ioslave/Manifest index c352474c118..c352474c118 100644 --- a/kde-base/kdnssd/Manifest +++ b/kde-base/zeroconf-ioslave/Manifest diff --git a/kde-base/kdnssd/metadata.xml b/kde-base/zeroconf-ioslave/metadata.xml index 8d1e86a9cef..8d1e86a9cef 100644 --- a/kde-base/kdnssd/metadata.xml +++ b/kde-base/zeroconf-ioslave/metadata.xml diff --git a/kde-base/kdnssd/kdnssd-9999.ebuild b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.12.49.9999.ebuild index 0c9c1851d70..f1966827569 100644 --- a/kde-base/kdnssd/kdnssd-9999.ebuild +++ b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.12.49.9999.ebuild @@ -13,7 +13,9 @@ IUSE="debug zeroconf" DEPEND=" zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/kdnssd:4 +" src_configure() { mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON) diff --git a/kde-base/kdnssd/kdnssd-4.12.90.ebuild b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.12.90.ebuild index dbab3dc4a61..ac53d692e4e 100644 --- a/kde-base/kdnssd/kdnssd-4.12.90.ebuild +++ b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.12.90.ebuild @@ -4,6 +4,7 @@ EAPI=5 +KMNAME="kdnssd" inherit kde4-base DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module" @@ -13,7 +14,11 @@ IUSE="debug zeroconf" DEPEND=" zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/kdnssd:4 +" + +S=${WORKDIR}/${KMNAME}-${PV} src_configure() { mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON) diff --git a/kde-base/kdnssd/kdnssd-4.12.49.9999.ebuild b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.13.49.9999.ebuild index 0c9c1851d70..f1966827569 100644 --- a/kde-base/kdnssd/kdnssd-4.12.49.9999.ebuild +++ b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.13.49.9999.ebuild @@ -13,7 +13,9 @@ IUSE="debug zeroconf" DEPEND=" zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/kdnssd:4 +" src_configure() { mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON) diff --git a/kde-base/kdnssd/kdnssd-4.13.49.9999.ebuild b/kde-base/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild index 0c9c1851d70..f1966827569 100644 --- a/kde-base/kdnssd/kdnssd-4.13.49.9999.ebuild +++ b/kde-base/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild @@ -13,7 +13,9 @@ IUSE="debug zeroconf" DEPEND=" zeroconf? ( $(add_kdebase_dep kdelibs zeroconf) ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + !kde-base/kdnssd:4 +" src_configure() { mycmakeargs=(-DWITH_Xmms=OFF -DWITH_DNSSD=ON) diff --git a/profiles/updates/1Q-2014 b/profiles/updates/1Q-2014 index 590c8d709f9..f77d35a5931 100644 --- a/profiles/updates/1Q-2014 +++ b/profiles/updates/1Q-2014 @@ -1 +1,2 @@ move kde-base/kwallet kde-base/kwalletmanager +move kde-base/kdnssd kde-base/zeroconf-ioslave diff --git a/sets/kdenetwork b/sets/kdenetwork index 99a3498b3fa..dde75532efb 100644 --- a/sets/kdenetwork +++ b/sets/kdenetwork @@ -1,8 +1,8 @@ # Autogenerated by regenerate-files, DO NOT EDIT. kde-base/kdenetwork-filesharing:4 kde-base/kdenetwork-meta:4 -kde-base/kdnssd:4 kde-base/kget:4 kde-base/kopete:4 kde-base/krdc:4 kde-base/krfb:4 +kde-base/zeroconf-ioslave:4 diff --git a/sets/kdenetwork-4.11 b/sets/kdenetwork-4.11 index 797fab73240..06767384ee2 100644 --- a/sets/kdenetwork-4.11 +++ b/sets/kdenetwork-4.11 @@ -1,7 +1,7 @@ <kde-base/kdenetwork-filesharing-4.11.50 <kde-base/kdenetwork-meta-4.11.50 -<kde-base/kdnssd-4.11.50 <kde-base/kget-4.11.50 <kde-base/kopete-4.11.50 <kde-base/krdc-4.11.50 <kde-base/krfb-4.11.50 +<kde-base/zeroconf-ioslave-4.11.50 diff --git a/sets/kdenetwork-4.12 b/sets/kdenetwork-4.12 index 3b3c8a58fb5..53d4bb9c24f 100644 --- a/sets/kdenetwork-4.12 +++ b/sets/kdenetwork-4.12 @@ -1,7 +1,7 @@ <kde-base/kdenetwork-filesharing-4.12.50 <kde-base/kdenetwork-meta-4.12.50 -<kde-base/kdnssd-4.12.50 <kde-base/kget-4.12.50 <kde-base/kopete-4.12.50 <kde-base/krdc-4.12.50 <kde-base/krfb-4.12.50 +<kde-base/zeroconf-ioslave-4.12.50 diff --git a/sets/kdenetwork-4.13 b/sets/kdenetwork-4.13 index 97406afbe24..8c1e7a35e41 100644 --- a/sets/kdenetwork-4.13 +++ b/sets/kdenetwork-4.13 @@ -1,7 +1,7 @@ <kde-base/kdenetwork-filesharing-4.13.50 <kde-base/kdenetwork-meta-4.13.50 -<kde-base/kdnssd-4.13.50 <kde-base/kget-4.13.50 <kde-base/kopete-4.13.50 <kde-base/krdc-4.13.50 <kde-base/krfb-4.13.50 +<kde-base/zeroconf-ioslave-4.13.50 diff --git a/sets/kdenetwork-live b/sets/kdenetwork-live index bef61e93622..f1b9bffbb81 100644 --- a/sets/kdenetwork-live +++ b/sets/kdenetwork-live @@ -1,7 +1,7 @@ ~kde-base/kdenetwork-filesharing-9999 ~kde-base/kdenetwork-meta-9999 -~kde-base/kdnssd-9999 ~kde-base/kget-9999 ~kde-base/kopete-9999 ~kde-base/krdc-9999 ~kde-base/krfb-9999 +~kde-base/zeroconf-ioslave-9999 |