[gentoo-commits] proj/kde:master commit in: app-text/kbibtex/files/, app-text/kbibtex/

[Johannes Huber]

commit:     7e1fc47c90fd5e7d979f6767a0d25e85e4e0fea5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 26 20:51:56 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 20:51:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7e1fc47c

[app-text/kbibtex] Switch to feature/kf5 branch

Package-Manager: portage-2.2.20

 app-text/kbibtex/files/kbibtex-fix-cmake.patch | 19 +++++++++++++
 app-text/kbibtex/kbibtex-9999.ebuild           | 39 +++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/app-text/kbibtex/files/kbibtex-fix-cmake.patch 
b/app-text/kbibtex/files/kbibtex-fix-cmake.patch
new file mode 100644
index 0000000..9fd7b41
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-fix-cmake.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt   2015-07-26 22:10:03.158276297 +0200
++++ b/CMakeLists.txt   2015-07-26 22:11:22.380277657 +0200
+@@ -45,14 +45,8 @@
+     Network
+ )
+ 
+-find_package(
+-    Qt5 ${QT_MIN_VERSION}
+-    QUIET
+-    CONFIG
+-    COMPONENTS
+-    WebEngineWidgets
+-    WebKitWidgets
+-)
++find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} QUIET CONFIG COMPONENTS)
++find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} QUIET CONFIG COMPONENTS)
+ 
+ find_package(
+     KF5 ${KF5_MIN_VERSION}

diff --git a/app-text/kbibtex/kbibtex-9999.ebuild 
b/app-text/kbibtex/kbibtex-9999.ebuild
index a2b6950..3a69dde 100644
--- a/app-text/kbibtex/kbibtex-9999.ebuild
+++ b/app-text/kbibtex/kbibtex-9999.ebuild
@@ -4,29 +4,54 @@
 
 EAPI=5
 
-inherit versionator kde4-base
+inherit kde5
 
-DESCRIPTION="BibTeX editor for KDE to edit bibliographies used with LaTeX"
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
 HOMEPAGE="http://home.gna.org/kbibtex/";
 if [[ ${PV} != *9999* ]]; then
+       inherit versionator
        SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 
1-2)/${P/_/-}.tar.xz"
        KEYWORDS="~amd64 ~x86"
 else
-       EGIT_BRANCH="master"
+       EGIT_BRANCH="feature/kf5"
        KEYWORDS=""
 fi
 
 LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug"
+IUSE=""
 
 DEPEND="
-       app-text/poppler[qt4]
+       $(add_frameworks_dep kcompletion)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kdelibs4support)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kiconthemes)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep kitemviews)
+       $(add_frameworks_dep kjobwidgets)
+       $(add_frameworks_dep kparts)
+       $(add_frameworks_dep kservice)
+       $(add_frameworks_dep ktextwidgets)
+       $(add_frameworks_dep kwidgetsaddons)
+       $(add_frameworks_dep kxmlgui)
+       app-text/poppler[qt5]
+       dev-libs/icu:=
        dev-libs/libxml2
        dev-libs/libxslt
+       dev-qt/qtdbus:5
+       dev-qt/qtgui:5
+       dev-qt/qtnetwork:5
+       dev-qt/qtwebkit:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtxml:5
        virtual/tex-base
 "
 RDEPEND="${DEPEND}
-       dev-tex/bibtex2html"
+       dev-tex/bibtex2html
+"
+
+PATCHES=( "${FILESDIR}/${PN}-fix-cmake.patch" )
 
 S=${WORKDIR}/${P/_/-}