[patch] Unconflict kdebase-kioslaves from kio-extras

0006-Unconflict-kdebase-kioslaves-from-kio-extras.patch (text/plain), 8.01 KB, created by Matthew Dawson on 2014-08-04 21:12:53 UTC

From 469442d55ec8a7261d53626fe24dedb52a7c30ff Mon Sep 17 00:00:00 2001
From: Matthew Dawson <[e-mail]>
Date: Mon, 4 Aug 2014 16:31:13 -0400
Subject: [PATCH 6/6] Unconflict kdebase-kioslaves from kio-extras.

Add a minimal use flag to kdebase-kioslaves, which allows kio-extras
to install at the expense of compiling software linking directly to
kdebase-kioslave software harder.  Note that no known software in portage
has this conflict.
---
 kde-base/kdebase-kioslaves/Manifest                |  1 +
 .../kdebase-kioslaves-4.13.3.ebuild                | 60 ++++++++++++++++++++++
 .../kdebase-kioslaves-4.13.97.ebuild               | 11 +++-
 .../kdebase-kioslaves-4.14.49.9999.ebuild          | 11 +++-
 .../kdebase-kioslaves-4.9999.ebuild                | 11 +++-
 kde-base/kio-extras/kio-extras-5.0.0.ebuild        |  2 +-
 kde-base/kio-extras/kio-extras-5.0.9999.ebuild     |  2 +-
 kde-base/kio-extras/kio-extras-9999.ebuild         |  2 +-
 8 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.3.ebuild

diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index 604fa04..7604764 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1 +1,2 @@
+DIST kde-runtime-4.13.3.tar.xz 7864064 SHA256 d35dbf930d212e86154e87e3566797827af1ed666099e5d5df8df76b874318f0 SHA512 785f6d392e7d573487e38316976eb64061bba417ec68edff6e1aad1499f5932c15db3ee21daf357fcb5be72c13fb658f7359dbc493c4214df6b2d34072dacfb5 WHIRLPOOL 5126ef7fa4baeca84d4876a662d4ad97336b696f43d7c03c2c44734b2ba7fdc82b2552a98ec7e59686153c02ddcd43e793e84fd6de9fcc71a17bfa74dc2e2fb5
 DIST kde-runtime-4.13.97.tar.xz 7864040 SHA256 ea6873074914914aec7d3349e4f34e87f1524c97187799856b086aedb647d0ee SHA512 c6c611491bf421b87eed92c589d0520787884ef5d81e5ba0aaa0138cf0b3e4df99b6f2509a2a9c69dadcf60d4c155f7ab844a7ed212192184b3e615fda3e57f9 WHIRLPOOL a18a6b47ced89760e12e1ff4d7832742696d527884315117cb01955085745cea3433db5ac582c5aae8dd2cc846400ac605764130eca98bdac3d97c5882afeaf0
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.3.ebuild
new file mode 100644
index 0000000..a2e7407
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.3.ebuild,v 1.1 2014/07/16 17:40:06 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+IUSE="+bzip2 exif debug lzma minimal openexr samba +sftp"
+
+# tests hang, last checked for 4.2.96
+RESTRICT="test"
+
+DEPEND="
+	virtual/jpeg:0
+	!aqua? ( x11-libs/libXcursor )
+	bzip2? ( app-arch/bzip2 )
+	exif? ( media-gfx/exiv2:= )
+	openexr? ( media-libs/openexr:= )
+	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
+	sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
+	$(add_kdebase_dep kdialog)
+	virtual/ssh
+	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
+"
+
+KMEXTRA="
+	kioexec
+	kdeeject
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SLP=OFF
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with samba)
+		$(cmake-utils_use_with sftp LibSSH)
+	)
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	if use minimal; then
+		rm "${D}"/usr/lib64/libmolletnetwork.so "${D}"/usr/share/config.kcfg/jpegcreatorsettings.kcfg
+		rmdir "${D}"/usr/share/config.kcfg/
+	fi
+}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.97.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.97.ebuild
index df831f2..172b71a 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.97.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.13.97.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-IUSE="+bzip2 exif debug lzma openexr samba +sftp"
+IUSE="+bzip2 exif debug lzma minimal openexr samba +sftp"
 
 # tests hang, last checked for 4.2.96
 RESTRICT="test"
@@ -49,3 +49,12 @@ src_configure() {
 	)
 	kde4-meta_src_configure
 }
+
+src_install() {
+	kde4-meta_src_install
+
+	if use minimal; then
+		rm "${D}"/usr/lib64/libmolletnetwork.so "${D}"/usr/share/config.kcfg/jpegcreatorsettings.kcfg
+		rmdir "${D}"/usr/share/config.kcfg/
+	fi
+}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.49.9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.49.9999.ebuild
index 1a506a4..e1deae5 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.49.9999.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.49.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 KEYWORDS=""
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-IUSE="+bzip2 exif debug lzma openexr samba +sftp"
+IUSE="+bzip2 exif debug lzma minimal openexr samba +sftp"
 
 # tests hang, last checked for 4.2.96
 RESTRICT="test"
@@ -49,3 +49,12 @@ src_configure() {
 	)
 	kde4-meta_src_configure
 }
+
+src_install() {
+	kde4-meta_src_install
+
+	if use minimal; then
+		rm "${D}"/usr/lib64/libmolletnetwork.so "${D}"/usr/share/config.kcfg/jpegcreatorsettings.kcfg
+		rmdir "${D}"/usr/share/config.kcfg/
+	fi
+}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9999.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9999.ebuild
index 1a506a4..e1deae5 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9999.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.9999.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 KEYWORDS=""
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-IUSE="+bzip2 exif debug lzma openexr samba +sftp"
+IUSE="+bzip2 exif debug lzma minimal openexr samba +sftp"
 
 # tests hang, last checked for 4.2.96
 RESTRICT="test"
@@ -49,3 +49,12 @@ src_configure() {
 	)
 	kde4-meta_src_configure
 }
+
+src_install() {
+	kde4-meta_src_install
+
+	if use minimal; then
+		rm "${D}"/usr/lib64/libmolletnetwork.so "${D}"/usr/share/config.kcfg/jpegcreatorsettings.kcfg
+		rmdir "${D}"/usr/share/config.kcfg/
+	fi
+}
diff --git a/kde-base/kio-extras/kio-extras-5.0.0.ebuild b/kde-base/kio-extras/kio-extras-5.0.0.ebuild
index 3bbec8b..80894f8 100644
--- a/kde-base/kio-extras/kio-extras-5.0.0.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.0.0.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
-	!kde-base/kdebase-kioslaves:4
+	!kde-base/kdebase-kioslaves:4[-minimal]
 "
 DEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info
diff --git a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
index 6c3a18d..982f7d1 100644
--- a/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-5.0.9999.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
-	!kde-base/kdebase-kioslaves:4
+	!kde-base/kdebase-kioslaves:4[-minimal]
 "
 DEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info
diff --git a/kde-base/kio-extras/kio-extras-9999.ebuild b/kde-base/kio-extras/kio-extras-9999.ebuild
index 6c3a18d..982f7d1 100644
--- a/kde-base/kio-extras/kio-extras-9999.ebuild
+++ b/kde-base/kio-extras/kio-extras-9999.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kded)
-	!kde-base/kdebase-kioslaves:4
+	!kde-base/kdebase-kioslaves:4[-minimal]
 "
 DEPEND="${COMMON_DEPEND}
 	x11-misc/shared-mime-info
-- 
1.8.5.5