Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/cantor/
Date: Wed, 30 Mar 2016 18:19:23
Message-Id: 1459361946.04811fd320ec1859d95872782585f1860149eb2a.kensington@gentoo
1 commit: 04811fd320ec1859d95872782585f1860149eb2a
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Wed Mar 30 10:33:54 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 30 18:19:06 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=04811fd3
7
8 kde-apps/cantor: Patch upstreamed
9
10 Package-Manager: portage-2.2.27
11
12 kde-apps/cantor/cantor-16.04.49.9999.ebuild | 9 ---------
13 kde-apps/cantor/cantor-9999.ebuild | 9 ---------
14 2 files changed, 18 deletions(-)
15
16 diff --git a/kde-apps/cantor/cantor-16.04.49.9999.ebuild b/kde-apps/cantor/cantor-16.04.49.9999.ebuild
17 index 3cdcedc..7f99167 100644
18 --- a/kde-apps/cantor/cantor-16.04.49.9999.ebuild
19 +++ b/kde-apps/cantor/cantor-16.04.49.9999.ebuild
20 @@ -56,8 +56,6 @@ DEPEND="${RDEPEND}
21
22 RESTRICT="test"
23
24 -PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" )
25 -
26 pkg_setup() {
27 use python && python_setup
28 kde5_pkg_setup
29 @@ -69,13 +67,6 @@ src_prepare() {
30 # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
31 sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
32 -i src/backends/CMakeLists.txt || die
33 -
34 - if ! use test ; then
35 - sed -e "/add_subdirectory(test)/ s/^/#DONT/" \
36 - -i src/lib/CMakeLists.txt || die
37 - sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
38 - -i src/backends/python3/CMakeLists.txt || die
39 - fi
40 }
41
42 src_configure() {
43
44 diff --git a/kde-apps/cantor/cantor-9999.ebuild b/kde-apps/cantor/cantor-9999.ebuild
45 index 3cdcedc..7f99167 100644
46 --- a/kde-apps/cantor/cantor-9999.ebuild
47 +++ b/kde-apps/cantor/cantor-9999.ebuild
48 @@ -56,8 +56,6 @@ DEPEND="${RDEPEND}
49
50 RESTRICT="test"
51
52 -PATCHES=( "${FILESDIR}/${PN}-15.12.3-tests.patch" )
53 -
54 pkg_setup() {
55 use python && python_setup
56 kde5_pkg_setup
57 @@ -69,13 +67,6 @@ src_prepare() {
58 # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
59 sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
60 -i src/backends/CMakeLists.txt || die
61 -
62 - if ! use test ; then
63 - sed -e "/add_subdirectory(test)/ s/^/#DONT/" \
64 - -i src/lib/CMakeLists.txt || die
65 - sed -e "/add_subdirectory(tests)/ s/^/#DONT/" \
66 - -i src/backends/python3/CMakeLists.txt || die
67 - fi
68 }
69
70 src_configure() {