Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
Date: Sun, 28 Jan 2018 23:19:55
Message-Id: 1517181539.e0effca2fa74d987cc4634553ff8ab59a7ac977e.asturm@gentoo
1 commit: e0effca2fa74d987cc4634553ff8ab59a7ac977e
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 28 19:53:23 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 28 23:18:59 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0effca2
7
8 kde-apps/cantor: Drop 16.12.3
9
10 Closes: https://bugs.gentoo.org/619534
11 Package-Manager: Portage-2.3.20, Repoman-2.3.6
12
13 kde-apps/cantor/Manifest | 1 -
14 kde-apps/cantor/cantor-16.12.3.ebuild | 108 ---------------------
15 kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 ---
16 3 files changed, 122 deletions(-)
17
18 diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
19 index 06520bd2aed..940af934614 100644
20 --- a/kde-apps/cantor/Manifest
21 +++ b/kde-apps/cantor/Manifest
22 @@ -1,3 +1,2 @@
23 -DIST cantor-16.12.3.tar.xz 378460 BLAKE2B 189ab04d6fda6864d1827abbd7689b87f59e784ed838613b8d00c44774b9672afad7456665310cc39d95345c5845b60f44708a28550842d14104948333a1e9af SHA512 e6401d5472797894931b4c1c0a4cda7e900ede0d9c5e7d1b5a2ff518741f7f62a7f6187b5081edb231f47c1de163aa537cc195e381334ed60890eb6c73374768
24 DIST cantor-17.08.3.tar.xz 1062400 BLAKE2B c9ee9ca23679566c7e8b1895a6ef5a332d486f8abea75242529cd5a5f99f506cd1b3dfef5591a6275272a5a0b8441ff9ef1cf8621c236a7357c5391d187e60be SHA512 92d40921b4121e7053381f071eaf08ba2a5bfdd42272ff749db726aa300878561b8079118a0ea61173269abb04fa1cbfeb8dba27da8701ecd2b17876c64a108b
25 DIST cantor-17.12.1.tar.xz 1064476 BLAKE2B 64eb91b1f0f033c5d6d33c21c9077cac1eb3ccfe33f25047dd18af8fec029cf1b5b26c5f68908eb3d12741ea48857639bb38db97748e48a6880993d37568711a SHA512 d15d9699e05a01fe5f376942dd39fdc9f6e8189819d44b11dbadb7ac43638766a233a361d107aa572e16df598eec4e220bfb9740d741d60a10ea7b00bb6fe095
26
27 diff --git a/kde-apps/cantor/cantor-16.12.3.ebuild b/kde-apps/cantor/cantor-16.12.3.ebuild
28 deleted file mode 100644
29 index 14332980db5..00000000000
30 --- a/kde-apps/cantor/cantor-16.12.3.ebuild
31 +++ /dev/null
32 @@ -1,108 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -KDE_HANDBOOK="forceoptional"
39 -KDE_TEST="forceoptional"
40 -PYTHON_COMPAT=( python2_7 )
41 -# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
42 -inherit kde5 python-r1
43 -
44 -DESCRIPTION="Interface for doing mathematics and scientific computing"
45 -HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"
46 -SRC_URI="mirror://kde/Attic/applications/${PV}/src/${P}.tar.xz"
47 -
48 -KEYWORDS="amd64 x86"
49 -IUSE="analitza julia lua postscript python qalculate +R"
50 -
51 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
52 -
53 -# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
54 -# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
55 -DEPEND="
56 - $(add_frameworks_dep karchive)
57 - $(add_frameworks_dep kcompletion)
58 - $(add_frameworks_dep kconfig)
59 - $(add_frameworks_dep kconfigwidgets)
60 - $(add_frameworks_dep kcoreaddons)
61 - $(add_frameworks_dep kcrash)
62 - $(add_frameworks_dep ki18n)
63 - $(add_frameworks_dep kiconthemes)
64 - $(add_frameworks_dep kio)
65 - $(add_frameworks_dep knewstuff)
66 - $(add_frameworks_dep kparts)
67 - $(add_frameworks_dep kpty)
68 - $(add_frameworks_dep ktexteditor)
69 - $(add_frameworks_dep kwidgetsaddons)
70 - $(add_frameworks_dep kxmlgui)
71 - $(add_qt_dep qtgui)
72 - $(add_qt_dep qtprintsupport)
73 - $(add_qt_dep qtsvg)
74 - $(add_qt_dep qtwidgets)
75 - $(add_qt_dep qtxml)
76 - $(add_qt_dep qtxmlpatterns)
77 - analitza? ( $(add_kdeapps_dep analitza) )
78 - julia? ( dev-lang/julia )
79 - lua? ( dev-lang/luajit:2 )
80 - qalculate? (
81 - sci-libs/cln
82 - sci-libs/libqalculate:=
83 - )
84 - postscript? ( app-text/libspectre )
85 - python? ( ${PYTHON_DEPS} )
86 - R? ( dev-lang/R )
87 -"
88 -RDEPEND="${DEPEND}"
89 -
90 -RESTRICT+=" test"
91 -
92 -PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
93 -
94 -pkg_pretend() {
95 - kde5_pkg_pretend
96 -
97 - if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
98 - ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
99 - einfo "You have decided to build ${PN} with no backend."
100 - einfo "To have this application functional, please enable one of the backends via USE flag:"
101 - einfo " analitza, julia, lua, python, qalculate, R"
102 - einfo "Alternatively, install one of these:"
103 - einfo " # emerge sci-mathematics/maxima"
104 - einfo " # emerge sci-mathematics/octave"
105 - einfo
106 - fi
107 -
108 - if ! has_version virtual/latex-base; then
109 - einfo "For LaTeX support:"
110 - einfo " # emerge virtual/latex-base"
111 - fi
112 -}
113 -
114 -pkg_setup() {
115 - use python && python_setup
116 - kde5_pkg_setup
117 -}
118 -
119 -src_prepare() {
120 - kde5_src_prepare
121 -
122 - # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
123 - sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
124 - -i src/backends/CMakeLists.txt || die
125 -}
126 -
127 -src_configure() {
128 - use julia && addpredict /proc/self/mem # bug 602894
129 -
130 - local mycmakeargs=(
131 - $(cmake-utils_use_find_package analitza Analitza5)
132 - $(cmake-utils_use_find_package julia Julia)
133 - $(cmake-utils_use_find_package lua LuaJIT)
134 - $(cmake-utils_use_find_package postscript LibSpectre)
135 - $(cmake-utils_use_find_package python PythonLibs)
136 - $(cmake-utils_use_find_package qalculate Qalculate)
137 - $(cmake-utils_use_find_package R R)
138 - )
139 - kde5_src_configure
140 -}
141
142 diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
143 deleted file mode 100644
144 index 424ca4d15aa..00000000000
145 --- a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
146 +++ /dev/null
147 @@ -1,13 +0,0 @@
148 -diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake
149 -index 6303417..6494884 100644
150 ---- a/cmake/FindR.cmake
151 -+++ b/cmake/FindR.cmake
152 -@@ -31,7 +31,7 @@ IF(R_EXECUTABLE)
153 - OUTPUT_VARIABLE R_INCLUDE_DIR)
154 - ELSE(WIN32)
155 - EXECUTE_PROCESS(
156 -- COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
157 -+ COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR"
158 - OUTPUT_VARIABLE R_INCLUDE_DIR)
159 - ENDIF(WIN32)
160 - ENDIF(NOT R_INCLUDE_DIR)