version bump, requested by maintainer, bug #500158, thanks Martin Gysel (bearsh)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

4 files changed, 110 insertions, 18 deletions

diff --git a/app-misc/subsurface/ChangeLog b/app-misc/subsurface/ChangeLog
index 951de9f5d2f6..52c375120361 100644
--- a/app-misc/subsurface/ChangeLog
+++ b/app-misc/subsurface/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/subsurface
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.12 2014/03/12 10:28:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.13 2014/08/29 02:08:55 dlan Exp $
+
+*subsurface-4.2 (29 Aug 2014)
+
+  29 Aug 2014; Yixun Lan <dlan@gentoo.org> +subsurface-4.2.ebuild,
+  subsurface-9999.ebuild:
+  version bump, requested by maintainer, bug #500158, thanks Martin Gysel
+  (bearsh)
 
   12 Mar 2014; Sergey Popov <pinkbyte@gentoo.org> subsurface-9999.ebuild:
   Add missing dependency on dev-libs/libgit2, wrt bug #503778
diff --git a/app-misc/subsurface/Manifest b/app-misc/subsurface/Manifest
index afc1c022a304..9038d4150a6f 100644
--- a/app-misc/subsurface/Manifest
+++ b/app-misc/subsurface/Manifest
@@ -3,21 +3,29 @@ Hash: SHA256
 
 DIST Subsurface-4.0.3.tgz 2409874 SHA256 07d8da1cb0a73b0f3bd890a9a507ba7e62154dccf738879f570d641180eb5bed SHA512 012c8828b5a8bd8cf0a7293818cf8451c86cea142d9bd7479333b56348062c8136f3521e45ef1cbac9a5b531b415df5a85e39889cf543b996d68f6927ab44945 WHIRLPOOL 041efa79f4ac2dcaddeddda12b7c6b346ae4929a65ab0871f2547bb403d3a8191fa39fbf360b27abecba2d4012701abda771d5d0de12cd2bdbb52f28d4a44060
 DIST Subsurface-4.0.tgz 2365792 SHA256 99b1a9bcc34c720703bf866f1e51b0487e15e8c63ad02dd162596879dcb1a7f6 SHA512 b501c9506fbc591e89635614d08317684160e4bb524dfad248e35134f0ea2f0c044f0a1a11405a2d7b2c2317657049a70363884eb533c3ee30a476b9c85e41de WHIRLPOOL b69f62a47b1e772301887bba6e86978ce8f1669b99642435450823bc01e6d60704723c1fb5eeff0a38915c883c9eadeaf096ec96e4bf4d7d1eff395808f8ba48
