3 files changed, 92 insertions, 8 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/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