Version bump to 3.1.1, added sqlite dependency and other minor changes; fixes bug #491028. Merged 3.1.1 version bump fixes and move to qt4 from bug #489394 into an updated 9999 ebuild, which fixes that bug. Proxied commit for Martin Gysel (bearsh).

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 154 insertions, 75 deletions

diff --git a/app-misc/subsurface/ChangeLog b/app-misc/subsurface/ChangeLog
index 837b1830cc63..acef3013927c 100644
--- a/app-misc/subsurface/ChangeLog
+++ b/app-misc/subsurface/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/subsurface
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.5 2013/11/11 18:30:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.6 2013/11/16 15:15:16 tomwij Exp $
+
+*subsurface-3.1.1 (16 Nov 2013)
+
+  16 Nov 2013; Tom Wijsman <TomWij@gentoo.org> +subsurface-3.1.1.ebuild,
+  subsurface-9999.ebuild:
+  Version bump to 3.1.1, added sqlite dependency and other minor changes; fixes
+  bug #491028. Merged 3.1.1 version bump fixes and move to qt4 from bug #489394
+  into an updated 9999 ebuild, which fixes that bug. Proxied commit for Martin
+  Gysel (bearsh).
 
   11 Nov 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Updated Aaron Bauman's e-mail address.
diff --git a/app-misc/subsurface/Manifest b/app-misc/subsurface/Manifest
index a93f9f737d05..e8e34a2018f7 100644
--- a/app-misc/subsurface/Manifest
+++ b/app-misc/subsurface/Manifest
@@ -2,20 +2,22 @@
 Hash: SHA256
 
 DIST subsurface-3.0.2.tar.gz 984274 SHA256 41dbb3ca00313019d53b259973f18c6e4cc62b9a9a1a8c5cd5e0d5b911be65c2 SHA512 607d71bd74b2bb9c6ca544de43d2e60ab5468482681f4f4df0e82555a5a6a7b5211ba3ad6463cfaac87b1566dd3cc76b8592d08bd56a8774b67d4eea6bba70bc WHIRLPOOL 536aebd2f23677813f7fb840123b8cdc79519e168bb88c2ff5ec82e2f0150535341a6c9c652954512786a1c292d21f948f6a74d8fcd78125a378043236179cfe
+DIST subsurface-3.1.1.tar.gz 1143335 SHA256 3bbd490871c3ea476943e320e6d7cebdcaebc393503c32ac811cc52c6dfee17b SHA512 b53cd797f803219449cc497b3486660bf873e5c29b2f4e15653c5ae06e1a1884b1a4e2aa79ed67998539dc0c5fd413b1b19f8ad52d8234f74700575cc577b615 WHIRLPOOL 84e123c2bb7a3529e311b35035f3668d70d8913ba08e1460e8f6e6531403b69c03f5993c01a29c284ac9deb5b2c62a614182b0ed209483735b5236a4bc454083
 DIST subsurface-3.1.tar.gz 1126173 SHA256 94283ffbacc84c7ef09fd6b9d11a15e178a9fcf64b439cd390fd1dca544c0735 SHA512 718b17436cf6360646a6e91b54c5e6423fa80f89ee86f2222d6e68982e29ae154101933ce3341f5ee4129e161537029091ecf0383777348bb5a5fbd6e76a0bf9 WHIRLPOOL 4ec3dcb973ef276bf499a653a718b66fa092e550a1a580c0045e968c14749ad0fbd8335ea505f8b367ed6d145762d257ecc7192d59f1f593dee5fc35de3d64c8
 EBUILD subsurface-3.0.2-r1.ebuild 2538 SHA256 61eefcb3248d5ae6c3e56ddd6e528619f92a54ab218de9a6dbc43488ea67b5fc SHA512 d391c7265ae6f145a75bf20bf8b1d22d0da73ea4e0506bfb0d12263394d5c683c9f56240523d63cd8c31caf96eab7534cbe168ccef7e07b591a3a73148050b89 WHIRLPOOL e5494a06504078cd742c156445ab5e903758b08b261f49737a430982af0261133afd59a1a504d70629cfea8f8dc9442739daec281d9e1874ba110b67f46b01c3
