Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: app-text/kbibtex/, app-text/kbibtex/files/
Date: Mon, 31 Aug 2015 15:33:54
Message-Id: 1441035215.3abe4e71537e01294777ae3034f4e23a945ece4c.kensington@gentoo
1 commit: 3abe4e71537e01294777ae3034f4e23a945ece4c
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sun Aug 30 13:13:30 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 31 15:33:35 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3abe4e71
7
8 app-text/kbibtex: kf5 branch merged to master
9
10 Package-Manager: portage-2.2.20.1
11
12 app-text/kbibtex/files/kbibtex-fix-cmake.patch | 19 -------------------
13 app-text/kbibtex/kbibtex-9999.ebuild | 5 -----
14 2 files changed, 24 deletions(-)
15
16 diff --git a/app-text/kbibtex/files/kbibtex-fix-cmake.patch b/app-text/kbibtex/files/kbibtex-fix-cmake.patch
17 deleted file mode 100644
18 index 9fd7b41..0000000
19 --- a/app-text/kbibtex/files/kbibtex-fix-cmake.patch
20 +++ /dev/null
21 @@ -1,19 +0,0 @@
22 ---- a/CMakeLists.txt 2015-07-26 22:10:03.158276297 +0200
23 -+++ b/CMakeLists.txt 2015-07-26 22:11:22.380277657 +0200
24 -@@ -45,14 +45,8 @@
25 - Network
26 - )
27 -
28 --find_package(
29 -- Qt5 ${QT_MIN_VERSION}
30 -- QUIET
31 -- CONFIG
32 -- COMPONENTS
33 -- WebEngineWidgets
34 -- WebKitWidgets
35 --)
36 -+find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} QUIET CONFIG COMPONENTS)
37 -+find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} QUIET CONFIG COMPONENTS)
38 -
39 - find_package(
40 - KF5 ${KF5_MIN_VERSION}
41
42 diff --git a/app-text/kbibtex/kbibtex-9999.ebuild b/app-text/kbibtex/kbibtex-9999.ebuild
43 index 5324f61..94b3854 100644
44 --- a/app-text/kbibtex/kbibtex-9999.ebuild
45 +++ b/app-text/kbibtex/kbibtex-9999.ebuild
46 @@ -12,9 +12,6 @@ if [[ ${PV} != *9999* ]]; then
47 inherit versionator
48 SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
49 KEYWORDS="~amd64 ~x86"
50 -else
51 - EGIT_BRANCH="feature/kf5"
52 - KEYWORDS=""
53 fi
54
55 LICENSE="GPL-2"
56 @@ -52,6 +49,4 @@ RDEPEND="${DEPEND}
57 dev-tex/bibtex2html
58 "
59
60 -PATCHES=( "${FILESDIR}/${PN}-fix-cmake.patch" )
61 -
62 S=${WORKDIR}/${P/_/-}