1 |
commit: ba4c5a38588e9202314c548a7b4ff86a51f010c5 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 25 19:38:43 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 26 03:29:33 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4c5a38 |
7 |
|
8 |
app-office/texmaker: Drop old |
9 |
|
10 |
Bug: https://bugs.gentoo.org/653982 |
11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
12 |
|
13 |
app-office/texmaker/Manifest | 1 - |
14 |
.../files/texmaker-4.5-modern-styles.patch | 16 ---- |
15 |
.../texmaker/files/texmaker-4.5-unbundle.patch | 93 ---------------------- |
16 |
app-office/texmaker/texmaker-4.5-r2.ebuild | 84 ------------------- |
17 |
app-office/texmaker/texmaker-4.5-r3.ebuild | 84 ------------------- |
18 |
5 files changed, 278 deletions(-) |
19 |
|
20 |
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest |
21 |
index df727efaa2f..864c6fbfc32 100644 |
22 |
--- a/app-office/texmaker/Manifest |
23 |
+++ b/app-office/texmaker/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST texmaker-4.5.tar.bz2 11287724 BLAKE2B 9138e4765e439419384573aed210b1df30890a1b8f3493e89f85c187bca56791dbdfb4805853dff6335cfeb2fc3ba7a00039927d3476c2c90aaa6d6213ba32b3 SHA512 623ae1496f11e5cd1328b997dbb29ec7188d6c1b256b6370c6fdd4fcda4bfc4b301d29cfa3b2ce529391b8f9913ea4678a6895abfb4fa6f9820e7177c676ab11 |
26 |
DIST texmaker-5.0.tar.bz2 15728938 BLAKE2B 14d0ea9e7f8b5f4b4e40bfdbe706b585215d0df8546aeb5d614c73314f41b3f0d443ccf5d4ddb0d7eab00bf76a358cbd51e14ff21ac15e0f8e89b884f12719df SHA512 2473e0ad701da399f428caf8b067129c069a86d8cc5f1d0993ba53025961f7caab816195495d63788d58dafa7a208ca8fbcebbac118a49b20f3f639ee377a636 |
27 |
|
28 |
diff --git a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch b/app-office/texmaker/files/texmaker-4.5-modern-styles.patch |
29 |
deleted file mode 100644 |
30 |
index 73c3b92f761..00000000000 |
31 |
--- a/app-office/texmaker/files/texmaker-4.5-modern-styles.patch |
32 |
+++ /dev/null |
33 |
@@ -1,16 +0,0 @@ |
34 |
---- a/texmaker.cpp 2014-11-26 09:06:56.000000000 -0300 |
35 |
-+++ b/texmaker.cpp 2015-06-19 20:49:58.801377000 -0300 |
36 |
-@@ -4451,7 +4451,12 @@ |
37 |
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) |
38 |
- if (modern_style) |
39 |
- { |
40 |
--qApp->setStyle(new ManhattanStyle(QLatin1String("fusion"))); |
41 |
-+ if(desktop_env == 1){ |
42 |
-+ if (styles.contains("GTK+")) qApp->setStyle(new ManhattanStyle(QLatin1String("gtkstyle"))); |
43 |
-+ else if (styles.contains("Windows")) qApp->setStyle(new ManhattanStyle(QLatin1String("windows"))); |
44 |
-+ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion"))); |
45 |
-+ } |
46 |
-+ else qApp->setStyle(new ManhattanStyle(QLatin1String("fusion"))); |
47 |
- } |
48 |
- // else |
49 |
- // { |
50 |
|
51 |
diff --git a/app-office/texmaker/files/texmaker-4.5-unbundle.patch b/app-office/texmaker/files/texmaker-4.5-unbundle.patch |
52 |
deleted file mode 100644 |
53 |
index 607b2c8b7e4..00000000000 |
54 |
--- a/app-office/texmaker/files/texmaker-4.5-unbundle.patch |
55 |
+++ /dev/null |
56 |
@@ -1,93 +0,0 @@ |
57 |
-diff --git a/configdialog.cpp b/configdialog.cpp |
58 |
-index dddb11e..9a1aee7 100644 |
59 |
---- a/configdialog.cpp |
60 |
-+++ b/configdialog.cpp |
61 |
-@@ -222,7 +222,7 @@ void ConfigDialog::browseAspell() |
62 |
- QDir spelldir(QCoreApplication::applicationDirPath()); |
63 |
- #else |
64 |
- #ifdef DEBIAN_SPELLDIR |
65 |
--QDir spelldir(PREFIX"/share/myspell/dicts"); |
66 |
-+QDir spelldir(PREFIX"/share/myspell"); |
67 |
- #else |
68 |
- QDir spelldir(PREFIX"/share/texmaker"); |
69 |
- #endif |
70 |
-diff --git a/texmaker.cpp b/texmaker.cpp |
71 |
-index b8a2143..a8bcd46 100644 |
72 |
---- a/texmaker.cpp |
73 |
-+++ b/texmaker.cpp |
74 |
-@@ -2787,7 +2787,7 @@ if (hasDecodingError) |
75 |
- QString dicDir=QCoreApplication::applicationDirPath() + "/"; |
76 |
- #else |
77 |
- #ifdef DEBIAN_SPELLDIR |
78 |
--QString dicDir=PREFIX"/share/myspell/dicts/"; |
79 |
-+QString dicDir=PREFIX"/share/myspell/"; |
80 |
- #else |
81 |
- QString dicDir=PREFIX"/share/texmaker/"; |
82 |
- #endif |
83 |
-diff --git a/texmaker.pro b/texmaker.pro |
84 |
-index 7e9b706..909eb62 100644 |
85 |
---- a/texmaker.pro |
86 |
-+++ b/texmaker.pro |
87 |
-@@ -98,29 +98,6 @@ HEADERS += texmaker.h \ |
88 |
- unicodeview.h \ |
89 |
- quickbeamerdialog.h \ |
90 |
- svnhelper.h \ |
91 |
-- hunspell/affentry.hxx \ |
92 |
-- hunspell/affixmgr.hxx \ |
93 |
-- hunspell/atypes.hxx \ |
94 |
-- hunspell/baseaffix.hxx \ |
95 |
-- hunspell/csutil.hxx \ |
96 |
-- hunspell/dictmgr.hxx \ |
97 |
-- hunspell/hashmgr.hxx \ |
98 |
-- hunspell/htypes.hxx \ |
99 |
-- hunspell/hunspell.hxx \ |
100 |
-- hunspell/hunspell.h \ |
101 |
-- hunspell/langnum.hxx \ |
102 |
-- hunspell/license.hunspell \ |
103 |
-- hunspell/phonet.hxx \ |
104 |
-- hunspell/suggestmgr.hxx \ |
105 |
-- hunspell/license.myspell \ |
106 |
-- hunspell/filemgr.hxx \ |
107 |
-- hunspell/hunzip.hxx \ |
108 |
-- hunspell/replist.hxx \ |
109 |
-- hunspell/w_char.hxx \ |
110 |
-- singleapp/qtlocalpeer.h \ |
111 |
-- singleapp/qtlockedfile.h \ |
112 |
-- singleapp/qtsingleapplication.h \ |
113 |
-- singleapp/qtsinglecoreapplication.h \ |
114 |
- encodingprober/CharDistribution.h \ |
115 |
- encodingprober/ChineseGroupProber.h \ |
116 |
- encodingprober/ctype_test_p.h \ |
117 |
-@@ -210,22 +187,6 @@ SOURCES += main.cpp \ |
118 |
- unicodeview.cpp \ |
119 |
- quickbeamerdialog.cpp \ |
120 |
- svnhelper.cpp \ |
121 |
-- hunspell/affentry.cxx \ |
122 |
-- hunspell/affixmgr.cxx \ |
123 |
-- hunspell/csutil.cxx \ |
124 |
-- hunspell/dictmgr.cxx \ |
125 |
-- hunspell/hashmgr.cxx \ |
126 |
-- hunspell/hunspell.cxx \ |
127 |
-- hunspell/phonet.cxx \ |
128 |
-- hunspell/suggestmgr.cxx \ |
129 |
-- hunspell/utf_info.cxx \ |
130 |
-- hunspell/filemgr.cxx \ |
131 |
-- hunspell/replist.cxx \ |
132 |
-- hunspell/hunzip.cxx \ |
133 |
-- singleapp/qtlocalpeer.cpp \ |
134 |
-- singleapp/qtlockedfile.cpp \ |
135 |
-- singleapp/qtsingleapplication.cpp \ |
136 |
-- singleapp/qtsinglecoreapplication.cpp \ |
137 |
- encodingprober/CharDistribution.cpp \ |
138 |
- encodingprober/ChineseGroupProber.cpp \ |
139 |
- encodingprober/JapaneseGroupProber.cpp \ |
140 |
-@@ -336,8 +297,7 @@ icon.path = $${ICONDIR} |
141 |
- |
142 |
- INSTALLS = target |
143 |
- HEADERS += x11fontdialog.h |
144 |
--SOURCES += x11fontdialog.cpp \ |
145 |
-- singleapp/qtlockedfile_unix.cpp |
146 |
-+SOURCES += x11fontdialog.cpp |
147 |
- FORMS += x11fontdialog.ui |
148 |
- |
149 |
- utilities.files = doc/doc1.png \ |
150 |
|
151 |
diff --git a/app-office/texmaker/texmaker-4.5-r2.ebuild b/app-office/texmaker/texmaker-4.5-r2.ebuild |
152 |
deleted file mode 100644 |
153 |
index 2c65b02c918..00000000000 |
154 |
--- a/app-office/texmaker/texmaker-4.5-r2.ebuild |
155 |
+++ /dev/null |
156 |
@@ -1,84 +0,0 @@ |
157 |
-# Copyright 1999-2018 Gentoo Foundation |
158 |
-# Distributed under the terms of the GNU General Public License v2 |
159 |
- |
160 |
-EAPI=5 |
161 |
- |
162 |
-inherit eutils qmake-utils readme.gentoo |
163 |
- |
164 |
-DESCRIPTION="A nice LaTeX-IDE" |
165 |
-HOMEPAGE="http://www.xm1math.net/texmaker/" |
166 |
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2" |
167 |
- |
168 |
-LICENSE="GPL-2" |
169 |
-SLOT="0" |
170 |
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
171 |
-IUSE="" |
172 |
- |
173 |
-COMMON_DEPEND=" |
174 |
- app-text/hunspell |
175 |
- sys-libs/zlib |
176 |
- x11-libs/libX11 |
177 |
- x11-libs/libXext |
178 |
- app-text/poppler[qt5] |
179 |
- dev-qt/qtconcurrent:5 |
180 |
- dev-qt/qtcore:5 |
181 |
- dev-qt/qtgui:5 |
182 |
- dev-qt/qtnetwork:5 |
183 |
- dev-qt/qtscript:5 |
184 |
- dev-qt/qtsingleapplication[X,qt5] |
185 |
- dev-qt/qtwebkit:5[printsupport] |
186 |
- dev-qt/qtwidgets:5 |
187 |
- dev-qt/qtxml:5 |
188 |
-" |
189 |
-RDEPEND="${COMMON_DEPEND} |
190 |
- app-text/ghostscript-gpl |
191 |
- app-text/psutils |
192 |
- media-libs/netpbm |
193 |
- virtual/latex-base" |
194 |
- |
195 |
-DEPEND="${COMMON_DEPEND} |
196 |
- virtual/pkgconfig" |
197 |
- |
198 |
-PATCHES=( |
199 |
- "${FILESDIR}"/${P}-unbundle.patch |
200 |
- "${FILESDIR}"/${P}-modern-styles.patch |
201 |
- ) |
202 |
- |
203 |
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt ) |
204 |
-HTML_DOCS=( doc/. ) |
205 |
- |
206 |
-src_prepare() { |
207 |
- find singleapp hunspell -delete || die |
208 |
- |
209 |
- epatch "${PATCHES[@]}" |
210 |
- |
211 |
- cat >> ${PN}.pro <<- EOF |
212 |
- exists(texmakerx_my.pri):include(texmakerx_my.pri) |
213 |
- EOF |
214 |
- |
215 |
- cp "${FILESDIR}"/texmakerx_my.pri . || die |
216 |
- |
217 |
- sed \ |
218 |
- -e '/^#include/s:hunspell/::g' \ |
219 |
- -e '/^#include/s:singleapp/::g' \ |
220 |
- -i *.cpp *.h || die |
221 |
- |
222 |
- DOC_CONTENTS="A user manual with many screenshots is available at: |
223 |
- ${EPREFIX}/usr/share/${PN}/usermanual_en.html" |
224 |
-} |
225 |
- |
226 |
-src_configure() { |
227 |
- local myeqmakeargs=( |
228 |
- ${PN}.pro |
229 |
- PREFIX="${EPREFIX}/usr" |
230 |
- DESKTOPDIR="${EPREFIX}/usr/share/applications" |
231 |
- ICONDIR="${EPREFIX}/usr/share/pixmaps" |
232 |
- ) |
233 |
- eqmake5 ${myeqmakeargs[@]} |
234 |
-} |
235 |
- |
236 |
-src_install() { |
237 |
- emake INSTALL_ROOT="${D}" install |
238 |
- einstalldocs |
239 |
- readme.gentoo_create_doc |
240 |
-} |
241 |
|
242 |
diff --git a/app-office/texmaker/texmaker-4.5-r3.ebuild b/app-office/texmaker/texmaker-4.5-r3.ebuild |
243 |
deleted file mode 100644 |
244 |
index 79f1a8da122..00000000000 |
245 |
--- a/app-office/texmaker/texmaker-4.5-r3.ebuild |
246 |
+++ /dev/null |
247 |
@@ -1,84 +0,0 @@ |
248 |
-# Copyright 1999-2018 Gentoo Foundation |
249 |
-# Distributed under the terms of the GNU General Public License v2 |
250 |
- |
251 |
-EAPI=5 |
252 |
- |
253 |
-inherit eutils qmake-utils readme.gentoo-r1 |
254 |
- |
255 |
-DESCRIPTION="A nice LaTeX-IDE" |
256 |
-HOMEPAGE="http://www.xm1math.net/texmaker/" |
257 |
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2" |
258 |
- |
259 |
-LICENSE="GPL-2" |
260 |
-SLOT="0" |
261 |
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
262 |
-IUSE="" |
263 |
- |
264 |
-COMMON_DEPEND=" |
265 |
- app-text/hunspell |
266 |
- sys-libs/zlib |
267 |
- x11-libs/libX11 |
268 |
- x11-libs/libXext |
269 |
- app-text/poppler[qt5] |
270 |
- dev-qt/qtconcurrent:5 |
271 |
- dev-qt/qtcore:5 |
272 |
- dev-qt/qtgui:5 |
273 |
- dev-qt/qtnetwork:5 |
274 |
- dev-qt/qtscript:5 |
275 |
- dev-qt/qtsingleapplication[X,qt5] |
276 |
- dev-qt/qtwebkit:5[printsupport] |
277 |
- dev-qt/qtwidgets:5 |
278 |
- dev-qt/qtxml:5 |
279 |
-" |
280 |
-RDEPEND="${COMMON_DEPEND} |
281 |
- app-text/ghostscript-gpl |
282 |
- app-text/psutils |
283 |
- media-libs/netpbm |
284 |
- virtual/latex-base" |
285 |
- |
286 |
-DEPEND="${COMMON_DEPEND} |
287 |
- virtual/pkgconfig" |
288 |
- |
289 |
-PATCHES=( |
290 |
- "${FILESDIR}"/${P}-unbundle.patch |
291 |
- "${FILESDIR}"/${P}-modern-styles.patch |
292 |
- ) |
293 |
- |
294 |
-DOCS=( utilities/AUTHORS utilities/CHANGELOG.txt ) |
295 |
-HTML_DOCS=( doc/. ) |
296 |
- |
297 |
-src_prepare() { |
298 |
- find singleapp hunspell -delete || die |
299 |
- |
300 |
- epatch "${PATCHES[@]}" |
301 |
- |
302 |
- cat >> ${PN}.pro <<- EOF |
303 |
- exists(texmakerx_my.pri):include(texmakerx_my.pri) |
304 |
- EOF |
305 |
- |
306 |
- cp "${FILESDIR}"/texmakerx_my.pri . || die |
307 |
- |
308 |
- sed \ |
309 |
- -e '/^#include/s:hunspell/::g' \ |
310 |
- -e '/^#include/s:singleapp/::g' \ |
311 |
- -i *.cpp *.h || die |
312 |
- |
313 |
- DOC_CONTENTS="A user manual with many screenshots is available at: |
314 |
- ${EPREFIX}/usr/share/${PN}/usermanual_en.html" |
315 |
-} |
316 |
- |
317 |
-src_configure() { |
318 |
- local myeqmakeargs=( |
319 |
- ${PN}.pro |
320 |
- PREFIX="${EPREFIX}/usr" |
321 |
- DESKTOPDIR="${EPREFIX}/usr/share/applications" |
322 |
- ICONDIR="${EPREFIX}/usr/share/pixmaps" |
323 |
- ) |
324 |
- eqmake5 ${myeqmakeargs[@]} |
325 |
-} |
326 |
- |
327 |
-src_install() { |
328 |
- emake INSTALL_ROOT="${D}" install |
329 |
- einstalldocs |
330 |
- readme.gentoo_create_doc |
331 |
-} |