+EBUILD subsurface-3.1.1.ebuild 2486 SHA256 ff015a885c880dfc20c66b0ab4f37d220e183b7753dd456b444809a499fb03e0 SHA512 a2fedbcceba8a72ac9d8689ae263aff9f79d6069dba418c540b558344da173a07f4078ca730f5cff3f7c8754fba6073ab6d5ae3d471a11c3386bb91a0998409a WHIRLPOOL b31edc2aa1425cd877a3ba833d7365a20e9048ffba2073b63d05d68f631aeb31dd11022de509d94a3937eec4f84a535ee4f865bdf519e440474d9de00bb80b5e
 EBUILD subsurface-3.1.ebuild 2483 SHA256 be6a94d14351aa5e4cd58d29bbbec5531f84f696e708db65e11111fe7628f344 SHA512 ceccf0cccf07fd4d640fe9fc3abbf45fb823fe91cb8c09f43886d84a460f8d457e1340f45c0d5abab1383d02b5a19cbaf1ff2450bc2000b34de2997081ee223f WHIRLPOOL ac8bea591710d46b1b29ec5f9a557573d6f0e0cb652703b229216041bb6711715a7060f28f7e7e0a871753a5cfd5af7ce18f5b36531053baf9ad5c7d20b9bf1a
-EBUILD subsurface-9999.ebuild 2534 SHA256 f840a8e00c66ab3b744be8c162ea09ff2d41bdd3b3b5790cc8bca744f72a5d6f SHA512 ed4fe743e3759363a1be21aca0b80a0597d98dd608d927f6ae940c630b8fbb7faeeec54b0fbae56af2590d68623f223a4c89926d457ecdf6e97492401d590260 WHIRLPOOL 84ff6467c64470908c9450303c8a4e2931c6f73556917aea32e138f1a34d016cdd11fdc2c26423e225fc45ace20ee36430d97ae725c2a6ddb6101333936d756b
-MISC ChangeLog 1521 SHA256 c6c8622e3c2c6c2377a55d156d13558846291b8085b141e7e109e5acb1574773 SHA512 1afbd3123d11ff4af8bf418c56bad950debc4226f681051fa4adb735b836b815396cfa631a4ce35ca9d196dc425528840cf99dce2134deace3a1023d8715f092 WHIRLPOOL 97a6f73bdf6d86fcf91277f76897144cb848ccd38c58d8070578fabd1bbd544ae37aab8a6da47edb834359c88b7c4cc24417c629bb44d27d8ae3424b7a4a0fbe
+EBUILD subsurface-9999.ebuild 1474 SHA256 ee2790bf82d4798a3f02ffecabf949919ed9e14ef8717ac0eda21c93e78141c7 SHA512 3ec330a05c6b60241b417644842a167aefac0edfa9c05b760b8da44d0c76d734f103abd810b94e28c4d07ed7552fdfb37dcc41023069a18e536ef4bd57137f3f WHIRLPOOL d6c9c785c9b7ce162430ffbb880733c5cb21aec916a782b790dde33068d0c927bcbbbe0d628736a2d778693e97863ec3de129c2fe938b86a89199d695bff6436
+MISC ChangeLog 1911 SHA256 89330705a40207f3f5591214d9798a8d0676c8ab788bbcf55384a8382c129576 SHA512 40c031e32a1d752bd22132a095cb954092fadf01de626f6ac045df40d8330626d006fc173df2c0d6d294d9aa1877ce4682bc68d85f304ae87d75696c70e3526c WHIRLPOOL d2d25ffbb2afb3d7c8185d99074a6c54e5acacac1e29331aece09a6083836c4a5b6c02e1e097e195ea074989a2d2308f19ee3529015219145695a78f3cadacd7
 MISC metadata.xml 1039 SHA256 dcb6651566a0c6a939acfffb6402129fa13d37ff051b60b9683673e594102813 SHA512 0cb81aaa2002a39f8675d8db00b04186bbb7f94d4789a8954861eaa78adb75b1081eeda6b1e540fb4b597bb4f28a9b30bf84e4e5064350ce6ab46661ca2a7958 WHIRLPOOL 175bacf22849c92f0c7fd92b29d85e99a24eacb9e2e0c3da7e967ea506b88953b802cbecf641d101424872042ddba46ff0de9d9b9bd6566ba7d97931d976e96a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSgSIZAAoJEJWyH81tNOV9xiEIAKRQeNg3EETb2VI0TRtoRJr5
