[gentoo-commits] proj/kde:master commit in: kde-apps/kamera/

[Michael Palimaka]

commit:     8761e319296c182aa0e986e6d1e1ba4914747f26
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Nov 16 08:35:18 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 15:08:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8761e319

kde-apps/kamera: Frameworks merged to master

Package-Manager: portage-2.2.20.1

 kde-apps/kamera/kamera-15.12.49.9999.ebuild | 24 ++++++++++++++++++------
 kde-apps/kamera/kamera-9999.ebuild          | 24 ++++++++++++++++++------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/kde-apps/kamera/kamera-15.12.49.9999.ebuild 
b/kde-apps/kamera/kamera-15.12.49.9999.ebuild
index 7fee566..9d2a645 100644
--- a/kde-apps/kamera/kamera-15.12.49.9999.ebuild
+++ b/kde-apps/kamera/kamera-15.12.49.9999.ebuild
@@ -4,14 +4,26 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
 
-DESCRIPTION="KDE digital camera manager"
+DESCRIPTION="Plasma integration for gphoto2 cameras"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
-DEPEND="
+COMMON_DEPEND="
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kxmlgui)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep kwidgetsaddons)
+       dev-qt/qtgui:5
+       dev-qt/qtwidgets:5
        media-libs/libgphoto2:=
 "
-RDEPEND="${DEPEND}"
+DEPEND="${COMMON_DEPEND}
+       sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}"

diff --git a/kde-apps/kamera/kamera-9999.ebuild 
b/kde-apps/kamera/kamera-9999.ebuild
index 7fee566..9d2a645 100644
--- a/kde-apps/kamera/kamera-9999.ebuild
+++ b/kde-apps/kamera/kamera-9999.ebuild
@@ -4,14 +4,26 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+KDE_HANDBOOK="true"
+inherit kde5
 
-DESCRIPTION="KDE digital camera manager"
+DESCRIPTION="Plasma integration for gphoto2 cameras"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
-DEPEND="
+COMMON_DEPEND="
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kxmlgui)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep kwidgetsaddons)
+       dev-qt/qtgui:5
+       dev-qt/qtwidgets:5
        media-libs/libgphoto2:=
 "
-RDEPEND="${DEPEND}"
+DEPEND="${COMMON_DEPEND}
+       sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}"