* [gentoo-commits] proj/kde:master commit in: kde-base/zeroconf-ioslave/, kde-base/kdnssd/, ...
@ 2014-03-17 12:48 Michael Palimaka
0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2014-03-17 12:48 UTC (permalink / raw
To: gentoo-commits
commit: 38d5a783ac77a923d46a325eeae17ca4a678b7cd
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 17 12:46:59 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 12:46:59 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=38d5a783
[kde-base/kdnssd] Move to kde-base/zeroconf-ioslave as per upstream rename.
---
.../package.accept_keywords/.kde-4.11.49.9999/kdenetwork-4.11 | 2 +-
.../package.accept_keywords/.kde-4.12.49.9999/kdenetwork-4.12 | 2 +-
.../package.accept_keywords/.kde-4.13.49.9999/kdenetwork-4.13 | 2 +-
Documentation/package.accept_keywords/.kde-live/kdenetwork-live | 2 +-
Documentation/package.accept_keywords/kde-4.11.49.9999.keywords | 2 +-
Documentation/package.accept_keywords/kde-4.11.keywords | 2 +-
Documentation/package.accept_keywords/kde-4.12.49.9999.keywords | 2 +-
Documentation/package.accept_keywords/kde-4.12.keywords | 2 +-
Documentation/package.accept_keywords/kde-4.13.49.9999.keywords | 2 +-
Documentation/package.accept_keywords/kde-4.13.keywords | 2 +-
Documentation/package.accept_keywords/kde-live.keywords | 2 +-
Documentation/package.mask/kde-4.11 | 2 +-
Documentation/package.mask/kde-4.12 | 2 +-
Documentation/package.mask/kde-4.13 | 2 +-
Documentation/package.mask/kde-live | 2 +-
Documentation/package.unmask/kde-4.11 | 2 +-
Documentation/package.unmask/kde-4.12 | 2 +-
Documentation/package.unmask/kde-4.13 | 2 +-
Documentation/package.unmask/kde-live | 2 +-
kde-base/kcontrol/kcontrol-4.12.49.9999.ebuild | 2 +-
kde-base/kcontrol/kcontrol-4.12.90.ebuild | 2 +-
kde-base/kcontrol/kcontrol-4.13.49.9999.ebuild | 2 +-
kde-base/kcontrol/kcontrol-9999.ebuild | 2 +-
kde-base/kdenetwork-meta/kdenetwork-meta-4.12.49.9999.ebuild | 2 +-
kde-base/kdenetwork-meta/kdenetwork-meta-4.12.90.ebuild | 2 +-
kde-base/kdenetwork-meta/kdenetwork-meta-4.13.49.9999.ebuild | 2 +-
kde-base/kdenetwork-meta/kdenetwork-meta-9999.ebuild | 2 +-
kde-base/{kdnssd => zeroconf-ioslave}/metadata.xml | 0
.../zeroconf-ioslave-4.12.49.9999.ebuild} | 4 +++-
.../zeroconf-ioslave-4.12.90.ebuild} | 7 ++++++-
.../zeroconf-ioslave-4.13.49.9999.ebuild} | 4 +++-
.../zeroconf-ioslave-9999.ebuild} | 4 +++-
profiles/updates/1Q-2014 | 1 +
sets/kdenetwork | 2 +-
sets/kdenetwork-4.11 | 2 +-
sets/kdenetwork-4.12 | 2 +-
sets/kdenetwork-4.13 | 2 +-
sets/kdenetwork-live | 2 +-
38 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 cd0a917..d4651ca 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 52e17fa..265e68f 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 45fcc7e..e02c512 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 ec81ad9..d1157ef 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 2894374..c54577d 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 85eb3b3..fae30f4 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 2a58ba0..ef155d5 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 68225cc..59c9609 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 478afd7..bd32ea9 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 a8464da..873caf9 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 7c23cdb..3e7e735 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 7c9f17e..d4af6a1 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 3baa73a..b4fb683 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 681c5b9..2488fe3 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 65baaa2..3907ca5 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 6e10ac3..5aef4a7 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 bbd7685..6273352 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 92b43fa..da78fab 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 65baaa2..3907ca5 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 8a9453e..e46515f 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 a222615..499929f 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 8a9453e..e46515f 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 7c934ed..dec7e2f 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 bf6b425..0fa8e11 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 d47b4a0..19c3c7d 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 bf6b425..0fa8e11 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 bf6b425..0fa8e11 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/metadata.xml b/kde-base/zeroconf-ioslave/metadata.xml
similarity index 100%
rename from kde-base/kdnssd/metadata.xml
rename to kde-base/zeroconf-ioslave/metadata.xml
diff --git a/kde-base/kdnssd/kdnssd-4.12.49.9999.ebuild b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.12.49.9999.ebuild
similarity index 91%
rename from kde-base/kdnssd/kdnssd-4.12.49.9999.ebuild
rename to kde-base/zeroconf-ioslave/zeroconf-ioslave-4.12.49.9999.ebuild
index 0c9c185..f196682 100644
--- a/kde-base/kdnssd/kdnssd-4.12.49.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
similarity index 84%
rename from kde-base/kdnssd/kdnssd-4.12.90.ebuild
rename to kde-base/zeroconf-ioslave/zeroconf-ioslave-4.12.90.ebuild
index dbab3dc..ac53d69 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.13.49.9999.ebuild b/kde-base/zeroconf-ioslave/zeroconf-ioslave-4.13.49.9999.ebuild
similarity index 91%
rename from kde-base/kdnssd/kdnssd-4.13.49.9999.ebuild
rename to kde-base/zeroconf-ioslave/zeroconf-ioslave-4.13.49.9999.ebuild
index 0c9c185..f196682 100644
--- a/kde-base/kdnssd/kdnssd-4.13.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-9999.ebuild b/kde-base/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild
similarity index 91%
rename from kde-base/kdnssd/kdnssd-9999.ebuild
rename to kde-base/zeroconf-ioslave/zeroconf-ioslave-9999.ebuild
index 0c9c185..f196682 100644
--- a/kde-base/kdnssd/kdnssd-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 590c8d7..f77d35a 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 99a3498..dde7553 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 797fab7..0676738 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 3b3c8a5..53d4bb9 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 97406af..8c1e7a3 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 bef61e9..f1b9bff 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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-03-17 12:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-17 12:48 [gentoo-commits] proj/kde:master commit in: kde-base/zeroconf-ioslave/, kde-base/kdnssd/, Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox