commit: 30deeed8e9aea93364cf6a964fb5a0069df7c572
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Feb 17 20:56:29 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Feb 18 06:39:15 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=30deeed8
[kde-apps/print-manager] Frameworks merged to master
Drop unused frameworks: kcompletion, kdelibs4support
Package-Manager: portage-2.2.17
---
kde-apps/print-manager/print-manager-5.9999.ebuild | 55 ----------------------
kde-apps/print-manager/print-manager-9999.ebuild | 27 ++++++++---
2 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/kde-apps/print-manager/print-manager-5.9999.ebuild
b/kde-apps/print-manager/print-manager-5.9999.ebuild
deleted file mode 100644
index e997897..0000000
--- a/kde-apps/print-manager/print-manager-5.9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Manage print jobs and printers in KDE"
-KEYWORDS=""
-IUSE="gtk"
-
-DEPEND="
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdelibs4support)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- net-print/cups
-"
-RDEPEND="${DEPEND}
- !kde-base/print-manager:4
- gtk? ( app-admin/system-config-printer-gnome )
-"
-
-pkg_postinst(){
- if ! use gtk ; then
- ewarn
- ewarn "By switching off \"gtk\" USE flag, you have chosen to do
without"
- ewarn "an important, though optional, runtime dependency:"
- ewarn
- ewarn "app-admin/system-config-printer-gnome"
- ewarn
- ewarn "${PN} will work nevertheless, but is going to be less
comfortable"
- ewarn "and will show the following error status during runtime:"
- ewarn
- ewarn "\"Failed to group devices: 'The name
org.fedoraproject.Config.Printing"
- ewarn "was not provided by any .service files'\""
- ewarn
- fi
-}
diff --git a/kde-apps/print-manager/print-manager-9999.ebuild
b/kde-apps/print-manager/print-manager-9999.ebuild
index aab71a8..17efe00 100644
--- a/kde-apps/print-manager/print-manager-9999.ebuild
+++ b/kde-apps/print-manager/print-manager-9999.ebuild
@@ -4,19 +4,32 @@
EAPI=5
-inherit kde4-base
+inherit kde5
-DESCRIPTION="Manage print jobs and printers in KDE"
+DESCRIPTION="Manage print jobs and printers in Plasma"
KEYWORDS=""
-IUSE="debug +gtk"
+IUSE="gtk"
DEPEND="
- >=net-print/cups-1.5.0[dbus]
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ net-print/cups
"
RDEPEND="${DEPEND}
- !kde-base/printer-applet:4
- !kde-base/system-config-printer-kde:4
- !kde-misc/print-manager
gtk? ( app-admin/system-config-printer-gnome )
"
