version bump

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 185 insertions, 5 deletions

diff --git a/sci-geosciences/xtide/ChangeLog b/sci-geosciences/xtide/ChangeLog
index edcea9c923aa..afa0016943d6 100644
--- a/sci-geosciences/xtide/ChangeLog
+++ b/sci-geosciences/xtide/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/xtide
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/xtide/ChangeLog,v 1.5 2013/06/26 17:08:37 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/xtide/ChangeLog,v 1.6 2013/07/13 11:29:18 hasufell Exp $
+
+*xtide-2.13.1 (13 Jul 2013)
+
+  13 Jul 2013; Julian Ospald <hasufell@gentoo.org> +xtide-2.13.1.ebuild,
+  +files/xtide-2.13.1-Werror.patch, +files/xtide-2.13.1-gps-switch.patch:
+  version bump
 
   26 Jun 2013; Chema Alonso <nimiux@gentoo.org> xtide-2.13.ebuild:
   Stable for amd64 wrt bug #474420
diff --git a/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch b/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
new file mode 100644
index 000000000000..fcfd147e51bb
--- /dev/null
+++ b/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
@@ -0,0 +1,21 @@
+commit 9cf2369051fa887bd5f13bf7df80c51bcf040306
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sat Jul 13 13:25:42 2013 +0200
+
+    BUILD: remove -Werror
+    
+    It's discouraged to add non-specific Werror flags.
+
+diff --git a/configure.ac b/configure.ac
+index b366337..86c7569 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ m4_if(2.65, AC_AUTOCONF_VERSION, [m4_fatal([autoconf version 2.65 is broken and
+ # FIXME: Update version info on each release
+ AC_INIT([XTide], [2.13.1], [dave@flaterco.com])
+ 
+-AM_INIT_AUTOMAKE([-Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+ 
+ AC_LANG([C++])
+ AC_PROG_CXX
diff --git a/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch b/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
new file mode 100644
index 000000000000..54c6546fe298
--- /dev/null
+++ b/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
@@ -0,0 +1,88 @@
+commit 755677baae16fd8772efd523a25b787ea3fc0772
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sat Jul 13 13:26:24 2013 +0200
+
+    BUILD: add --with-gps switch
+    
+    We don't want automagic gps detection, but give control
+    to the user.
+
+diff --git a/configure.ac b/configure.ac
+index 86c7569..307def4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -156,6 +156,12 @@ if test -z "${SKIP_COMPLICATED}"; then
+ fi
+ CXXFLAGS="${SAVED_CXXFLAGS}"
+ 
++AC_ARG_WITH([gps],
++            [AS_HELP_STRING([--with-gps],
++              [use libgpsd (default: no)])],
++            [gps=$withval],
++            [gps=no])
++
+ # xttpd configs
+ AC_ARG_WITH([xttpd-user],
+             [AS_HELP_STRING([--with-xttpd-user=user],
+@@ -381,32 +387,35 @@ AC_CHECK_HEADER([Dstr], [AC_CHECK_LIB([dstr], [DstrCompat20070215Check])])
+ AM_CONDITIONAL(NO_LIBDSTR, test "$ac_cv_lib_dstr_DstrCompat20070215Check" != "yes")
+ 
+ # libgps is optional; use it if you have a compatible version.
+-AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
+-  AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
+-  AC_COMPILE_IFELSE(
+-    [AC_LANG_SOURCE([[
+-#include <gps.h>
+-#if (GPSD_API_MAJOR_VERSION < 5)
+-#FAIL
+-#endif
+-int main (int argc, char **argv) {
+-  struct gps_data_t gpsdata;
+-  gps_open ("127.0.0.1", "2947", &gpsdata);
+-  gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
+-  gps_read (&gpsdata);
+-  return (gpsdata.fix.mode >= MODE_2D);
+-}
+-    ]])],
+-    [
+-      AC_MSG_RESULT(yes)
+-      AC_DEFINE([GPS_GOOD])
+-      AC_SUBST([GPSD_LIBS], ["-lgps"])
+-    ],
+-    [
+-      AC_MSG_RESULT(no)
+-    ]
+-  )
+-])])
++
++AS_IF([test "x$gps" = "xyes"], [
++	AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
++	  AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
++	  AC_COMPILE_IFELSE(
++		[AC_LANG_SOURCE([[
++	#include <gps.h>
++	#if (GPSD_API_MAJOR_VERSION < 5)
++	#FAIL
++	#endif
++	int main (int argc, char **argv) {
++	  struct gps_data_t gpsdata;
++	  gps_open ("127.0.0.1", "2947", &gpsdata);
++	  gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
++	  gps_read (&gpsdata);
++	  return (gpsdata.fix.mode >= MODE_2D);
++	}
++		]])],
++		[
++		  AC_MSG_RESULT(yes)
++		  AC_DEFINE([GPS_GOOD])
++		  AC_SUBST([GPSD_LIBS], ["-lgps"])
++		],
++		[
++		  AC_MSG_RESULT(no)
++		]
++	  )
++	], [AC_MSG_ERROR([cannot find libgps])])], [AC_MSG_ERROR([cannot find gps.h])])
++	])
+ 
+ AC_TYPE_INT8_T
+ AC_TYPE_INT16_T
diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
index 0744b87d36ba..e6d99ddda953 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>hasufell@gentoo.org</email>
-	<name>Julian Ospald</name>
-</maintainer>
+	<maintainer>
+		<email>hasufell@gentoo.org</email>
+		<name>Julian Ospald</name>
+	</maintainer>
+	<use>
+		<flag name='gps'>Use <pkg>sci-geosciences/gpsd</pkg></flag>
+	</use>
 </pkgmetadata>
 
diff --git a/sci-geosciences/xtide/xtide-2.13.1.ebuild b/sci-geosciences/xtide/xtide-2.13.1.ebuild
new file mode 100644
index 000000000000..be27fb1822a5
--- /dev/null
+++ b/sci-geosciences/xtide/xtide-2.13.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/xtide/xtide-2.13.1.ebuild,v 1.1 2013/07/13 11:29:18 hasufell Exp $
+
+EAPI=5
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps"
+
+DEPEND="
+	media-libs/libpng:0
+	>=sci-geosciences/libtcd-2.2.5_p2
+	x11-libs/libX11
+	x11-libs/libXaw3d
+	x11-libs/libXpm
+	x11-libs/libXt
+	gps? ( sci-geosciences/gpsd )"
+RDEPEND="${DEPEND}
+	media-fonts/font-schumacher-misc"
+DEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{Werror,gps-switch}.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gps)
+}
+
+src_install() {
+	dobin xtide tide xttpd
+	doman *.[18]
+
+	echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
+	doenvd 50xtide_harm
+
+	newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
+
+	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}