+DIST Subsurface-4.2.tgz 5029228 SHA256 eb2d9542c7eb69166adef80effe7202afa17970bf7a0d29811eb4f991b3e2294 SHA512 01c930dd1bf663c23d93e85dcf3071d9b0a4f0cf275e8759ad3bd44a7996f21e1a4d783a63b3d96a8df2dab0627ce4ee76fd194382caafb6aba7fd6c2f9a7d16 WHIRLPOOL 063b979d13fd3d084ef09af36453f01e539d1958c9901fc3a21eb6eeedf2d8e6cda5ff8a5fd905e3023dbe41059400864b780cad506730b82834de6f70fe5444
 DIST subsurface-3.1.1.tar.gz 1143335 SHA256 3bbd490871c3ea476943e320e6d7cebdcaebc393503c32ac811cc52c6dfee17b SHA512 b53cd797f803219449cc497b3486660bf873e5c29b2f4e15653c5ae06e1a1884b1a4e2aa79ed67998539dc0c5fd413b1b19f8ad52d8234f74700575cc577b615 WHIRLPOOL 84e123c2bb7a3529e311b35035f3668d70d8913ba08e1460e8f6e6531403b69c03f5993c01a29c284ac9deb5b2c62a614182b0ed209483735b5236a4bc454083
 EBUILD subsurface-3.1.1.ebuild 2486 SHA256 ff015a885c880dfc20c66b0ab4f37d220e183b7753dd456b444809a499fb03e0 SHA512 a2fedbcceba8a72ac9d8689ae263aff9f79d6069dba418c540b558344da173a07f4078ca730f5cff3f7c8754fba6073ab6d5ae3d471a11c3386bb91a0998409a WHIRLPOOL b31edc2aa1425cd877a3ba833d7365a20e9048ffba2073b63d05d68f631aeb31dd11022de509d94a3937eec4f84a535ee4f865bdf519e440474d9de00bb80b5e
 EBUILD subsurface-4.0.3.ebuild 1754 SHA256 8d1b9da226cdd735063bee2a8aab9ecf704f0882ba6bfc3b6b55a6db2be0595d SHA512 93d1a687603197283da54a21a98150721761aa9ece3c085d61436788b03a47521702023e7f10be4a37ce173e6f3540a123ba8e735d141be3c82a107833ab5827 WHIRLPOOL dcab18c4d272f0b9df48aea06a08d91bd390e2adedd40ebd4caf799556a5787608380657ec3e0d61b7b49da73fb746fd4bac1346d753fd0dd63c132096b3d919
 EBUILD subsurface-4.0.ebuild 1752 SHA256 1f7dd1112251694f9d3f7e29dc0a249afeaa02aababbf2a4274a61651132d959 SHA512 f53d11ef307ff1b8ecb3b3df2459902fddd5cf5079164106e7de85c835a17a64a10c79b8d71f9e7a41f6f7b8cd3eddae9e0f030da14cc92f9ca40551a6cbe0d1 WHIRLPOOL 4cec23ede5fb06077aeb18d54d298f2554d2ede0d516dcc1a50adb795b3745867fc6b253494c27e3334479a000c535f77c36e10865eea7de2a34960901e5657e
-EBUILD subsurface-9999.ebuild 1771 SHA256 2ba9f05e70c867e9c3d28f0fad05369f84137a8163fbb6dd27fcbe2cfc175808 SHA512 e7a81a2919e9ddefa9ba30f7bc1ace9cf66e3b2a3c7e0dead496238e96cf370293d92bfa52e8e75c45d93107b202ca31427c9a748293a3dd9c2d53f75da7088d WHIRLPOOL c01e1cf2e01dd6a725ca8f16c3d14ee8a543b8577091cca15475e8aa1cce51e4562d0e9a69a3b79e4850528470d33ea9817c7346b864da0585f3852408adea62
-MISC ChangeLog 2853 SHA256 23cbd570c457ae84a0e27a44c891d302e5472277ba56b48521151294b6694df9 SHA512 843c508ee690271e654ec9518a708a3648cc3838fa1ebe3a3744f01262d18bfefe2bd881015c225504387fd09b7932a1586094592cdebbc7fabece2e67090466 WHIRLPOOL 7860786f3418a3de978095475f1dbbeb624ac5d16cfb24cb80fa047dabddc64cefe62066366156205a97ece307c0120553f4e4f53a1cacd33613ed9f706b7568
+EBUILD subsurface-4.2.ebuild 1802 SHA256 22c906a742a6b4c5ba970617c5c703433b02d2f23d599119ed9df7f1c140c1b1 SHA512 bba66a03b8a37c228660369bb51e4c60e85731aa9ed8c5737b6c66b4a106c5341b7022bf2363de3401a25fc6f78042c62a48c65c64422d0b30ab33d738e8a638 WHIRLPOOL 5e4191ce04777949727d683acdf28e6e6ea7e190ee9eac8fa2c88950b3f86a6c46c8dc2987463ec3c36d17f0226b3013d3bc2a794157478405bbf808dad014bb
+EBUILD subsurface-9999.ebuild 1803 SHA256 01703c1ba49f32ea9c2115a1488d2171190fa7d671634166855e98af57874613 SHA512 1fe0f2a132f35d1d660ee887faf9b5e4dfe842d6715d0a8b45943390550999a697f19cddcfc4546beee8148f4c094815a9be1308c815c564a263f75ce01b52b3 WHIRLPOOL b380b4ccac852ccc066511392d51b2bb643c6126d4f224ab459b3a6a1f1a3987845615f071c719f4dcf7814be1eaa11506f942aa2a957bc3c34a165abf62d69e
+MISC ChangeLog 3059 SHA256 2914d1852d2ca9e5b923e3ca099e44d7cc1ebc91f14de4dfcfb07009b897f0ae SHA512 c20953bc94d2e4d512cabf36119900131a3e8f554f3f2bc090f95526f019ef7b84e78d3109abeefaef60b48609981417b8b4933193427641064007680cf30b04 WHIRLPOOL 8795ae219b16c3e16a1f86f1ec7e7135afe9a37a29e37d92e3628340445342aff2eb0a10675fdc60c795ea992b3f3136b90eab21b8676083b49134c4f4d2f5e6
 MISC metadata.xml 877 SHA256 eef777face306df6e10a35948414c73e047a3a86bef13832715f690959c15e94 SHA512 256362786674dac62c14b44720dce59f6ab35f7fc864ae8ec09ef58bd09fffbd9274113be9dd38bb298aad6be5366135528855b1ba25ddd1ddcfd45251939ddc WHIRLPOOL 80ebbfe27d119e5a60f18254c640396592cc931c49d0fccc11fcdee332016b5213b38f27169a3a980c358ae037fec93263d9a6e0a90fe7cbb5243d50fe6ec10e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTH/5yAAoJECo/aRed9267cO4H/3xSnWXmvT2AUY2yspNjzq4e
