1 |
commit: 06a00cb506ea38a6749ee5419519c796ca6b6c84 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 26 06:25:46 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 26 15:36:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a00cb5 |
7 |
|
8 |
app-office/lyx: Drop old Qt4-based |
9 |
|
10 |
Bug: https://bugs.gentoo.org/631798 |
11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
12 |
|
13 |
app-office/lyx/Manifest | 1 - |
14 |
app-office/lyx/files/2.1-python.patch | 29 ------ |
15 |
app-office/lyx/lyx-2.2.3-r4.ebuild | 186 ---------------------------------- |
16 |
3 files changed, 216 deletions(-) |
17 |
|
18 |
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest |
19 |
index 5f82bdf6865..0665f4ecf0a 100644 |
20 |
--- a/app-office/lyx/Manifest |
21 |
+++ b/app-office/lyx/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708 |
24 |
DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5 |
25 |
|
26 |
diff --git a/app-office/lyx/files/2.1-python.patch b/app-office/lyx/files/2.1-python.patch |
27 |
deleted file mode 100644 |
28 |
index 5fb21655a69..00000000000 |
29 |
--- a/app-office/lyx/files/2.1-python.patch |
30 |
+++ /dev/null |
31 |
@@ -1,29 +0,0 @@ |
32 |
-diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp |
33 |
-index 97c4f68..8f05e62 100644 |
34 |
---- a/src/graphics/GraphicsConverter.cpp |
35 |
-+++ b/src/graphics/GraphicsConverter.cpp |
36 |
-@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file, |
37 |
- LYXERR(Debug::GRAPHICS, "build_script ... "); |
38 |
- typedef Graph::EdgePath EdgePath; |
39 |
- |
40 |
-- script << "#!/usr/bin/env python\n" |
41 |
-+ script << "#!/usr/bin/env python2\n" |
42 |
- "# -*- coding: utf-8 -*-\n" |
43 |
- "import os, shutil, sys\n\n" |
44 |
- "def unlinkNoThrow(file):\n" |
45 |
-diff --git a/src/support/os.cpp b/src/support/os.cpp |
46 |
-index 8f60c68..2f1cb91 100644 |
47 |
---- a/src/support/os.cpp |
48 |
-+++ b/src/support/os.cpp |
49 |
-@@ -63,9 +63,9 @@ int timeout_min() |
50 |
- string const python(bool reset) |
51 |
- { |
52 |
- // Check whether the first python in PATH is the right one. |
53 |
-- static string command = python2("python -tt"); |
54 |
-+ static string command = python2("python2 -tt"); |
55 |
- if (reset) { |
56 |
-- command = python2("python -tt"); |
57 |
-+ command = python2("python2 -tt"); |
58 |
- } |
59 |
- |
60 |
- if (command.empty()) { |
61 |
|
62 |
diff --git a/app-office/lyx/lyx-2.2.3-r4.ebuild b/app-office/lyx/lyx-2.2.3-r4.ebuild |
63 |
deleted file mode 100644 |
64 |
index 2c715662cfc..00000000000 |
65 |
--- a/app-office/lyx/lyx-2.2.3-r4.ebuild |
66 |
+++ /dev/null |
67 |
@@ -1,186 +0,0 @@ |
68 |
-# Copyright 1999-2018 Gentoo Foundation |
69 |
-# Distributed under the terms of the GNU General Public License v2 |
70 |
- |
71 |
-EAPI=6 |
72 |
- |
73 |
-PYTHON_COMPAT=( python2_7 ) |
74 |
-inherit gnome2-utils xdg-utils flag-o-matic font python-single-r1 qmake-utils toolchain-funcs multilib desktop |
75 |
- |
76 |
-MY_P="${P/_}" |
77 |
- |
78 |
-S="${WORKDIR}/${MY_P}" |
79 |
-FONT_S="${S}/lib/fonts" |
80 |
-FONT_SUFFIX="ttf" |
81 |
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc." |
82 |
-HOMEPAGE="https://www.lyx.org/" |
83 |
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz |
84 |
- ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz" |
85 |
- |
86 |
-LICENSE="GPL-2" |
87 |
-SLOT="0" |
88 |
-KEYWORDS="alpha amd64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos ~x86-macos" |
89 |
-IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls +qt5 rcs rtf subversion svg l10n_he" |
90 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
91 |
- |
92 |
-RDEPEND="${PYTHON_DEPS} |
93 |
- dev-libs/boost:= |
94 |
- dev-texlive/texlive-fontsextra |
95 |
- sys-apps/file |
96 |
- sys-libs/zlib |
97 |
- virtual/imagemagick-tools[png,svg?] |
98 |
- aspell? ( app-text/aspell ) |
99 |
- cups? ( net-print/cups ) |
100 |
- dia? ( app-office/dia ) |
101 |
- docbook? ( app-text/sgmltools-lite ) |
102 |
- dot? ( media-gfx/graphviz ) |
103 |
- enchant? ( app-text/enchant ) |
104 |
- gnumeric? ( app-office/gnumeric ) |
105 |
- html? ( dev-tex/html2latex ) |
106 |
- hunspell? ( app-text/hunspell ) |
107 |
- latex? ( |
108 |
- app-text/dvipng |
109 |
- app-text/ghostscript-gpl |
110 |
- app-text/ps2eps |
111 |
- app-text/texlive |
112 |
- dev-tex/chktex |
113 |
- dev-tex/dvipost |
114 |
- dev-texlive/texlive-fontsrecommended |
115 |
- dev-texlive/texlive-latexextra |
116 |
- dev-texlive/texlive-mathscience |
117 |
- dev-texlive/texlive-pictures |
118 |
- || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra ) |
119 |
- || ( |
120 |
- dev-tex/hevea |
121 |
- dev-tex/latex2html |
122 |
- dev-tex/tex4ht[java] |
123 |
- dev-tex/tth |
124 |
- ) |
125 |
- ) |
126 |
- l10n_he? ( dev-tex/culmus-latex ) |
127 |
- !qt5? ( |
128 |
- dev-qt/qtcore:4 |
129 |
- dev-qt/qtgui:4 |
130 |
- ) |
131 |
- qt5? ( |
132 |
- dev-qt/qtcore:5 |
133 |
- dev-qt/qtgui:5 |
134 |
- dev-qt/qtsvg:5 |
135 |
- dev-qt/qtwidgets:5 |
136 |
- ) |
137 |
- rcs? ( dev-vcs/rcs ) |
138 |
- rtf? ( |
139 |
- app-text/unrtf |
140 |
- dev-tex/html2latex |
141 |
- dev-tex/latex2rtf |
142 |
- ) |
143 |
- subversion? ( dev-vcs/subversion ) |
144 |
- svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) |
145 |
-" |
146 |
-DEPEND="${RDEPEND} |
147 |
- virtual/pkgconfig |
148 |
- nls? ( sys-devel/gettext ) |
149 |
- !qt5? ( dev-qt/qtsvg:4 ) |
150 |
- qt5? ( |
151 |
- dev-qt/qtconcurrent:5 |
152 |
- dev-qt/qtx11extras:5 |
153 |
- ) |
154 |
-" |
155 |
- |
156 |
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING ) |
157 |
- |
158 |
-PATCHES=( "${FILESDIR}"/2.1-python.patch ) |
159 |
- |
160 |
-pkg_setup() { |
161 |
- python-single-r1_pkg_setup |
162 |
- font_pkg_setup |
163 |
-} |
164 |
- |
165 |
-src_prepare() { |
166 |
- default |
167 |
- sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die |
168 |
-} |
169 |
- |
170 |
-src_configure() { |
171 |
- tc-export CXX |
172 |
- #bug 221921 |
173 |
- export VARTEXFONTS=${T}/fonts |
174 |
- |
175 |
- econf \ |
176 |
- $(use_with aspell) \ |
177 |
- $(use_enable debug) \ |
178 |
- $(use_with enchant) \ |
179 |
- $(use_with hunspell) \ |
180 |
- $(use_enable monolithic-build) \ |
181 |
- $(use_enable nls) \ |
182 |
- $(use_enable qt5) \ |
183 |
- --with-qt-dir=$(usex qt5 $(qt5_get_libdir)/qt5 $(qt4_get_libdir)) \ |
184 |
- --disable-stdlib-debug \ |
185 |
- --without-included-boost \ |
186 |
- --with-packaging=posix |
187 |
-} |
188 |
- |
189 |
-src_install() { |
190 |
- default |
191 |
- |
192 |
- if use l10n_he ; then |
193 |
- echo "\bind_file cua" > "${T}"/hebrew.bind |
194 |
- echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind |
195 |
- |
196 |
- insinto /usr/share/lyx/bind |
197 |
- doins "${T}"/hebrew.bind |
198 |
- fi |
199 |
- |
200 |
- newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png |
201 |
- doicon -s 48 "${S}/lib/images/lyx.png" |
202 |
- doicon -s scalable "${S}/lib/images/lyx.svg" |
203 |
- |
204 |
- # fix for bug 91108 |
205 |
- if use latex ; then |
206 |
- dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx |
207 |
- fi |
208 |
- |
209 |
- # fonts needed for proper math display, see also bug #15629 |
210 |
- font_src_install |
211 |
- |
212 |
- python_fix_shebang "${ED}"/usr/share/${PN} |
213 |
- |
214 |
- if use hunspell ; then |
215 |
- dosym ../myspell /usr/share/lyx/dicts |
216 |
- dosym ../myspell /usr/share/lyx/thes |
217 |
- fi |
218 |
-} |
219 |
- |
220 |
-pkg_preinst() { |
221 |
- gnome2_icon_savelist |
222 |
-} |
223 |
- |
224 |
-pkg_postinst() { |
225 |
- font_pkg_postinst |
226 |
- gnome2_icon_cache_update |
227 |
- xdg_desktop_database_update |
228 |
- |
229 |
- # fix for bug 91108 |
230 |
- if use latex ; then |
231 |
- texhash |
232 |
- fi |
233 |
- |
234 |
- # instructions for RTL support. See also bug 168331. |
235 |
- if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then |
236 |
- elog |
237 |
- elog "Enabling RTL support in LyX:" |
238 |
- elog "If you intend to use a RTL language (such as Hebrew or Arabic)" |
239 |
- elog "You must enable RTL support in LyX. To do so start LyX and go to" |
240 |
- elog "Tools->Preferences->Language settings->Language" |
241 |
- elog "and make sure the \"Right-to-left language support\" is checked" |
242 |
- elog |
243 |
- fi |
244 |
-} |
245 |
- |
246 |
-pkg_postrm() { |
247 |
- gnome2_icon_cache_update |
248 |
- xdg_desktop_database_update |
249 |
- |
250 |
- if use latex ; then |
251 |
- texhash |
252 |
- fi |
253 |
-} |