1 |
tomwij 13/12/23 16:57:35 |
2 |
|
3 |
Modified: subsurface-9999.ebuild ChangeLog |
4 |
Added: subsurface-4.0.ebuild |
5 |
Log: |
6 |
Version bump to 4.0, uses Qt 4 now; fixes bug #495098, proxied commit by Martin Gysel (bearsh). |
7 |
|
8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.4 app-misc/subsurface/subsurface-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild?rev=1.4&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild?rev=1.4&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild?r1=1.3&r2=1.4 |
16 |
|
17 |
Index: subsurface-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v |
20 |
retrieving revision 1.3 |
21 |
retrieving revision 1.4 |
22 |
diff -u -r1.3 -r1.4 |
23 |
--- subsurface-9999.ebuild 16 Nov 2013 15:15:16 -0000 1.3 |
24 |
+++ subsurface-9999.ebuild 23 Dec 2013 16:57:35 -0000 1.4 |
25 |
@@ -1,41 +1,43 @@ |
26 |
# Copyright 1999-2013 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.3 2013/11/16 15:15:16 tomwij Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.4 2013/12/23 16:57:35 tomwij Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
|
33 |
if [[ ${PV} = *9999* ]]; then |
34 |
EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git" |
35 |
GIT_ECLASS="git-2" |
36 |
+ KEYWORDS="" |
37 |
+ SRC_URI="" |
38 |
LIBDC_V="0.4.1" |
39 |
else |
40 |
- SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz" |
41 |
+ MY_P=${P/s/S} |
42 |
+ SRC_URI="http://subsurface.hohndel.org/downloads/${MY_P}.tgz https://bitbucket.org/bearsh/bearshlay/downloads/${MY_P}.tgz" |
43 |
KEYWORDS="~amd64 ~x86" |
44 |
LIBDC_V="0.4.1" |
45 |
- S="${WORKDIR}/${P/s/S}" |
46 |
fi |
47 |
|
48 |
-inherit eutils qt4-r2 ${GIT_ECLASS} |
49 |
+PLOCALES="bg_BG da_DK de_CH de_DE es_ES et_EE fi_FI fr_FR he it_IT nb_NO nl_NL |
50 |
+ pl_PL pt_BR pt_PT ru_RU sk_SK sv_SE zh_TW" |
51 |
+ |
52 |
+inherit eutils l10n qt4-r2 ${GIT_ECLASS} |
53 |
|
54 |
DESCRIPTION="An open source dive log program" |
55 |
HOMEPAGE="http://subsurface.hohndel.org" |
56 |
LICENSE="GPL-2" |
57 |
SLOT="0" |
58 |
-IUSE="doc usb" |
59 |
-for LINGUA in ${LINGUAS}; do |
60 |
- IUSE+=" linguas_${LINGUA}" |
61 |
-done |
62 |
+IUSE="debug doc usb" |
63 |
|
64 |
RDEPEND="dev-db/sqlite:3 |
65 |
dev-libs/glib:2 |
66 |
- dev-libs/libxml2:2 |
67 |
- dev-libs/libxslt:0 |
68 |
- dev-libs/libzip:0 |
69 |
+ dev-libs/libxml2 |
70 |
+ dev-libs/libxslt |
71 |
+ dev-libs/libzip |
72 |
dev-qt/qtcore:4 |
73 |
dev-qt/qtgui:4 |
74 |
dev-qt/qtsvg:4 |
75 |
dev-qt/qtwebkit:4 |
76 |
- kde-base/marble:4 |
77 |
+ kde-base/marble |
78 |
" |
79 |
DEPEND="${RDEPEND} |
80 |
>=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?] |
81 |
@@ -50,22 +52,23 @@ |
82 |
git-2_src_unpack |
83 |
else |
84 |
unpack ${A} |
85 |
+ mv ${MY_P}* ${P} || die "failed to mv the files to ${P}" |
86 |
fi |
87 |
} |
88 |
|
89 |
-src_compile() { |
90 |
- emake CC="$(tc-getCC)" |
91 |
- |
92 |
- if use doc; then |
93 |
- cd "Documentation" && emake user-manual.xhtml |
94 |
- fi |
95 |
+rm_trans() { |
96 |
+ rm "${ED}/usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed" |
97 |
} |
98 |
|
99 |
src_install() { |
100 |
qt4-r2_src_install |
101 |
|
102 |
- if use doc; then |
103 |
- mv "${ED}/usr/share/doc/${PN}/"* "${ED}/usr/share/doc/${PF}/". || die "doc mv failed" |
104 |
+ l10n_for_each_disabled_locale_do rm_trans |
105 |
+ |
106 |
+ # this is not a translation but present (no need to die if not present) |
107 |
+ rm "${ED}/usr/share/${PN}/translations/${PN}_source.qm" |
108 |
+ |
109 |
+ if ! use doc; then |
110 |
+ rm -R "${ED}/usr/share/${PN}/Documentation"* || die "rm doc failed" |
111 |
fi |
112 |
- rm -Rf "${ED}/usr/share/doc/${PN}" |
113 |
} |
114 |
|
115 |
|
116 |
|
117 |
1.7 app-misc/subsurface/ChangeLog |
118 |
|
119 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?rev=1.7&view=markup |
120 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?rev=1.7&content-type=text/plain |
121 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?r1=1.6&r2=1.7 |
122 |
|
123 |
Index: ChangeLog |
124 |
=================================================================== |
125 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v |
126 |
retrieving revision 1.6 |
127 |
retrieving revision 1.7 |
128 |
diff -u -r1.6 -r1.7 |
129 |
--- ChangeLog 16 Nov 2013 15:15:16 -0000 1.6 |
130 |
+++ ChangeLog 23 Dec 2013 16:57:35 -0000 1.7 |
131 |
@@ -1,6 +1,13 @@ |
132 |
# ChangeLog for app-misc/subsurface |
133 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
134 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.6 2013/11/16 15:15:16 tomwij Exp $ |
135 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.7 2013/12/23 16:57:35 tomwij Exp $ |
136 |
+ |
137 |
+*subsurface-4.0 (23 Dec 2013) |
138 |
+ |
139 |
+ 23 Dec 2013; Tom Wijsman <TomWij@g.o> +subsurface-4.0.ebuild, |
140 |
+ subsurface-9999.ebuild: |
141 |
+ Version bump to 4.0, uses Qt 4 now; fixes bug #495098, proxied commit by |
142 |
+ Martin Gysel (bearsh). |
143 |
|
144 |
*subsurface-3.1.1 (16 Nov 2013) |
145 |
|
146 |
|
147 |
|
148 |
|
149 |
1.1 app-misc/subsurface/subsurface-4.0.ebuild |
150 |
|
151 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-4.0.ebuild?rev=1.1&view=markup |
152 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-4.0.ebuild?rev=1.1&content-type=text/plain |
153 |
|
154 |
Index: subsurface-4.0.ebuild |
155 |
=================================================================== |
156 |
# Copyright 1999-2013 Gentoo Foundation |
157 |
# Distributed under the terms of the GNU General Public License v2 |
158 |
# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-4.0.ebuild,v 1.1 2013/12/23 16:57:35 tomwij Exp $ |
159 |
|
160 |
EAPI="5" |
161 |
|
162 |
if [[ ${PV} = *9999* ]]; then |
163 |
EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git" |
164 |
GIT_ECLASS="git-2" |
165 |
KEYWORDS="" |
166 |
SRC_URI="" |
167 |
LIBDC_V="0.4.1" |
168 |
else |
169 |
MY_P=${P/s/S} |
170 |
SRC_URI="http://subsurface.hohndel.org/downloads/${MY_P}.tgz https://bitbucket.org/bearsh/bearshlay/downloads/${MY_P}.tgz" |
171 |
KEYWORDS="~amd64 ~x86" |
172 |
LIBDC_V="0.4.1" |
173 |
fi |
174 |
|
175 |
PLOCALES="bg_BG da_DK de_CH de_DE es_ES et_EE fi_FI fr_FR he it_IT nb_NO nl_NL |
176 |
pl_PL pt_BR pt_PT ru_RU sk_SK sv_SE zh_TW" |
177 |
|
178 |
inherit eutils l10n qt4-r2 ${GIT_ECLASS} |
179 |
|
180 |
DESCRIPTION="An open source dive log program" |
181 |
HOMEPAGE="http://subsurface.hohndel.org" |
182 |
LICENSE="GPL-2" |
183 |
SLOT="0" |
184 |
IUSE="debug doc usb" |
185 |
|
186 |
RDEPEND="dev-db/sqlite:3 |
187 |
dev-libs/glib:2 |
188 |
dev-libs/libxml2 |
189 |
dev-libs/libxslt |
190 |
dev-libs/libzip |
191 |
dev-qt/qtcore:4 |
192 |
dev-qt/qtgui:4 |
193 |
dev-qt/qtsvg:4 |
194 |
dev-qt/qtwebkit:4 |
195 |
kde-base/marble |
196 |
" |
197 |
DEPEND="${RDEPEND} |
198 |
>=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?] |
199 |
virtual/pkgconfig |
200 |
doc? ( app-text/asciidoc ) |
201 |
" |
202 |
|
203 |
DOCS="README" |
204 |
|
205 |
src_unpack() { |
206 |
if [[ ${PV} = *9999* ]]; then |
207 |
git-2_src_unpack |
208 |
else |
209 |
unpack ${A} |
210 |
mv ${MY_P}* ${P} || die "failed to mv the files to ${P}" |
211 |
fi |
212 |
} |
213 |
|
214 |
rm_trans() { |
215 |
rm "${ED}/usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed" |
216 |
} |
217 |
|
218 |
src_install() { |
219 |
qt4-r2_src_install |
220 |
|
221 |
l10n_for_each_disabled_locale_do rm_trans |
222 |
|
223 |
# this is not a translation but present (no need to die if not present) |
224 |
rm "${ED}/usr/share/${PN}/translations/${PN}_source.qm" |
225 |
|
226 |
if ! use doc; then |
227 |
rm -R "${ED}/usr/share/${PN}/Documentation"* || die "rm doc failed" |
228 |
fi |
229 |
} |