-YlTr7n+l2TMyxmD8VM00w7QPG4/KPA4HhY7Jj/jGoiaBJE6/qWAb/KRC4PVwpIzJ
-YVzfGscvb29GcTkv51jHiFXma3qwJlDHlxRcOV4cSSRY/ucBqZJm5U0juMH2Dnvd
-8QQ4s0b4iwys8oNmnGP8CBtxejyjVBY4BDIaoYVRPJlc8bCheM2PkJh+SnCDFRL9
-9z2Q0+uO6VSFw/6I6747vRzx/oXRpAj/iajHrA7BqkSAbJ3xX1UKO0Jl8zh6MMTs
-QAOAcyeeAMd8QapZbrzAxQ97PtSMtLuKntee7Zl6KYPGLOg8yTeCgv+EbEefqdU=
-=ghxm
+iQIcBAEBCAAGBQJT/+CsAAoJEJIMDbyqvv1V3WAQANlxHbGbSzjvDMyGjhCVfI2a
+2vNpWwyS44pc4+xKcd13uC7JbN87HJLa49nO/TTPncO5TWBceif/Jf7aVxR+memQ
+erVaLLjDmh7J2e2kJzfUIWv4shuBpS7d6Rz0pI+2zCy+dLISLEn9Pb5/PU79Bp7b
+08pLAAVEQ4N8B9AS2U/Lt7l7GV+zjQ2G2OBBBNwnroaCZAR0GLrUzE2es++rwt+O
+uek+xiyANhvQHrnoEh5/z2aB5aBLbM+6Pa0O5msgAJ8iZxGIEYfmc5RqNdpTXE34
+1nEXEXAyi4uEgXyNCyCNSWWkvNwID2+EiBsvhmIRYzain9Hl8VGEq+/qUrHFIpsm
+kTvYr7gs3RfoII3Jw1kFdcw5at9QLxxxc1Qp0S3fV6PlOy0jDmmSI0dFpJdY3lE4
+tRcwelfYKw1g9bsMplFAKUu6rRXw4o1+KeO9lbPeXC81BN+y0OtTx1e72Fany+yY
+CTpMLYaUqUHqId9BMvsXccEym6eyLMAzF8EmkxpdfcEEULL/Ps5K0mi6GP8tDEGA
+ZQPoqtTF1UC+qW1G/2PuPg2IeqlhBbhJA42zKLYOJzQpqeRWGperFDQJv93yzQMr
+PYfCmYghEeBeDBF73uAfRq3AGfuWeFX5CQ1Ia4qMeHbC77QcjymFADSdgNDXaBag
+bqbV0ui2HIfaC0hZI7Wu
+=Mp9u
 -----END PGP SIGNATURE-----