-sdhEEB4EtLThLrpTKmUr7SSb/dGxR48en1SBPIjmz4ZpEjSiLNpW8u4rpIPTCzRX
-vxG7nMpENuer52uSeYCC2jmr5x6B03NgVNJAjV4n0Un5/n5u0Qrg60Vo/Mn3kPaM
-gC7YUKKbhRv1UyQv68VpizMW/xIklqqdcQI8SVC3nHi7VYhwBXM2oh7q4NDqHGGY
-hNsHi9/HcFdjkBBdu2zmdnAva6JKFLSJ5wTrci0faFUvfaKpZZKTurIdRfPlwvXD
-KFQhD1LmlhKEBgEos4suv5gnAvGXxM+GD9SdWV+LZBlpR59/hMktJO9lJoTZsrA=
-=7OjC
+iQEcBAEBCAAGBQJSh4vRAAoJEJWyH81tNOV9hDcIALFWIfDQNFDAYOTtAWHW82UZ
+0YK0reIMBBi3vC/0+8CsTNhwdWnlSjf1WY8aH0ScoyH5qmnSPqbdZDdM4UUKrB2w
+xL0Mdp3le9yDzr9ZITVa9aiHFVAR4IY/gNaSgvFPal1R4lHqkwQpl1zDKm+/sr1i
+uNTxNGtMFO97EfhvdmuDCRUGwB+UngLGuSsUubVB3g1oNNQwJpdVt0NHirNwh6y7
+r9AibaDM/Xq1gV08b5Bv9bnT7jQsvqhfFHIjwVc88WQ36+CAOofsi3aKwDydlXG3
+pElxOwjTDJUgPAlEuWA2HuXylRFdw4wvfl770I/5DcH2jgKKrBupW5RiVakCyvg=
+=uAbL
 -----END PGP SIGNATURE-----
diff --git a/app-misc/subsurface/subsurface-3.1.1.ebuild b/app-misc/subsurface/subsurface-3.1.1.ebuild
new file mode 100644
index 000000000000..045660cdf38a
--- /dev/null
+++ b/app-misc/subsurface/subsurface-3.1.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-3.1.1.ebuild,v 1.1 2013/11/16 15:15:16 tomwij Exp $
+
+EAPI="5"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git"
+	GIT_ECLASS="git-2"
+	LIBDC_V="0.4.1"
+else
+	SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	LIBDC_V="0.4.1"
+	S="${WORKDIR}/${P/s/S}"
+fi
+
+inherit eutils gnome2-utils ${GIT_ECLASS}
+
+LINGUAS="bg bg_BG br ca ca_ES da_DK de de_CH de_DE da ee es es_ES et_EE fi fi_FI fr fr_FR gsw hr
+	hr_HR it it_IT nb nb_NO nl nl_NL nn no pl pl_PL pt pt_BR pt_PT ru ru_RU sk sk_SK sv sv_SE"
+
+DESCRIPTION="An open source dive log program"
+HOMEPAGE="http://subsurface.hohndel.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc usb"
+for LINGUA in ${LINGUAS}; do
+	IUSE+=" linguas_${LINGUA}"
+done
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/libzip
+	gnome-base/gconf:2
+	sci-geosciences/osm-gps-map
+	net-libs/libsoup:2.4
+	virtual/libusb
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?]
+	virtual/pkgconfig
+	doc? ( app-text/asciidoc )
+"
+
+src_unpack() {
+	if [[ ${PV} = *9999* ]]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	# Don't hardcode gcc.
+	sed -i 's|CC\=gcc||' Makefile || die "Failed to fix gcc hardcode issues."
+
+	# Don't hardcode CFLAGS.
+	sed -i 's|CFLAGS\=.*||' Makefile || die "Failed to fix hardcoded CFLAGS."
+
+	# Don't call gtk_update_icon_cache.
+	sed -i -e "s|\$(gtk_update_icon_cache)|:|" Makefile || die "Failed to disable gtk_update_icon_cache call."
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+
+	if use doc; then
+		cd "Documentation" && emake user-manual.xhtml
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" CC="$(tc-getCC)" install
+
+	# Remove unwanted linguas
+	local del
+	for LANG in $(ls "${D}/usr/share/locale"); do
+		del=1
+		for LINGUA in ${LINGUAS}; do
+			if [[ ${LANG/.UTF-8/} == ${LINGUA} ]]; then
+				if use linguas_${LINGUA}; then
+					del=0
+				fi
+				break
+			fi
+		done
+		if [[ ${del} == 1 ]]; then
+			rm -r "${D}/usr/share/locale/${LANG}" || die "Removing language ${LANG} failed."
+		fi
+	done
+
+	if use doc; then
+		dohtml -r "${S}/Documentation/"
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-misc/subsurface/subsurface-9999.ebuild b/app-misc/subsurface/subsurface-9999.ebuild
index 2901113c30eb..69d713373b8b 100644
--- a/app-misc/subsurface/subsurface-9999.ebuild
+++ b/app-misc/subsurface/subsurface-9999.ebuild
@@ -1,46 +1,41 @@
 # Copyright 1999-2013 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.2 2013/04/03 21:16:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.3 2013/11/16 15:15:16 tomwij Exp $
 
 EAPI="5"
 
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://subsurface.hohndel.org/subsurface.git"
 	GIT_ECLASS="git-2"
-	LIBDC_V="0.3.0"
+	LIBDC_V="0.4.1"
 else
 	SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	LIBDC_V="0.3.0"
+	LIBDC_V="0.4.1"
+	S="${WORKDIR}/${P/s/S}"
 fi
 
-inherit eutils gnome2-utils ${GIT_ECLASS}
-
-LINGUAS="bg bg_BG de de_DE de_CH es es_ES fi fi_FI fr fr_FR hr hr_HR it it_IT
-	nb nb_NO nl nl_NL nn no ru ru_RU sk sk_SK sv sv_SE"
+inherit eutils qt4-r2 ${GIT_ECLASS}
 
 DESCRIPTION="An open source dive log program"
 HOMEPAGE="http://subsurface.hohndel.org"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="doc map usb"
+IUSE="doc usb"
 for LINGUA in ${LINGUAS}; do
 	IUSE+=" linguas_${LINGUA}"
 done
 
-RDEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-libs/libzip
-	gnome-base/gconf:2
-	map? ( sci-geosciences/osm-gps-map )
-	net-libs/libsoup:2.4
-	sys-libs/glibc
-	virtual/libusb
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/pango
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt:0
+	dev-libs/libzip:0
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	kde-base/marble:4
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/libdivecomputer-${LIBDC_V}[static-libs,usb?]
@@ -48,66 +43,29 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/asciidoc )
 "
 
