Version bump to 3.1. More LINGUAS, osm-gps-map is now a hard dependency as per upstream, small compilation fixes. Updated ebuild contributed by Martin Gysel (bearsh).

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

4 files changed, 142 insertions, 5 deletions

diff --git a/app-misc/subsurface/ChangeLog b/app-misc/subsurface/ChangeLog
index c5fef44e8a0f..e0a5f17f197b 100644
--- a/app-misc/subsurface/ChangeLog
+++ b/app-misc/subsurface/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2013/04/03 21:16:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.3 2013/05/20 14:24:57 tomwij Exp $
+
+*subsurface-3.1 (20 May 2013)
+
+  20 May 2013; Tom Wijsman <TomWij@gentoo.org> +subsurface-3.1.ebuild,
+  metadata.xml:
+  Version bump to 3.1. More LINGUAS, osm-gps-map is now a hard dependency as per
+  upstream, small compilation fixes. Updated ebuild contributed by Martin Gysel
+  (bearsh).
 
 *subsurface-3.0.2-r1 (03 Apr 2013)
 
diff --git a/app-misc/subsurface/Manifest b/app-misc/subsurface/Manifest
index 2750f6a558bb..dcda195c64bd 100644
--- a/app-misc/subsurface/Manifest
+++ b/app-misc/subsurface/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST subsurface-3.0.2.tar.gz 984274 SHA256 41dbb3ca00313019d53b259973f18c6e4cc62b9a9a1a8c5cd5e0d5b911be65c2 SHA512 607d71bd74b2bb9c6ca544de43d2e60ab5468482681f4f4df0e82555a5a6a7b5211ba3ad6463cfaac87b1566dd3cc76b8592d08bd56a8774b67d4eea6bba70bc WHIRLPOOL 536aebd2f23677813f7fb840123b8cdc79519e168bb88c2ff5ec82e2f0150535341a6c9c652954512786a1c292d21f948f6a74d8fcd78125a378043236179cfe
+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.ebuild 2483 SHA256 be6a94d14351aa5e4cd58d29bbbec5531f84f696e708db65e11111fe7628f344 SHA512 ceccf0cccf07fd4d640fe9fc3abbf45fb823fe91cb8c09f43886d84a460f8d457e1340f45c0d5abab1383d02b5a19cbaf1ff2450bc2000b34de2997081ee223f WHIRLPOOL ac8bea591710d46b1b29ec5f9a557573d6f0e0cb652703b229216041bb6711715a7060f28f7e7e0a871753a5cfd5af7ce18f5b36531053baf9ad5c7d20b9bf1a
 EBUILD subsurface-9999.ebuild 2534 SHA256 f840a8e00c66ab3b744be8c162ea09ff2d41bdd3b3b5790cc8bca744f72a5d6f SHA512 ed4fe743e3759363a1be21aca0b80a0597d98dd608d927f6ae940c630b8fbb7faeeec54b0fbae56af2590d68623f223a4c89926d457ecdf6e97492401d590260 WHIRLPOOL 84ff6467c64470908c9450303c8a4e2931c6f73556917aea32e138f1a34d016cdd11fdc2c26423e225fc45ace20ee36430d97ae725c2a6ddb6101333936d756b
