Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/texstudio/files/, app-office/texstudio/
Date: Mon, 10 Oct 2016 22:35:43
Message-Id: 1476138870.70450d2900eb9ba60fe16c4c53f6f9f11d5fdefd.mrueg@gentoo
1 commit: 70450d2900eb9ba60fe16c4c53f6f9f11d5fdefd
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 10 22:34:30 2016 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 10 22:34:30 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70450d29
7
8 app-office/texstudio: Remove old
9
10 Package-Manager: portage-2.3.1
11
12 app-office/texstudio/Manifest | 1 -
13 .../files/texstudio-2.5-viewers-use-xdg-open.patch | 42 --------
14 .../texstudio/files/texstudio-2.8.2-desktop.patch | 22 ----
15 app-office/texstudio/texstudio-2.10.2.ebuild | 113 ---------------------
16 4 files changed, 178 deletions(-)
17
18 diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest
19 index 291a661..ecf563f 100644
20 --- a/app-office/texstudio/Manifest
21 +++ b/app-office/texstudio/Manifest
22 @@ -1,4 +1,3 @@
23 -DIST texstudio-2.10.2.tar.gz 25669897 SHA256 0cf97c752ba30aba8a0536492893b71ed454c62e6a6e34cff65a8a4eeb308e64 SHA512 3c29b2ef0bb8ed290c66802ffc9419f39d5ff5c4905523ee3adb7177f1159739639d5e4eb9d038fd28472c6618e68b7839b9c816da462dd24046691ebcd9796c WHIRLPOOL e66da4486fa17aa940557af75a098cd03eeaefabe2bf16d38589a37fd065c313c911f76d44b7b81054ae8460a93da323d3472139445fa67df21bb661143ba607
24 DIST texstudio-2.10.8.tar.gz 26003322 SHA256 0a569544ceb0ff92e52ed57a34e8eb12e7a16eef1209320737aef5d5b81b3404 SHA512 3faa278f785dc1de34c5a502191430989f078d5301da93f1df13d70287e01322618fd146e1ee7c4c6714233a53affdbb92e3e67f5717b978d2fbe126c59da949 WHIRLPOOL 626d56e68df767e1b02a34f2abe9316c2d237d6e368294d7389c46394f3735d633bb0019da78da3194699cf3fbc3d257c489bbc63829b04199c681c11a688e8f
25 DIST texstudio-2.11.0.tar.gz 26263749 SHA256 170e6d68952251e8c64589b0d147cb7692005e135cc6fc14579c6fd593f54307 SHA512 773010bfa25de17e4deb0ae32325c26b5ff737bea837fba34fde28ec00d8e9a4d2c816d1f431c3c4e5a506354d1ff541e6b74bd36323e0fd3f20f4d389aab3be WHIRLPOOL 3f7b6feeeccef41f78da14a5f483a2f435ccc575b9ace3c4a3ab774426cd6ff5811ad662a5e210b7ae5223435b509392c634cb30e547535fe475b83e0ee84142
26 DIST texstudio-2.11.2.tar.gz 24143941 SHA256 d88ecfef92e38710563294079645fbfa19829ceebd9a109a68f6959c51ae94ad SHA512 774cea12339b19c7d33d034e75386415b89c59de1e149f3973bd0cf789a28c4cb1cdb026a897228303071dc05f985d4798924c6b253e964d6bdced877ab9f1e7 WHIRLPOOL 8b54419db50640abb0fc03ce3b1206c01bc1d245d0a5b605ccc44cfd6e2821651a18a00bfef7622f6c47bf79da23315704b50febe645373feb161f6f68d809a9
27
28 diff --git a/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch b/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
29 deleted file mode 100644
30 index 667ee31..00000000
31 --- a/app-office/texstudio/files/texstudio-2.5-viewers-use-xdg-open.patch
32 +++ /dev/null
33 @@ -1,42 +0,0 @@
34 -From f9a633402c81b7c252e33c0d9386ba4b48fcde7c Mon Sep 17 00:00:00 2001
35 -From: hannes <hannes@×××××××××××××.org>
36 -Date: Sun, 9 Sep 2012 10:56:06 +0200
37 -Subject: [PATCH] viewer
38 -
39 ----
40 - buildmanager.cpp | 18 +++---------------
41 - 1 file changed, 3 insertions(+), 15 deletions(-)
42 -
43 -diff --git buildmanager.cpp buildmanager.cpp
44 -index ac7027a..ac913d0 100644
45 ---- buildmanager.cpp
46 -+++ buildmanager.cpp
47 -@@ -762,25 +762,13 @@
48 - // xdvi %.dvi -sourceposition @:%.tex
49 - // kdvi "file:%.dvi#src:@ %.tex"
50 - QString getCommandLineViewDvi(){
51 -- switch (x11desktop_env()) {
52 -- case 3: return "kdvi %.dvi > /dev/null";
53 -- case 4: return "okular %.dvi > /dev/null";
54 -- default:return "evince %.dvi > /dev/null";
55 -- }
56 -+ return "xdg-open %.dvi > /dev/null";
57 - };
58 - QString getCommandLineViewPs(){
59 -- switch (x11desktop_env()) {
60 -- case 3: return "kghostview %.ps > /dev/null";
61 -- case 4: return "okular %.ps > /dev/null";
62 -- default: return "evince %.ps > /dev/null";
63 -- };
64 -+ return "xdg-open %.ps > /dev/null";
65 - }
66 - QString getCommandLineViewPdfExternal(){
67 -- switch (x11desktop_env()) {
68 -- case 3: return "kpdf %.pdf > /dev/null";
69 -- case 4: return "okular %.pdf > /dev/null";
70 -- default: return "evince %.pdf > /dev/null";
71 -- };
72 -+ return "xdg-open %.pdf > /dev/null";
73 - }
74 - QString getCommandLineGhostscript(){ return ""; }
75 -
76
77 diff --git a/app-office/texstudio/files/texstudio-2.8.2-desktop.patch b/app-office/texstudio/files/texstudio-2.8.2-desktop.patch
78 deleted file mode 100644
79 index d464e8a..00000000
80 --- a/app-office/texstudio/files/texstudio-2.8.2-desktop.patch
81 +++ /dev/null
82 @@ -1,22 +0,0 @@
83 - utilities/texstudio.desktop | 3 +--
84 - 1 file changed, 1 insertion(+), 2 deletions(-)
85 -
86 -diff --git a/utilities/texstudio.desktop b/utilities/texstudio.desktop
87 -index 199255f..9c95afd 100644
88 ---- a/utilities/texstudio.desktop
89 -+++ b/utilities/texstudio.desktop
90 -@@ -1,13 +1,12 @@
91 - [Desktop Entry]
92 - Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc;
93 --Encoding=UTF-8
94 - Exec=texstudio %F
95 - GenericName=LaTeX Editor
96 - GenericName[fr]=Editeur LaTeX
97 - Comment=LaTeX development environment
98 - Comment[fr]=Environnement de développement LaTeX
99 - Icon=texstudio
100 --MimeType=text/x-tex;
101 -+MimeType=text/X-tex;
102 - Name=TeXstudio
103 - StartupNotify=false
104 - Terminal=false
105
106 diff --git a/app-office/texstudio/texstudio-2.10.2.ebuild b/app-office/texstudio/texstudio-2.10.2.ebuild
107 deleted file mode 100644
108 index d8a74e0..00000000
109 --- a/app-office/texstudio/texstudio-2.10.2.ebuild
110 +++ /dev/null
111 @@ -1,113 +0,0 @@
112 -# Copyright 1999-2015 Gentoo Foundation
113 -# Distributed under the terms of the GNU General Public License v2
114 -# $Id$
115 -
116 -EAPI=5
117 -
118 -inherit fdo-mime prefix qmake-utils
119 -
120 -DESCRIPTION="Free cross-platform LaTeX editor (fork from texmakerX)"
121 -HOMEPAGE="http://texstudio.sourceforge.net/"
122 -SRC_URI="mirror://sourceforge/${PN}/${PN}/TeXstudio%20${PV}/${P}.tar.gz"
123 -
124 -LICENSE="GPL-2"
125 -SLOT="0"
126 -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
127 -IUSE="video qt4 +qt5"
128 -
129 -REQUIRED_USE="^^ ( qt4 qt5 )"
130 -
131 -COMMON_DEPEND="
132 - app-text/hunspell
133 - app-text/poppler:=[qt4?,qt5?]
134 - >=dev-libs/quazip-0.7.1[qt4?,qt5?]
135 - dev-qt/qtsingleapplication[X,qt4?,qt5?]
136 - x11-libs/libX11
137 - x11-libs/libXext
138 - qt4? (
139 - dev-qt/designer:4
140 - >=dev-qt/qtgui-4.8.5:4
141 - >=dev-qt/qtcore-4.6.1:4
142 - >=dev-qt/qtscript-4.6.1:4
143 - >=dev-qt/qtsvg-4.6.1:4
144 - >=dev-qt/qttest-4.6.1:4
145 - )
146 - qt5? (
147 - dev-qt/designer:5
148 - dev-qt/qtcore:5
149 - dev-qt/qtconcurrent:5
150 - dev-qt/qtgui:5
151 - dev-qt/qtnetwork:5
152 - dev-qt/qtprintsupport:5
153 - dev-qt/qtscript:5
154 - dev-qt/qtsvg:5
155 - dev-qt/qttest:5
156 - dev-qt/qtwidgets:5
157 - dev-qt/qtxml:5
158 - )
159 - video? ( media-libs/phonon[qt4?,qt5?] )"
160 -RDEPEND="${COMMON_DEPEND}
161 - virtual/latex-base
162 - app-text/psutils
163 - app-text/ghostscript-gpl
164 - media-libs/netpbm"
165 -DEPEND="${COMMON_DEPEND}
166 - virtual/pkgconfig"
167 -
168 -S="${WORKDIR}"/${P/-/}
169 -
170 -PATCHES=(
171 - "${FILESDIR}"/${PN}-2.6.4-hunspell-quazip.patch
172 - "${FILESDIR}"/${PN}-2.8.2-desktop.patch
173 -# Get it from fedora
174 - "${FILESDIR}"/${PN}-2.5-viewers-use-xdg-open.patch
175 - )
176 -
177 -src_prepare() {
178 - find hunspell quazip utilities/poppler-data qtsingleapplication -delete || die
179 -
180 - if use video; then
181 - sed "/^PHONON/s:$:true:g" -i ${PN}.pro || die
182 - fi
183 -
184 - sed \
185 - -e '/hunspell.pri/d' \
186 - -e '/quazip.pri/d' \
187 - -e '/qtsingleapplication.pri/d' \
188 - -e '/QUAZIP_STATIC/d' \
189 - -i ${PN}.pro || die
190 -
191 -# cat >> ${PN}.pro <<- EOF
192 -# exists(texmakerx_my.pri):include(texmakerx_my.pri)
193 -# EOF
194 -
195 - cp "${FILESDIR}"/texmakerx_my.pri ${PN}.pri || die
196 - eprefixify ${PN}.pri
197 -
198 - epatch ${PATCHES[@]}
199 -}
200 -
201 -src_configure() {
202 - if use qt5; then
203 - eqmake5
204 - else
205 - eqmake4
206 - fi
207 -}
208 -
209 -src_install() {
210 - local i
211 - for i in 16x16 22x22 32x32 48x48 64x64 128x128; do
212 - insinto /usr/share/icons/hicolor/${i}
213 - newins utilities/${PN}${i}.png ${PN}.png
214 - done
215 - emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
216 -}
217 -
218 -pkg_postinst() {
219 - fdo-mime_desktop_database_update
220 -}
221 -
222 -pkg_postrm() {
223 - fdo-mime_desktop_database_update
224 -}