1 |
commit: 68958558486a65b9d47e5a669bf9df1706aaeb9f |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Aug 10 19:13:16 2019 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Aug 10 19:13:16 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68958558 |
7 |
|
8 |
app-office/lyx: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
12 |
|
13 |
app-office/lyx/Manifest | 1 - |
14 |
app-office/lyx/files/lyx-2.3.0-autotools.patch | 27 ---- |
15 |
app-office/lyx/files/lyx-2.3.0-qt-5.11.patch | 16 --- |
16 |
app-office/lyx/lyx-2.3.0-r1.ebuild | 180 ------------------------- |
17 |
app-office/lyx/lyx-2.3.0.ebuild | 179 ------------------------ |
18 |
5 files changed, 403 deletions(-) |
19 |
|
20 |
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest |
21 |
index 8e43ccfa565..d86b6c2db58 100644 |
22 |
--- a/app-office/lyx/Manifest |
23 |
+++ b/app-office/lyx/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5 |
26 |
DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3 |
27 |
|
28 |
diff --git a/app-office/lyx/files/lyx-2.3.0-autotools.patch b/app-office/lyx/files/lyx-2.3.0-autotools.patch |
29 |
deleted file mode 100644 |
30 |
index 31077ef02a6..00000000000 |
31 |
--- a/app-office/lyx/files/lyx-2.3.0-autotools.patch |
32 |
+++ /dev/null |
33 |
@@ -1,27 +0,0 @@ |
34 |
-Index: INSTALL |
35 |
-=================================================================== |
36 |
---- a/INSTALL (revision 9aa280993f159f065da82d5fac30eb86a6599f4d) |
37 |
-+++ b/INSTALL (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) |
38 |
-@@ -38,5 +38,5 @@ |
39 |
- |
40 |
- If you have checked this out from Git, you need to have: |
41 |
--* automake (supported versions are 1.14--1.15) |
42 |
-+* automake (supported versions are 1.14--1.16) |
43 |
- * autoconf (supported versions are 2.65--2.69) |
44 |
- Then type "./autogen.sh" to build the needed configuration |
45 |
-Index: autogen.sh |
46 |
-=================================================================== |
47 |
---- a/autogen.sh (revision 86ae7dad3fc1cad3744663d0da8034625dc9ffb1) |
48 |
-+++ b/autogen.sh (revision 3abfd72b2720c21eba51bb2338f0b8b835dae720) |
49 |
-@@ -17,9 +17,9 @@ |
50 |
- |
51 |
- case $automake_version in |
52 |
-- *' '1.1[45]*) |
53 |
-+ *' '1.1[456]*) |
54 |
- ;; |
55 |
- *) |
56 |
- echo "This automake version is not supported by LyX." |
57 |
-- echo "LyX only supports automake 1.14 to 1.15." |
58 |
-+ echo "LyX only supports automake 1.14 through 1.16." |
59 |
- exit 1 |
60 |
- ;; |
61 |
|
62 |
diff --git a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch b/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch |
63 |
deleted file mode 100644 |
64 |
index 6f1848142bb..00000000000 |
65 |
--- a/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch |
66 |
+++ /dev/null |
67 |
@@ -1,16 +0,0 @@ |
68 |
---- a/src/frontends/qt4/GuiDocument.cpp 2018-02-25 01:11:18.000000000 +0100 |
69 |
-+++ b/src/frontends/qt4/GuiDocument.cpp 2018-03-30 19:45:47.283928297 +0200 |
70 |
-@@ -68,11 +68,12 @@ |
71 |
- #include "frontends/alert.h" |
72 |
- |
73 |
- #include <QAbstractItemModel> |
74 |
--#include <QHeaderView> |
75 |
-+#include <QButtonGroup> |
76 |
- #include <QColor> |
77 |
- #include <QColorDialog> |
78 |
- #include <QCloseEvent> |
79 |
- #include <QFontDatabase> |
80 |
-+#include <QHeaderView> |
81 |
- #include <QScrollBar> |
82 |
- #include <QTextBoundaryFinder> |
83 |
- #include <QTextCursor> |
84 |
|
85 |
diff --git a/app-office/lyx/lyx-2.3.0-r1.ebuild b/app-office/lyx/lyx-2.3.0-r1.ebuild |
86 |
deleted file mode 100644 |
87 |
index 560ae6538ca..00000000000 |
88 |
--- a/app-office/lyx/lyx-2.3.0-r1.ebuild |
89 |
+++ /dev/null |
90 |
@@ -1,180 +0,0 @@ |
91 |
-# Copyright 1999-2019 Gentoo Authors |
92 |
-# Distributed under the terms of the GNU General Public License v2 |
93 |
- |
94 |
-EAPI=6 |
95 |
- |
96 |
-PYTHON_COMPAT=( python2_7 ) |
97 |
- |
98 |
-MY_P="${P/_}" |
99 |
-inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils |
100 |
- |
101 |
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." |
102 |
-HOMEPAGE="https://www.lyx.org/" |
103 |
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz |
104 |
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz" |
105 |
- |
106 |
-LICENSE="GPL-2" |
107 |
-SLOT="0" |
108 |
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos" |
109 |
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he" |
110 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
111 |
- |
112 |
-RDEPEND="${PYTHON_DEPS} |
113 |
- app-text/mythes |
114 |
- dev-libs/boost:= |
115 |
- dev-qt/qtcore:5 |
116 |
- dev-qt/qtgui:5 |
117 |
- dev-qt/qtsvg:5 |
118 |
- dev-qt/qtwidgets:5 |
119 |
- dev-qt/qtx11extras:5 |
120 |
- dev-texlive/texlive-fontsextra |
121 |
- sys-apps/file |
122 |
- sys-libs/zlib |
123 |
- virtual/imagemagick-tools[png,svg?] |
124 |
- aspell? ( app-text/aspell ) |
125 |
- cups? ( net-print/cups ) |
126 |
- dia? ( app-office/dia ) |
127 |
- docbook? ( app-text/sgmltools-lite ) |
128 |
- dot? ( media-gfx/graphviz ) |
129 |
- enchant? ( app-text/enchant ) |
130 |
- gnumeric? ( app-office/gnumeric ) |
131 |
- html? ( dev-tex/html2latex ) |
132 |
- hunspell? ( app-text/hunspell ) |
133 |
- l10n_he? ( dev-tex/culmus-latex ) |
134 |
- latex? ( |
135 |
- app-text/dvipng |
136 |
- app-text/ghostscript-gpl |
137 |
- app-text/ps2eps |
138 |
- app-text/texlive |
139 |
- dev-tex/chktex |
140 |
- dev-tex/dvipost |
141 |
- dev-texlive/texlive-fontsrecommended |
142 |
- dev-texlive/texlive-latexextra |
143 |
- dev-texlive/texlive-mathscience |
144 |
- dev-texlive/texlive-pictures |
145 |
- dev-texlive/texlive-plaingeneric |
146 |
- || ( |
147 |
- dev-tex/hevea |
148 |
- dev-tex/latex2html |
149 |
- dev-tex/tex4ht[java] |
150 |
- dev-tex/tth |
151 |
- ) |
152 |
- ) |
153 |
- rcs? ( dev-vcs/rcs ) |
154 |
- rtf? ( |
155 |
- app-text/unrtf |
156 |
- dev-tex/html2latex |
157 |
- dev-tex/latex2rtf |
158 |
- ) |
159 |
- subversion? ( dev-vcs/subversion ) |
160 |
- svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) |
161 |
-" |
162 |
-DEPEND="${RDEPEND} |
163 |
- virtual/pkgconfig |
164 |
- dev-qt/qtconcurrent:5 |
165 |
- nls? ( sys-devel/gettext ) |
166 |
-" |
167 |
- |
168 |
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) |
169 |
- |
170 |
-PATCHES=( |
171 |
- "${FILESDIR}"/${P}-python.patch |
172 |
- "${FILESDIR}"/${P}-qt-5.11.patch |
173 |
- "${FILESDIR}"/${P}-autotools.patch |
174 |
-) |
175 |
- |
176 |
-S="${WORKDIR}/${MY_P}" |
177 |
- |
178 |
-FONT_S="${S}/lib/fonts" |
179 |
-FONT_SUFFIX="ttf" |
180 |
- |
181 |
-pkg_setup() { |
182 |
- python-single-r1_pkg_setup |
183 |
- font_pkg_setup |
184 |
-} |
185 |
- |
186 |
-src_prepare() { |
187 |
- default |
188 |
- sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die |
189 |
-} |
190 |
- |
191 |
-src_configure() { |
192 |
- tc-export CXX |
193 |
- #bug 221921 |
194 |
- export VARTEXFONTS=${T}/fonts |
195 |
- |
196 |
- econf \ |
197 |
- $(use_with aspell) \ |
198 |
- $(use_enable debug) \ |
199 |
- $(use_with enchant) \ |
200 |
- $(use_with hunspell) \ |
201 |
- $(use_enable monolithic-build) \ |
202 |
- $(use_enable nls) \ |
203 |
- --enable-qt5 \ |
204 |
- --with-qt-dir=$(qt5_get_libdir)/qt5 \ |
205 |
- --disable-stdlib-debug \ |
206 |
- --without-included-boost \ |
207 |
- --with-packaging=posix |
208 |
-} |
209 |
- |
210 |
-src_install() { |
211 |
- default |
212 |
- |
213 |
- if use l10n_he ; then |
214 |
- echo "\bind_file cua" > "${T}"/hebrew.bind |
215 |
- echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind |
216 |
- |
217 |
- insinto /usr/share/lyx/bind |
218 |
- doins "${T}"/hebrew.bind |
219 |
- fi |
220 |
- |
221 |
- newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png |
222 |
- doicon -s 48 "lib/images/lyx.png" |
223 |
- doicon -s scalable "lib/images/lyx.svg" |
224 |
- |
225 |
- # fix for bug 91108 |
226 |
- if use latex ; then |
227 |
- dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx |
228 |
- fi |
229 |
- |
230 |
- # fonts needed for proper math display, see also bug #15629 |
231 |
- font_src_install |
232 |
- |
233 |
- python_fix_shebang "${ED}"/usr/share/${PN} |
234 |
- |
235 |
- if use hunspell ; then |
236 |
- dosym ../myspell /usr/share/lyx/dicts |
237 |
- dosym ../myspell /usr/share/lyx/thes |
238 |
- fi |
239 |
-} |
240 |
- |
241 |
-pkg_postinst() { |
242 |
- font_pkg_postinst |
243 |
- xdg_icon_cache_update |
244 |
- xdg_desktop_database_update |
245 |
- |
246 |
- # fix for bug 91108 |
247 |
- if use latex ; then |
248 |
- texhash |
249 |
- fi |
250 |
- |
251 |
- # instructions for RTL support. See also bug 168331. |
252 |
- if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then |
253 |
- elog |
254 |
- elog "Enabling RTL support in LyX:" |
255 |
- elog "If you intend to use a RTL language (such as Hebrew or Arabic)" |
256 |
- elog "You must enable RTL support in LyX. To do so start LyX and go to" |
257 |
- elog "Tools->Preferences->Language settings->Language" |
258 |
- elog "and make sure the \"Right-to-left language support\" is checked" |
259 |
- elog |
260 |
- fi |
261 |
-} |
262 |
- |
263 |
-pkg_postrm() { |
264 |
- xdg_icon_cache_update |
265 |
- xdg_desktop_database_update |
266 |
- |
267 |
- if use latex ; then |
268 |
- texhash |
269 |
- fi |
270 |
-} |
271 |
|
272 |
diff --git a/app-office/lyx/lyx-2.3.0.ebuild b/app-office/lyx/lyx-2.3.0.ebuild |
273 |
deleted file mode 100644 |
274 |
index d98d6f051ae..00000000000 |
275 |
--- a/app-office/lyx/lyx-2.3.0.ebuild |
276 |
+++ /dev/null |
277 |
@@ -1,179 +0,0 @@ |
278 |
-# Copyright 1999-2018 Gentoo Foundation |
279 |
-# Distributed under the terms of the GNU General Public License v2 |
280 |
- |
281 |
-EAPI=6 |
282 |
- |
283 |
-PYTHON_COMPAT=( python2_7 ) |
284 |
- |
285 |
-MY_P="${P/_}" |
286 |
-inherit desktop gnome2-utils flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils |
287 |
- |
288 |
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." |
289 |
-HOMEPAGE="https://www.lyx.org/" |
290 |
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz |
291 |
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz" |
292 |
- |
293 |
-LICENSE="GPL-2" |
294 |
-SLOT="0" |
295 |
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos" |
296 |
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he" |
297 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
298 |
- |
299 |
-RDEPEND="${PYTHON_DEPS} |
300 |
- dev-libs/boost:= |
301 |
- dev-qt/qtcore:5 |
302 |
- dev-qt/qtgui:5 |
303 |
- dev-qt/qtsvg:5 |
304 |
- dev-qt/qtwidgets:5 |
305 |
- dev-qt/qtx11extras:5 |
306 |
- dev-texlive/texlive-fontsextra |
307 |
- sys-apps/file |
308 |
- sys-libs/zlib |
309 |
- virtual/imagemagick-tools[png,svg?] |
310 |
- aspell? ( app-text/aspell ) |
311 |
- cups? ( net-print/cups ) |
312 |
- dia? ( app-office/dia ) |
313 |
- docbook? ( app-text/sgmltools-lite ) |
314 |
- dot? ( media-gfx/graphviz ) |
315 |
- enchant? ( app-text/enchant ) |
316 |
- gnumeric? ( app-office/gnumeric ) |
317 |
- html? ( dev-tex/html2latex ) |
318 |
- hunspell? ( app-text/hunspell ) |
319 |
- l10n_he? ( dev-tex/culmus-latex ) |
320 |
- latex? ( |
321 |
- app-text/dvipng |
322 |
- app-text/ghostscript-gpl |
323 |
- app-text/ps2eps |
324 |
- app-text/texlive |
325 |
- dev-tex/chktex |
326 |
- dev-tex/dvipost |
327 |
- dev-texlive/texlive-fontsrecommended |
328 |
- dev-texlive/texlive-latexextra |
329 |
- dev-texlive/texlive-mathscience |
330 |
- dev-texlive/texlive-pictures |
331 |
- dev-texlive/texlive-plaingeneric |
332 |
- || ( |
333 |
- dev-tex/hevea |
334 |
- dev-tex/latex2html |
335 |
- dev-tex/tex4ht[java] |
336 |
- dev-tex/tth |
337 |
- ) |
338 |
- ) |
339 |
- rcs? ( dev-vcs/rcs ) |
340 |
- rtf? ( |
341 |
- app-text/unrtf |
342 |
- dev-tex/html2latex |
343 |
- dev-tex/latex2rtf |
344 |
- ) |
345 |
- subversion? ( dev-vcs/subversion ) |
346 |
- svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) |
347 |
-" |
348 |
-DEPEND="${RDEPEND} |
349 |
- virtual/pkgconfig |
350 |
- dev-qt/qtconcurrent:5 |
351 |
- nls? ( sys-devel/gettext ) |
352 |
-" |
353 |
- |
354 |
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) |
355 |
- |
356 |
-PATCHES=( |
357 |
- "${FILESDIR}"/${P}-python.patch |
358 |
- "${FILESDIR}"/${P}-qt-5.11.patch |
359 |
- "${FILESDIR}"/${P}-autotools.patch |
360 |
-) |
361 |
- |
362 |
-S="${WORKDIR}/${MY_P}" |
363 |
- |
364 |
-FONT_S="${S}/lib/fonts" |
365 |
-FONT_SUFFIX="ttf" |
366 |
- |
367 |
-pkg_setup() { |
368 |
- python-single-r1_pkg_setup |
369 |
- font_pkg_setup |
370 |
-} |
371 |
- |
372 |
-src_prepare() { |
373 |
- default |
374 |
- sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die |
375 |
-} |
376 |
- |
377 |
-src_configure() { |
378 |
- tc-export CXX |
379 |
- #bug 221921 |
380 |
- export VARTEXFONTS=${T}/fonts |
381 |
- |
382 |
- econf \ |
383 |
- $(use_with aspell) \ |
384 |
- $(use_enable debug) \ |
385 |
- $(use_with enchant) \ |
386 |
- $(use_with hunspell) \ |
387 |
- $(use_enable monolithic-build) \ |
388 |
- $(use_enable nls) \ |
389 |
- --enable-qt5 \ |
390 |
- --with-qt-dir=$(qt5_get_libdir)/qt5 \ |
391 |
- --disable-stdlib-debug \ |
392 |
- --without-included-boost \ |
393 |
- --with-packaging=posix |
394 |
-} |
395 |
- |
396 |
-src_install() { |
397 |
- default |
398 |
- |
399 |
- if use l10n_he ; then |
400 |
- echo "\bind_file cua" > "${T}"/hebrew.bind |
401 |
- echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind |
402 |
- |
403 |
- insinto /usr/share/lyx/bind |
404 |
- doins "${T}"/hebrew.bind |
405 |
- fi |
406 |
- |
407 |
- newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png |
408 |
- doicon -s 48 "lib/images/lyx.png" |
409 |
- doicon -s scalable "lib/images/lyx.svg" |
410 |
- |
411 |
- # fix for bug 91108 |
412 |
- if use latex ; then |
413 |
- dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx |
414 |
- fi |
415 |
- |
416 |
- # fonts needed for proper math display, see also bug #15629 |
417 |
- font_src_install |
418 |
- |
419 |
- python_fix_shebang "${ED}"/usr/share/${PN} |
420 |
- |
421 |
- if use hunspell ; then |
422 |
- dosym ../myspell /usr/share/lyx/dicts |
423 |
- dosym ../myspell /usr/share/lyx/thes |
424 |
- fi |
425 |
-} |
426 |
- |
427 |
-pkg_postinst() { |
428 |
- font_pkg_postinst |
429 |
- gnome2_icon_cache_update |
430 |
- xdg_desktop_database_update |
431 |
- |
432 |
- # fix for bug 91108 |
433 |
- if use latex ; then |
434 |
- texhash |
435 |
- fi |
436 |
- |
437 |
- # instructions for RTL support. See also bug 168331. |
438 |
- if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then |
439 |
- elog |
440 |
- elog "Enabling RTL support in LyX:" |
441 |
- elog "If you intend to use a RTL language (such as Hebrew or Arabic)" |
442 |
- elog "You must enable RTL support in LyX. To do so start LyX and go to" |
443 |
- elog "Tools->Preferences->Language settings->Language" |
444 |
- elog "and make sure the \"Right-to-left language support\" is checked" |
445 |
- elog |
446 |
- fi |
447 |
-} |
448 |
- |
449 |
-pkg_postrm() { |
450 |
- gnome2_icon_cache_update |
451 |
- xdg_desktop_database_update |
452 |
- |
453 |
- if use latex ; then |
454 |
- texhash |
455 |
- fi |
456 |
-} |