-MISC ChangeLog 985 SHA256 97d3012232eeee52704d733f5587248b9ce8b3946dca0013261b8d2187c86721 SHA512 1689d5ae62ffe1f5dd9e3791ed429a0d1f6688e14f9c6ddcb7e4a4a13f9a2226928a799ca6574211a82559fc038fccddf0ac6a0db0c52ecee809a6bde0d09f3d WHIRLPOOL c2c75c635c4ace800027a592b5ac66cd9d4c90db7cbbbbc0072d28c4d3ea8ae63b4709a4c1f748e25f34171cc641c874f1328aad6307f8fc1f97087c3ad85cf7
-MISC metadata.xml 1011 SHA256 fa387bcf5e003681280724544dd7de43bed9589cf1053a011ad609b5ae6d7392 SHA512 3935647a92e6ab40ee74de54cf16ba6101f4f839b212f54b551d9ca9fb0cd563cefe4c35af51638c1d2b520a733bbd98b90b988bb51d8ad27f6601bffd697924 WHIRLPOOL 783de00b36f4db346ce6368919dd6609fed87de32aefcbfa71bc4e25f1cbf3a785efbf818024ab564216f9cfc89a855a4f0ff9e28d9b8a74f1ba8c46af27bb90
+MISC ChangeLog 1277 SHA256 d4cf1973bcf85d3534f00ca0569317463351e357086802f7a961cd79931344f8 SHA512 0a023ba397c09478c4255cc1e0f4053332446e966b706efc1275cb97f65a6d227f6335c8a10086b9cafca00a20a8164169606dde95f1c41d6eb5b0998c04aa6c WHIRLPOOL 76f39974265c76a7e94da10114e629db7fafe33412fecac8bccb016d1b7708ca801a3f6743dd9648a054a9ae430ad2fb44286930dc2f2feb657e8cef9457e2e0
+MISC metadata.xml 1201 SHA256 7df5f7c4d6c9cda562e18e72c98ebdf70f23b7acb07d55ed046fc401dfed221f SHA512 01f05f0daff96e9ed2919607957863a75eedb7ce7b706999a4948ffeda7f998d9e6b7571fbf513d5dd2be082211fb1f9aa23d147ffb05fc3a776ce2a6df86d8c WHIRLPOOL 4cd17382b73b1fa2487ec1747cc1d4d4fedb4b63b320e43955f4cc4b86edecc73d29e65e3392b441d4481e28c4f366d6621b733f397280a4aadb7334913dd586
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRmjHRAAoJEJWyH81tNOV9LRkIAIEyWStvqveCEx7ArUFRNaFg
+8QZoIqCFltXbY6n4dO1nUW8XDIZ2M/XoxH4/FMIWlNsIm8I19zyCCdtk3Ax/KyDQ
+DMx1K+W3nK5n1KVbEUaof0p4HYmgsiHtic/h51G6vxuIyqvLINtpVWar8XI/7SVO
+IyOK9Xa5DEH3QQxpzAdam2GcWI8xWFn983cCJ4vosWUumPdgdbBvA5WkyWlrDlA2
+DCeQhEH31xD1pSX0PxqbfrB4Ws9vkosgjuE0dwPYOLgiWH6uN4CFSLQuDTTbkaIm
+ZhXU4LyBVk0w6uUtK42c57tkNijdO/0kH835/u2i3tRz6akrx3lYc8nIb1/R5wQ=
+=tGLw
+-----END PGP SIGNATURE-----
diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index a5cfa38fbb31..ff4980916912 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -22,7 +22,10 @@
   </longdescription>
   <use>
     <flag name="map">Adds support for OpenStreetMap maps that can be used with your dive logs.</flag>
-    <flag name="linguas_de_CH">Language support for de_CH</flag>
-    <flag name="linguas_hr_HR">Language support for hr_HR</flag>
+    <flag name="linguas_da_DK">Language support for da_DK.</flag>
+    <flag name="linguas_de_CH">Language support for de_CH.</flag>
+    <flag name="linguas_dk">Language support for dk.</flag>
+    <flag name="linguas_gsw">Language support for gsw.</flag>
+    <flag name="linguas_hr_HR">Language support for hr_HR.</flag>
   </use>
 </pkgmetadata>
diff --git a/app-misc/subsurface/subsurface-3.1.ebuild b/app-misc/subsurface/subsurface-3.1.ebuild
new file mode 100644
index 000000000000..90105dd9937f
--- /dev/null
+++ b/app-misc/subsurface/subsurface-3.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.ebuild,v 1.1 2013/05/20 14:24:57 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.0"
+else
+	SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	LIBDC_V="0.4.0"
+	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 dk 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-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
+	sys-libs/glibc
+	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
+}