+DOCS="README"
+
 src_unpack() {
 	if [[ ${PV} = *9999* ]]; then
 		git-2_src_unpack
-	elif [[ "${SRC_URI}" == *git* ]]; then
-		unpack ${A}
-		mv subsurface-v${PV}-* ${P} || die "Failed to mv the failes to ${P}."
 	else
-		mkdir "${P}" && cd "${P}" || die "Failed to create/change to ${P}."
 		unpack ${A}
 	fi
 }
 
-src_prepare() {
-	# Don't hardcode gcc.
-	sed -i 's|CC\=gcc||' Makefile || die "Failed to fix gcc hardcode issues."
-
-	# Don't hardcode CFLAGS.
-	sed -i 's|CFLAGS\=.*||' Makefile || die "Failed to fix hardcoded CFLAGS."
-
-	# Don't call gtk_update_icon_cache.
-	sed -i -e "s|\$(gtk_update_icon_cache)|:|" Makefile || die "Failed to disable gtk_update_icon_cache call."
-}
-
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 
 	if use doc; then
-		emake doc
+		cd "Documentation" && emake user-manual.xhtml
 	fi
 }
 
 src_install() {
-	default
-
-	# Remove unwanted linguas
-	local del
-	for LANG in $(ls "${D}/usr/share/locale"); do
-		del=1
-		for LINGUA in ${LINGUAS}; do
-			if [[ ${LANG/.UTF-8/} == ${LINGUA} ]]; then
-				if use linguas_${LINGUA}; then
-					del=0
-				fi
-				break
-			fi
-		done
-		if [[ ${del} == 1 ]]; then
-			rm -r "${D}/usr/share/locale/${LANG}" || die "Removing language ${LANG} failed."
-		fi
-	done
+	qt4-r2_src_install
 
 	if use doc; then
-		dohtml -r "${S}/Documentation/"
+		mv "${ED}/usr/share/doc/${PN}/"* "${ED}/usr/share/doc/${PF}/". || die "doc mv failed"
 	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	rm -Rf "${ED}/usr/share/doc/${PN}"
 }