diff --git a/app-misc/subsurface/subsurface-4.2.ebuild b/app-misc/subsurface/subsurface-4.2.ebuild
new file mode 100644
index 000000000000..817048f41716
--- /dev/null
+++ b/app-misc/subsurface/subsurface-4.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-4.2.ebuild,v 1.1 2014/08/29 02:08:55 dlan Exp $
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git"
+	GIT_ECLASS="git-2"
+	KEYWORDS=""
+	SRC_URI=""
+	LIBDC_V="0.4.2"
+else
+	MY_P=${P/s/S}
+	SRC_URI="http://subsurface.hohndel.org/downloads/${MY_P}.tgz https://bitbucket.org/bearsh/bearshlay/downloads/${MY_P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+	LIBDC_V="0.4.2"
+fi
+
+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
+	lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sv_SE tr zh_TW
+"
+
+inherit eutils l10n qt4-r2 ${GIT_ECLASS}
+
+DESCRIPTION="An open source dive log program"
+HOMEPAGE="http://subsurface.hohndel.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc usb"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	>=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
+	dev-libs/libgit2:=
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/libzip
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	kde-base/marble:4=
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-text/asciidoc )
+"
+
+DOCS="README"
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+		mv ${MY_P}* ${P} || die "failed to mv the files to ${P}"
+	fi
+}
+
+rm_trans() {
+	rm "${ED}/usr/share/${PN}/translations/${PN}_${1}.qm" || die "rm ${PN}_${1}.qm failed"
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	l10n_for_each_disabled_locale_do rm_trans
+
+	# this is not a translation but present (no need to die if not present)
+	rm "${ED}/usr/share/${PN}/translations/${PN}_source.qm"
+
+	if ! use doc; then
+		rm -R "${ED}/usr/share/${PN}/Documentation"* || die "rm doc failed"
+	fi
+}
diff --git a/app-misc/subsurface/subsurface-9999.ebuild b/app-misc/subsurface/subsurface-9999.ebuild
index 0d4dc5816eb7..f616b5e883e1 100644
--- a/app-misc/subsurface/subsurface-9999.ebuild
+++ b/app-misc/subsurface/subsurface-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.6 2014/03/12 10:28:11 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.7 2014/08/29 02:08:55 dlan Exp $
 
 EAPI="5"
 
@@ -9,16 +9,17 @@ if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS="git-2"
 	KEYWORDS=""
 	SRC_URI=""
-	LIBDC_V="0.4.1"
+	LIBDC_V="0.4.2"
 else
 	MY_P=${P/s/S}
 	SRC_URI="http://subsurface.hohndel.org/downloads/${MY_P}.tgz https://bitbucket.org/bearsh/bearshlay/downloads/${MY_P}.tgz"
 	KEYWORDS="~amd64 ~x86"
-	LIBDC_V="0.4.1"
+	LIBDC_V="0.4.2"
 fi
 
-PLOCALES="bg_BG da_DK de_CH de_DE es_ES et_EE fi_FI fr_FR he it_IT nb_NO nl_NL
-	pl_PL pt_BR pt_PT ru_RU sk_SK sv_SE zh_TW"
+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
+	lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sv_SE tr zh_TW
+"
 
 inherit eutils l10n qt4-r2 ${GIT_ECLASS}
 
@@ -31,7 +32,7 @@ IUSE="debug doc usb"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/glib:2
 	>=dev-libs/libdivecomputer-${LIBDC_V}[usb?]
-	dev-libs/libgit2
+	dev-libs/libgit2:=
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-libs/libzip
@@ -39,7 +40,7 @@ RDEPEND="dev-db/sqlite:3
 	dev-qt/qtgui:4
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
-	kde-base/marble
+	kde-base/marble:4=
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig