[gentoo-commits] gentoo-x86 commit in app-misc/subsurface: metadata.xml subsurface-3.1.ebuild ChangeLog

[Tom Wijsman (tomwij)]

tomwij      13/05/20 14:24:57

  Modified:             metadata.xml ChangeLog
  Added:                subsurface-3.1.ebuild
  Log:
  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).
  
  (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

Revision  Changes    Path
1.3                  app-misc/subsurface/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/subsurface/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	3 Apr 2013 21:16:11 -0000	1.2
+++ metadata.xml	20 May 2013 14:24:57 -0000	1.3
@@ -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>



1.3                  app-misc/subsurface/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	3 Apr 2013 21:16:11 -0000	1.2
+++ ChangeLog	20 May 2013 14:24:57 -0000	1.3
@@ -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@g.o> +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)
 



1.1                  app-misc/subsurface/subsurface-3.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-3.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/subsurface/subsurface-3.1.ebuild?rev=1.1&content-type=text/plain

Index: subsurface-3.1.ebuild
===================================================================
# 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
}