* [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/
@ 2023-12-09 11:59 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-12-09 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 038062582663acf40778e43da08c6489d4379b8b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 9 11:20:51 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 9 11:20:51 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=03806258
net-misc/kio-zeroconf: Set KDE_BLOCK_SLOT5="false"
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
index 16befc13ed..bc8c576f57 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+KDE_BLOCK_SLOT5="false"
KFMIN=5.245.0
QTMIN=6.6.0
inherit ecm gear.kde.org
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/
@ 2024-01-07 22:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-01-07 22:01 UTC (permalink / raw
To: gentoo-commits
commit: ba0a59bffee86328be16b4a63add7e8beadaccbb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 19:28:49 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 21:53:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ba0a59bf
net-misc/kio-zeroconf: Add IUSE kf6compat
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/kio-zeroconf/kio-zeroconf-23.08.49.9999.ebuild | 17 +++++++++++++++--
net-misc/kio-zeroconf/metadata.xml | 4 ++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-23.08.49.9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-23.08.49.9999.ebuild
index 72ad871c0f..19e85576f4 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-23.08.49.9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-23.08.49.9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discover
LICENSE="GPL-2+"
SLOT="5"
KEYWORDS=""
-IUSE=""
+IUSE="kf6compat"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -22,4 +22,17 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ kf6compat? ( net-misc/kio-zeroconf:6 )
+"
+
+src_install() {
+ ecm_src_install
+
+ if use kf6compat; then
+ rm "${D}"/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml \
+ "${D}"/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml \
+ "${D}"/usr/share/remoteview/zeroconf.desktop || die
+ rm -r "${D}"/usr/share/locale || die
+ fi
+}
diff --git a/net-misc/kio-zeroconf/metadata.xml b/net-misc/kio-zeroconf/metadata.xml
index d925f24397..8697c2472c 100644
--- a/net-misc/kio-zeroconf/metadata.xml
+++ b/net-misc/kio-zeroconf/metadata.xml
@@ -7,5 +7,9 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">network/kio-zeroconf</remote-id>
</upstream>
+ <use>
+ <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/
@ 2024-01-07 22:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-01-07 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 58ff84d4922829aa8cae1cff8eedad1c3fddb5d1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 21:39:29 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 21:53:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=58ff84d4
net-misc/kio-zeroconf: Block net-misc/kio-zeroconf:5[-kf6compat(-)]
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/kio-zeroconf/kio-zeroconf-24.02.49.9999.ebuild | 4 +++-
net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.02.49.9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.02.49.9999.ebuild
index d22e70918d..eb43aad063 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.02.49.9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.02.49.9999.ebuild
@@ -22,4 +22,6 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
index d22e70918d..eb43aad063 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
@@ -22,4 +22,6 @@ DEPEND="
>=kde-frameworks/ki18n-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ !${CATEGORY}/${PN}:5[-kf6compat(-)]
+"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/
@ 2024-02-27 22:28 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-02-27 22:28 UTC (permalink / raw
To: gentoo-commits
commit: 240a95c75b55e62cd847a9e8646a97a83be16fe2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 27 22:28:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 27 22:28:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=240a95c7
net-misc/kio-zeroconf: drop 24.01.95
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/kio-zeroconf/kio-zeroconf-24.01.95.ebuild | 27 ----------------------
1 file changed, 27 deletions(-)
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.01.95.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.01.95.ebuild
deleted file mode 100644
index eae7d43709..0000000000
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.01.95.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.249.0
-QTMIN=6.6.2
-inherit ecm gear.kde.org
-
-DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
-
-LICENSE="GPL-2+"
-SLOT="6"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[dbus]
- >=kde-frameworks/kcoreaddons-${KFMIN}:6
- >=kde-frameworks/kdbusaddons-${KFMIN}:6
- >=kde-frameworks/kdnssd-${KFMIN}:6
- >=kde-frameworks/ki18n-${KFMIN}:6
- >=kde-frameworks/kio-${KFMIN}:6
-"
-RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5[-kf6compat(-)]
-"
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/
@ 2024-08-21 21:47 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-08-21 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 9acb40bab1717416daf79223f6ac464f7c858f2a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 20:47:58 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 20:53:49 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9acb40ba
net-misc/kio-zeroconf: RDEPEND on net-misc/kio-zeroconf-common
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/kio-zeroconf/kio-zeroconf-24.07.90.ebuild | 12 +++++++++++-
net-misc/kio-zeroconf/kio-zeroconf-24.08.0.ebuild | 12 +++++++++++-
net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild | 12 +++++++++++-
net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild | 12 +++++++++++-
4 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.07.90.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.07.90.ebuild
index 1a95c5a512..fe3aafc57e 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.07.90.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.07.90.ebuild
@@ -23,5 +23,15 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:6
"
RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5[-kf6compat(-)]
+ >=net-misc/${PN}-common-${PV}
"
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+ /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+)
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.08.0.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.08.0.ebuild
index 1a95c5a512..fe3aafc57e 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.08.0.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.08.0.ebuild
@@ -23,5 +23,15 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:6
"
RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5[-kf6compat(-)]
+ >=net-misc/${PN}-common-${PV}
"
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+ /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+)
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild
index da13e93e85..1b72622faf 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild
@@ -23,5 +23,15 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:6
"
RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5[-kf6compat(-)]
+ >=net-misc/${PN}-common-${PV}
"
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+ /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+)
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
index da13e93e85..1b72622faf 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
@@ -23,5 +23,15 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:6
"
RDEPEND="${DEPEND}
- !${CATEGORY}/${PN}:5[-kf6compat(-)]
+ >=net-misc/${PN}-common-${PV}
"
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+ /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+)
+
+src_prepare() {
+ ecm_src_prepare
+ ecm_punt_po_install
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/
@ 2024-09-01 14:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2024-09-01 14:01 UTC (permalink / raw
To: gentoo-commits
commit: e647753e73f1c00a5a4373b869508e44603f1dd6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 1 13:44:50 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 1 13:54:41 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e647753e
net-misc/kio-zeroconf: Drop zeroconf.desktop and metainfo.xml from install
Bug: https://bugs.gentoo.org/938885
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild | 2 ++
net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild
index 1b72622faf..a75ae65652 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.08.49.9999.ebuild
@@ -29,6 +29,8 @@ RDEPEND="${DEPEND}
# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
ECM_REMOVE_FROM_INSTALL=(
/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+ /usr/share/remoteview/zeroconf.desktop
+ /usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
)
src_prepare() {
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
index 1b72622faf..a75ae65652 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
@@ -29,6 +29,8 @@ RDEPEND="${DEPEND}
# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
ECM_REMOVE_FROM_INSTALL=(
/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+ /usr/share/remoteview/zeroconf.desktop
+ /usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
)
src_prepare() {
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/
@ 2025-02-02 10:28 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2025-02-02 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 53fce69319234d4709b9fe6fccc31ee20c78e69c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 2 10:12:01 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 2 10:12:01 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=53fce693
net-misc/kio-zeroconf: Re-integrate ${PN}-common
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-misc/kio-zeroconf/kio-zeroconf-24.12.49.9999.ebuild | 17 +++--------------
net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild | 17 +++--------------
2 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.12.49.9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.12.49.9999.ebuild
index 91a98d724d..a7a6f11e7d 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-24.12.49.9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.12.49.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,17 +23,6 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:6
"
RDEPEND="${DEPEND}
- >=net-misc/${PN}-common-${PV}
+ !<net-misc/kio-zeroconf-23.08.5-r2:5
+ !net-misc/kio-zeroconf-common
"
-
-# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
- /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
- /usr/share/remoteview/zeroconf.desktop
- /usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
-)
-
-src_prepare() {
- ecm_src_prepare
- ecm_punt_po_install
-}
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
index 400e6664cf..b5efd66cd7 100644
--- a/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
+++ b/net-misc/kio-zeroconf/kio-zeroconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,17 +23,6 @@ DEPEND="
>=kde-frameworks/kio-${KFMIN}:6
"
RDEPEND="${DEPEND}
- >=net-misc/${PN}-common-${PV}
+ !<net-misc/kio-zeroconf-23.08.5-r2:5
+ !net-misc/kio-zeroconf-common
"
-
-# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
-ECM_REMOVE_FROM_INSTALL=(
- /usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
- /usr/share/remoteview/zeroconf.desktop
- /usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
-)
-
-src_prepare() {
- ecm_src_prepare
- ecm_punt_po_install
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-02-02 10:28 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-02 10:28 [gentoo-commits] proj/kde:master commit in: net-misc/kio-zeroconf/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-09-01 14:01 Andreas Sturmlechner
2024-08-21 21:47 Andreas Sturmlechner
2024-02-27 22:28 Sam James
2024-01-07 22:01 Andreas Sturmlechner
2024-01-07 22:01 Andreas Sturmlechner
2023-12-09 11:59 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox