[gentoo-commits] proj/kde:master commit in: media-libs/prison/files/, media-libs/prison/

[Johannes Huber]

commit:     270d5ec2bb4d2a48fcb03ad3ab095863fc128bb4
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 22:15:59 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 22:16:19 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=270d5ec2

[media-libs/prison] Use frameworks branch

Package-Manager: portage-2.2.17

---
 .../prison/files/prison-disable-testapp.patch       | 20 ++++++++++++++++++++
 media-libs/prison/prison-4.9999.ebuild              | 21 ---------------------
 media-libs/prison/prison-9999.ebuild                | 12 ++++++------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/media-libs/prison/files/prison-disable-testapp.patch 
b/media-libs/prison/files/prison-disable-testapp.patch
new file mode 100644
index 0000000..aed8971
--- /dev/null
+++ b/media-libs/prison/files/prison-disable-testapp.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9afe09b..0ed53b6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,13 +24,13 @@ set(QT_REQUIRED_VERSION "5.2.0")
+ 
+ find_package(Qt5Core ${QT_REQUIRED_VERSION} CONFIG  REQUIRED)
+ find_package(Qt5Gui ${QT_REQUIRED_VERSION} CONFIG  REQUIRED)
+-find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG  REQUIRED)
++# find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG  REQUIRED)
+ 
+ if (Qt5_POSITION_INDEPENDENT_CODE)
+   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ endif()
+ 
+ add_subdirectory(lib)
+-add_subdirectory(testapp)
++# add_subdirectory(testapp)
+ 
+ add_subdirectory(tools)

diff --git a/media-libs/prison/prison-4.9999.ebuild 
b/media-libs/prison/prison-4.9999.ebuild
deleted file mode 100644
index 632f7b9..0000000
--- a/media-libs/prison/prison-4.9999.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="QRCode and data matrix barcode library"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/prison";
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="4"
-IUSE="debug"
-
-DEPEND="
-       media-gfx/qrencode
-       media-libs/libdmtx
-"
-RDEPEND="${DEPEND}"

diff --git a/media-libs/prison/prison-9999.ebuild 
b/media-libs/prison/prison-9999.ebuild
index 357d11c..2e42ba3 100644
--- a/media-libs/prison/prison-9999.ebuild
+++ b/media-libs/prison/prison-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+EGIT_BRANCH="frameworks"
 inherit kde5
 
 DESCRIPTION="QRCode and data matrix barcode library"
@@ -14,17 +15,16 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="
+       dev-qt/qtgui:5
        media-gfx/qrencode
        media-libs/libdmtx
 "
-RDEPEND="${DEPEND}
-       !media-libs/prison:4
-"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-testapp.patch" )
 
 src_configure() {
-       local mycmakeargs=(
-               -DQT5_BUILD=TRUE
-       )
+       local mycmakeargs=(-DQT5_BUILD=TRUE)
 
        kde5_src_configure
 }