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

[Michael Palimaka]

commit:     3abe4e71537e01294777ae3034f4e23a945ece4c
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 30 13:13:30 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 15:33:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3abe4e71

app-text/kbibtex: kf5 branch merged to master

Package-Manager: portage-2.2.20.1

 app-text/kbibtex/files/kbibtex-fix-cmake.patch | 19 -------------------
 app-text/kbibtex/kbibtex-9999.ebuild           |  5 -----
 2 files changed, 24 deletions(-)

diff --git a/app-text/kbibtex/files/kbibtex-fix-cmake.patch 
b/app-text/kbibtex/files/kbibtex-fix-cmake.patch
deleted file mode 100644
index 9fd7b41..0000000
--- a/app-text/kbibtex/files/kbibtex-fix-cmake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 5324f61..94b3854 100644
--- a/app-text/kbibtex/kbibtex-9999.ebuild
+++ b/app-text/kbibtex/kbibtex-9999.ebuild
@@ -12,9 +12,6 @@ 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="feature/kf5"
-       KEYWORDS=""
 fi
 
 LICENSE="GPL-2"
@@ -52,6 +49,4 @@ RDEPEND="${DEPEND}
        dev-tex/bibtex2html
 "
 
-PATCHES=( "${FILESDIR}/${PN}-fix-cmake.patch" )
-
 S=${WORKDIR}/${P/_/-}