From 53fce69319234d4709b9fe6fccc31ee20c78e69c Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 2 Feb 2025 11:12:01 +0100
Subject: net-misc/kio-zeroconf: Re-integrate ${PN}-common

Signed-off-by: Andreas Sturmlechner <asturm@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(-)

(limited to 'net-misc')

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 91a98d724da..a7a6f11e7dc 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 400e6664cf9..b5efd66cd71 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
-}
-- 
cgit v1.2.3