version bump

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 198 insertions, 14 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/Manifest b/sci-geosciences/xtide/Manifest
index 46f000cde372..5523b9af0597 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xtide-2.13.1-Werror.patch 611 SHA256 f881186e23447f1b526fc289b9c0eea9e3a16270b86946a8eefefc33d3ba8d93 SHA512 3ce9ea4a32afe30d926be8f3c472745a84d146170e929925855583de2fa7ee10e867a6f6e6ac339bb4e2a66f6ec6a517d75959bac2a2f4d009c305933a513607 WHIRLPOOL 07aabbd8c464f92ae5ed1a586c662979a9ace4aae67a1c15f17a54085fd9957055f5adee9e8176bb90bb2e47f8335d998b168b0b7d8552a167819d0936343099
+AUX xtide-2.13.1-gps-switch.patch 2413 SHA256 4708502dbc80c65b176df76b0aa44d21bdc28e4ca7dd276af7b31d766ae2f2f1 SHA512 0f6dc8399962c76853d75dc00e4929ca7fa9c0f004c47902936b586e231ba8772b333330ae0ec909bb45c13ff393dcf212fabba3b7e52ddaa50e93920a9852f5 WHIRLPOOL c1786937e2f29a814fa8655b9e72de7db0eee5ebdabf551205e0b5cda0082b2a8cb328ef9ee384b66cb6ab1f6377162a0bddae11b2c640e6cb0af411917cb07b
+DIST xtide-2.13.1.tar.bz2 476238 SHA256 f537377223ebc073998bbf2c7c475e57374ee60a638e29d029f84ba01fb6f365 SHA512 90ad5f50c0f234a8993e8fca99865587617996ac422941c3450826a998556b0429ff1c16a9f8ab7a1b4255b938a7e928258fd090094ad3c8556f94a64eb8e54d WHIRLPOOL aed1390712895b866d96923c46281517ee7157e2460defb9049ec484c51e9828af8306b5a42e10d130de83186e4d36b7d9fac0c3e74635958e2245e6c52f6ece
 DIST xtide-2.13.tar.bz2 465679 SHA256 a73c530c83a9346bf85fe9545551eef3fbedfb24adf18f63c9e7dba0388e0d0a SHA512 2324d3f5150a46ea1fd6c2af3379c8ea4f147034f153ac4b0393ef3aaa2178bfdafc01499f27db643b5ec78b4825c99b20957f5e47f6174fe1612480dc79dcd1 WHIRLPOOL af9fe8377fec84a449e06cfac542b2d792ebe1df904e036775b3e5b659e874d5193e0416b061dddcffc2419610d48864207bba27d557fe05fdcd7560c20afb53
+EBUILD xtide-2.13.1.ebuild 1267 SHA256 bc4d89734997a5450aa9b61a18b27d5dba5f426473fa7a11c54b163dadd992ae SHA512 1ffc3d6fa803ad4507a0921759f379e112bf641057b9b4bae19a6b6640c95bb86aa32e2c57ffcfac1b5caa70e093f02ac5295541f42d7c5a3e907dee8d294628 WHIRLPOOL bade3a1d11651f0778bbe66ac3d27868d2948b5bcbbc76791c0485989c075433c9ac8cfa31a2051b27dd71be609d466f42fe4d762e3a39c4515a38ebe1a55e00
 EBUILD xtide-2.13.ebuild 1078 SHA256 59b69002b96d6b7431ce635f937d2dae86e41fcbddcbad4dc44649e460c0dc31 SHA512 f6fc5957ebb84222f92945e52ec137e7d027fe68085ea3afaf23be740767854c42ed533f21be911d880ffafd320f467d6f0352782848c1008c80b03b67abb974 WHIRLPOOL d6f0a6d1bd70e3214c3a7f5ea6ff093ba9a9af61b711a80ec294ab454b626df8c67a12f03260a13d787131b035d050530562866a3812a29b8e5db73af2dd8b60
