Revision bump, fixed language support that broke as part of rewriting the ebuild. Cleaned up parts of the ebuild and added a missing dependency. Added the original ebuild writer Martin Gysel as the primary proxy maintainer. Extensively tested.

(Portage version: 2.1.11.60/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

4 files changed, 57 insertions, 27 deletions

diff --git a/app-misc/subsurface/ChangeLog b/app-misc/subsurface/ChangeLog
index 0b90933c455d..c5fef44e8a0f 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.1 2013/03/28 19:17:56 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/ChangeLog,v 1.2 2013/04/03 21:16:11 tomwij Exp $
+
+*subsurface-3.0.2-r1 (03 Apr 2013)
+
+  03 Apr 2013; Tom Wijsman <TomWij@gentoo.org> +subsurface-3.0.2-r1.ebuild,
+  -subsurface-3.0.2.ebuild, metadata.xml, subsurface-9999.ebuild:
+  Revision bump, fixed language support that broke as part of rewriting the
+  ebuild. Cleaned up parts of the ebuild and added a missing dependency. Added
+  the original ebuild writer Bearsh as the primary proxy maintainer. Extensively
+  tested.
 
 *subsurface-3.0.2 (28 Mar 2013)
 *subsurface-9999 (28 Mar 2013)
diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index 34a33687934d..a5cfa38fbb31 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -2,14 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
+    <email>me@bearsh.org</email>
+    <name>Martin Gysel</name>
+    <description>Proxy maintainer. Assign bugs to him.</description>    
+  </maintainer>
+  <maintainer>
     <email>bmangentoo@gmail.com</email>
     <name>Aaron Bauman</name>
-    <description>Proxy maintainer. Assign bugs to him.</description>
+    <description>Proxy maintainer. Please CC bugs to him.</description>
   </maintainer>
   <maintainer>
     <email>TomWij@gentoo.org</email>
     <name>Tom Wijsman</name>
-    <description>Committer. CC bugs to him.</description>
+    <description>Committer. Please CC bugs to him.</description>
   </maintainer>
   <herd>proxy-maintainers</herd>
   <longdescription lang="en">
@@ -17,5 +22,7 @@
   </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>
   </use>
 </pkgmetadata>
diff --git a/app-misc/subsurface/subsurface-3.0.2.ebuild b/app-misc/subsurface/subsurface-3.0.2-r1.ebuild
index f6bfae883291..f94db95d0425 100644
--- a/app-misc/subsurface/subsurface-3.0.2.ebuild
+++ b/app-misc/subsurface/subsurface-3.0.2-r1.ebuild
@@ -1,17 +1,14 @@
 # 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.0.2.ebuild,v 1.1 2013/03/28 19:17:56 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-3.0.2-r1.ebuild,v 1.1 2013/04/03 21:16:11 tomwij 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.3.0"
 else
-	#SRC_URI="http://git.hohndel.org/?p=subsurface.git;a=snapshot;h=v${PV};sf=tgz -> ${P}.tar.gz"
 	SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	LIBDC_V="0.3.0"
@@ -19,11 +16,17 @@ 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"
+
 DESCRIPTION="An open source dive log program"
 HOMEPAGE="http://subsurface.hohndel.org"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc map usb"
+for LINGUA in ${LINGUAS}; do
+	IUSE+=" linguas_${LINGUA}"
+done
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2
@@ -32,6 +35,7 @@ RDEPEND="dev-libs/glib:2
 	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
@@ -49,24 +53,27 @@ src_unpack() {
 		git-2_src_unpack
 	elif [[ "${SRC_URI}" == *git* ]]; then
 		unpack ${A}
-		mv subsurface-v${PV}-* ${P} || die "failed to mv the failes to ${P}"
+		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}"
+		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"
+	# 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
 		emake doc
 	fi
diff --git a/app-misc/subsurface/subsurface-9999.ebuild b/app-misc/subsurface/subsurface-9999.ebuild
index 15d351d3dfff..2901113c30eb 100644
--- a/app-misc/subsurface/subsurface-9999.ebuild
+++ b/app-misc/subsurface/subsurface-9999.ebuild
@@ -1,17 +1,14 @@
 # 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.1 2013/03/28 19:17:56 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/subsurface/subsurface-9999.ebuild,v 1.2 2013/04/03 21:16:11 tomwij 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.3.0"
 else
-	#SRC_URI="http://git.hohndel.org/?p=subsurface.git;a=snapshot;h=v${PV};sf=tgz -> ${P}.tar.gz"
 	SRC_URI="http://subsurface.hohndel.org/downloads/Subsurface-${PV}.tgz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 	LIBDC_V="0.3.0"
@@ -19,11 +16,17 @@ 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"
+
 DESCRIPTION="An open source dive log program"
 HOMEPAGE="http://subsurface.hohndel.org"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc map usb"
+for LINGUA in ${LINGUAS}; do
+	IUSE+=" linguas_${LINGUA}"
+done
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2
@@ -32,6 +35,7 @@ RDEPEND="dev-libs/glib:2
 	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
@@ -49,24 +53,27 @@ src_unpack() {
 		git-2_src_unpack
 	elif [[ "${SRC_URI}" == *git* ]]; then
 		unpack ${A}
-		mv subsurface-v${PV}-* ${P} || die "failed to mv the failes to ${P}"
+		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}"
+		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"
+	# 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
 		emake doc
 	fi