Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Yixun Lan (dlan)" <dlan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/subsurface: ChangeLog subsurface-9999.ebuild subsurface-4.2.ebuild
Date: Fri, 29 Aug 2014 02:08:58
Message-Id: 20140829020855.2F5BC41F4@oystercatcher.gentoo.org
1 dlan 14/08/29 02:08:55
2
3 Modified: ChangeLog subsurface-9999.ebuild
4 Added: subsurface-4.2.ebuild
5 Log:
6 version bump, requested by maintainer, bug #500158, thanks Martin Gysel (bearsh)
7
8 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)
9
10 Revision Changes Path
11 1.13 app-misc/subsurface/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?rev=1.13&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?rev=1.13&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?r1=1.12&r2=1.13
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v
20 retrieving revision 1.12
21 retrieving revision 1.13
22 diff -u -r1.12 -r1.13
23 --- ChangeLog 12 Mar 2014 10:28:11 -0000 1.12
24 +++ ChangeLog 29 Aug 2014 02:08:55 -0000 1.13
25 @@ -1,6 +1,13 @@
26 # ChangeLog for app-misc/subsurface
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.12 2014/03/12 10:28:11 pinkbyte Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.13 2014/08/29 02:08:55 dlan Exp $
30 +
31 +*subsurface-4.2 (29 Aug 2014)
32 +
33 + 29 Aug 2014; Yixun Lan <dlan@g.o> +subsurface-4.2.ebuild,
34 + subsurface-9999.ebuild:
35 + version bump, requested by maintainer, bug #500158, thanks Martin Gysel
36 + (bearsh)
37
38 12 Mar 2014; Sergey Popov <pinkbyte@g.o> subsurface-9999.ebuild:
39 Add missing dependency on dev-libs/libgit2, wrt bug #503778
40
41
42
43 1.7 app-misc/subsurface/subsurface-9999.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild?rev=1.7&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild?rev=1.7&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild?r1=1.6&r2=1.7
48
49 Index: subsurface-9999.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v
52 retrieving revision 1.6
53 retrieving revision 1.7
54 diff -u -r1.6 -r1.7
55 --- subsurface-9999.ebuild 12 Mar 2014 10:28:11 -0000 1.6
56 +++ subsurface-9999.ebuild 29 Aug 2014 02:08:55 -0000 1.7
57 @@ -1,6 +1,6 @@
58 # Copyright 1999-2014 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.6 2014/03/12 10:28:11 pinkbyte Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.7 2014/08/29 02:08:55 dlan Exp $
62
63 EAPI="5"
64
65 @@ -9,16 +9,17 @@
66 GIT_ECLASS="git-2"
67 KEYWORDS=""
68 SRC_URI=""
69 - LIBDC_V="0.4.1"
70 + LIBDC_V="0.4.2"
71 else
72 MY_P=${P/s/S}
73 SRC_URI="http://subsurface.hohndel.org/downloads/${MY_P}.tgz https://bitbucket.org/bearsh/bearshlay/downloads/${MY_P}.tgz"
74 KEYWORDS="~amd64 ~x86"
75 - LIBDC_V="0.4.1"
76 + LIBDC_V="0.4.2"
77 fi
78
79 -PLOCALES="bg_BG da_DK de_CH de_DE es_ES et_EE fi_FI fr_FR he it_IT nb_NO nl_NL
80 - pl_PL pt_BR pt_PT ru_RU sk_SK sv_SE zh_TW"
81 +PLOCALES="bg_BG da_DK de_CH de_DE el_GR en_GB es_ES et_EE fi_FI fr_FR he hu it_IT
82 + lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sv_SE tr zh_TW
83 +"
84
85 inherit eutils l10n qt4-r2 ${GIT_ECLASS}
86
87 @@ -31,7 +32,7 @@
88 RDEPEND="dev-db/sqlite:3
89 dev-libs/glib:2
90 >=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
91 - dev-libs/libgit2
92 + dev-libs/libgit2:=
93 dev-libs/libxml2
94 dev-libs/libxslt
95 dev-libs/libzip
96 @@ -39,7 +40,7 @@
97 dev-qt/qtgui:4
98 dev-qt/qtsvg:4
99 dev-qt/qtwebkit:4
100 - kde-base/marble
101 + kde-base/marble:4=
102 "
103 DEPEND="${RDEPEND}
104 virtual/pkgconfig
105
106
107
108 1.1 app-misc/subsurface/subsurface-4.2.ebuild
109
110 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-4.2.ebuild?rev=1.1&view=markup
111 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-4.2.ebuild?rev=1.1&content-type=text/plain
112
113 Index: subsurface-4.2.ebuild
114 ===================================================================
115 # Copyright 1999-2014 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 # $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-4.2.ebuild,v 1.1 2014/08/29 02:08:55 dlan Exp $
118
119 EAPI="5"
120
121 if [[ ${PV} = *9999* ]]; then
122 EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git"
123 GIT_ECLASS="git-2"
124 KEYWORDS=""
125 SRC_URI=""
126 LIBDC_V="0.4.2"
127 else
128 MY_P=${P/s/S}
129 SRC_URI="http://subsurface.hohndel.org/downloads/${MY_P}.tgz https://bitbucket.org/bearsh/bearshlay/downloads/${MY_P}.tgz"
130 KEYWORDS="~amd64 ~x86"
131 LIBDC_V="0.4.2"
132 fi
133
134 PLOCALES="bg_BG da_DK de_CH de_DE el_GR en_GB es_ES et_EE fi_FI fr_FR he hu it_IT
135 lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sv_SE tr zh_TW
136 "
137
138 inherit eutils l10n qt4-r2 ${GIT_ECLASS}
139
140 DESCRIPTION="An open source dive log program"
141 HOMEPAGE="http://subsurface.hohndel.org"
142 LICENSE="GPL-2"
143 SLOT="0"
144 IUSE="debug doc usb"
145
146 RDEPEND="dev-db/sqlite:3
147 dev-libs/glib:2
148 >=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
149 dev-libs/libgit2:=
150 dev-libs/libxml2
151 dev-libs/libxslt
152 dev-libs/libzip
153 dev-qt/qtcore:4
154 dev-qt/qtgui:4
155 dev-qt/qtsvg:4
156 dev-qt/qtwebkit:4
157 kde-base/marble:4=
158 "
159 DEPEND="${RDEPEND}
160 virtual/pkgconfig
161 doc? ( app-text/asciidoc )
162 "
163
164 DOCS="README"
165
166 src_unpack() {
167 if [[ ${PV} = *9999* ]]; then
168 git-2_src_unpack
169 else
170 unpack ${A}
171 mv ${MY_P}* ${P} || die "failed to mv the files to ${P}"
172 fi
173 }
174
175 rm_trans() {
176 rm "${ED}/usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed"
177 }
178
179 src_install() {
180 qt4-r2_src_install
181
182 l10n_for_each_disabled_locale_do rm_trans
183
184 # this is not a translation but present (no need to die if not present)
185 rm "${ED}/usr/share/${PN}/translations/${PN}_source.qm"
186
187 if ! use doc; then
188 rm -R "${ED}/usr/share/${PN}/Documentation"* || die "rm doc failed"
189 fi
190 }
Report Message
Find on MARC Find on Google Groups