-MISC ChangeLog 679 SHA256 cb74b51382c4b8d163946009478b81952e12e6bc25dd6aca5dbc8da3b184f26c SHA512 1d219de8f76fecfd54fba05bdcf4d5d57892d83432e928a0d729b15e3d6109bb670b6698ab55be475b95594388891c41bbaa81e7c229e787085631de19edfd8f WHIRLPOOL 22cf96b9cbff1a62c67a61e9210c9f1666e60da35bf70e213d7be666d174c4854a8e20508c026c477e88494153c24ac9ac2c7e662eaf819d3f6756fab822048a
-MISC metadata.xml 231 SHA256 1db394025a0574badb553851c8e35dcf2d441d56f781bb2d4787c3ef1e779013 SHA512 0467b96ce626fa29e4213cd47764fd70972d5fbce01f161a3d77d89a43abdcb98cb3d3bd6a43b2b9ae6d0d7418efcc3945f20859c1414c0b230e38a432d6a193 WHIRLPOOL 8aedc33ac6edf89a08f536e9ed3f386acb7e0f4c9f6479df131306a04b3d0e4c50488ade86f4809a5e3107b5a25acac4f8dc8f00dc67da5118dcd0350aedec5f
+MISC ChangeLog 873 SHA256 f3a6660da98f9a22739fb0718c2b0f548fa37eb17937714fc852fec18ec7ef99 SHA512 d9a4104a1f16716eaabda0f40fc0dcb79f48494eb0e5e26c14131eca906c1f6d39fe529b871befc1b945061f9151a7b44673cff0d8aa9f03adfa4096017a9868 WHIRLPOOL 86c42ac3cfac55bde7f80ade865f7d511bb8872cefdf7f63d7c8fb2a3152aa3e8d667a0c662ef60bc76e9d8e91c4d914457300d0fcf6f98edc8baa5a2a0370f0
+MISC metadata.xml 312 SHA256 a4b21cb16d73d8cf8408934d016ce028717c89fa5d96cabf3a3963211635c1aa SHA512 af82ee9a734aae0a55f620685b3b82b797e963926668e7d4ef0e2132f13867afa8ea2cdd36c65e1cdc2b73c51176e34a9865f350a6e627174b218299e4b33343 WHIRLPOOL cf21fe8d508cdf4d029cb229471af015e94c26a5bb63122638994f3330727e1260896ce87dff62972e810ed80b415072cb398fd3ec6f908a965e76c7c340f2e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRyyAjAAoJEA2sAkrWKOU2e28H/joixFybQ0TOHH8Odayusj8p
-ZLqr64VGaav68bnJNw3sJMxvHKnXTAXvxlvHNZ1y7gNVvtHK6nhBCYqezHFJKOqo
-sf3h00hOR367SrPz2M5xX0AADe4kFqcX/G5QyYYm5C3PpshxWCHhWoU7bluFnR4S
-NERkPaqr9xHSZnyWqeyUqNlOTlVWIgQIHPhNltmwPyvXDN7Nf2WWnWTqoJLlCQPP
-GWhWqPE1fmiE23Wtg/CUwfE1+W6y/EJIGI9zieERHG8oC23V/I6SA3LYGa0QDhGs
-mZfRed3MhPzIRT6bWPQ3yK/j2TxZglLVGq7RQ+L4gWbh+x0ktt2xTkPbcWEEXVs=
-=CfO1
+iQEcBAEBCAAGBQJR4ToRAAoJEFpvPKfnPDWzDN8H/A9rvn2HxxFGaFylX5POpOVj
+KDkqUsKKLk+EKnC4Isy8DyPLr+P3JTKwEp+jRAYoOQvOH1UUJKBIySnB4xPz0XVw
+mWdwyhm0P3idL1lr1lnJRhe69DmZt8FRPO1eMZiVnDpEm8rWmakCC4BJbcyDiJZj
+kYUc7qmPYUTB/gp8z4N4sEbprfaNRyRITbjJQ+WvK/Vl3qvAoGC/G/mNYNHC7JSF
+Tyo1juDghIvSjRIHHSEaajQGC16nPWuw6xjpJkCNHs1vVONVDBZR/fex0lz1sHKp
+1kn90k0a/BFJKVU5yqdGXX9yIkY13LqpjBZKBN5pklPL/H+qO69Sbs9kcy2PaW8=
+=g7Ul
 -----END PGP SIGNATURE-----
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
+}