Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

7 files changed, 213 insertions, 1 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 83143b459729..dec45d51899f 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index 64655f7396c6..d3352801a94a 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,3 +1,8 @@
+AUX xtide-2.13.1-Werror.patch 611 BLAKE2B 624b5e8c67eb1d916a8ce519a22c4590e8e4c11e4991d864a8ad93814ad873ec97e13c6ff00747271bb8a0e5878a3a862c13db7596cbbb5d5b1f5e971e1bb752 SHA512 3ce9ea4a32afe30d926be8f3c472745a84d146170e929925855583de2fa7ee10e867a6f6e6ac339bb4e2a66f6ec6a517d75959bac2a2f4d009c305933a513607
+AUX xtide-2.13.1-gps-switch.patch 2413 BLAKE2B 87414b04c6fea28ac235e7a497de8363696160691ae5a81d898c5b3d83639e863b2a9b495d69092f3316f07ba431a4d50b6ff63d3e78d6cc3700e42ae0de108e SHA512 0f6dc8399962c76853d75dc00e4929ca7fa9c0f004c47902936b586e231ba8772b333330ae0ec909bb45c13ff393dcf212fabba3b7e52ddaa50e93920a9852f5
+AUX xtide-2.13.2-clang.patch 913 BLAKE2B 0bf2e94888907030f2d5752886d1c39cd89b182c34a3c2471b08cebb57037954c4f27612c3e37f47b70d671106862c66b60e0e4fcf0c8010309f50147484e00b SHA512 5f9d5ea48706cb42a6fe8be8615b54eb67b7304a933f6e7a577ac3ea162a374221cb325766263664dc74c6bb5d1340f9f3417032a663ae446892c17d5561b88b
+DIST xtide-2.13.2.tar.bz2 481183 BLAKE2B b9d294ef1e212ecf2a9850082f0861efd85a8e151da265e3faf06e51a77c2769f68135cad4751edb3517a9dacfc75d45b43f2dc1810351e6d7788228c46ccbfc SHA512 31b35190932413bf5021c82c640ec3f03424807ffd5295abd8ab9554febbe495896bc0d08f901e70e11b04d92c0d1991b8214dcdd5e95e04173f3e7bbf5faec0
 DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
+EBUILD xtide-2.13.2.ebuild 1190 BLAKE2B a6302e79d6e6122b53e46e725b755d55d7e051f2610085a790eed8968f1d2984b38a24b4b56a760bf78987e4273e26344e76cce0983e63caafeb363c9083bf3c SHA512 32e5948a9e7d20633209c3079d13a0fa5bb979f92580b888dc3a5da4cd7104e5d60442b05162273ca4487c910d7f4a84ea422913b80c4385e65f2a077b5eb610
 EBUILD xtide-2.15.1.ebuild 991 BLAKE2B 074d253d721ffd5a0ddb3ee5d7025166b271c2c998689457e90d8f51cc1f9a881d9d603d2e6e8a73247fcc9db17ee2c5adcd6cf979b9b9dc56e2c27fe91d76f8 SHA512 5caf4b325339039ccd9e0835db60d3a17a9e3f657ce7a66bf2773483408341df30796b746a54d6522ea156e3b240483a9a461fd4b05b5575c47ba3c5543e1c15
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+MISC metadata.xml 244 BLAKE2B 934bb17faea52392265caa18c77fd32ecb9b80303c9f67145928471c0ad0c4e18f0500b35db4de459ad3575c3a111e2e5afa88fd7c3ab40c15d9d1e9446603c4 SHA512 2cf646d59cd730a1d957a67d2a5735dc205f9270342b86b4a201213e3c9455d8a73a640cac5248a4655f93ac2258f8092a3907553818783da3d864e8fe74323a
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/files/xtide-2.13.2-clang.patch b/sci-geosciences/xtide/files/xtide-2.13.2-clang.patch
new file mode 100644
index 000000000000..090aa6c4f7ab
--- /dev/null
+++ b/sci-geosciences/xtide/files/xtide-2.13.2-clang.patch
@@ -0,0 +1,33 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Aug 17 20:15:03 UTC 2015
+Subject: fix build with clang
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,26 +22,6 @@
+ AC_SUBST([ADDED_CPPFLAGS])
+ AC_SUBST([ADDED_CXXFLAGS])
+ 
+-# Extended initializer lists were added in 4.4.
+-AC_MSG_CHECKING([if using a version of GCC older than 4.4])
+-AC_PREPROC_IFELSE(
+-  [AC_LANG_SOURCE([[
+-#ifdef __GNUC__
+-#if (__GNUC__ * 100 + __GNUC_MINOR__) < 404
+-#FAIL
+-#endif
+-#endif
+-  ]])],
+-  [
+-    AC_MSG_RESULT(no)
+-  ],
+-  [
+-    AC_MSG_RESULT(yes)
+-    AC_MSG_NOTICE([if using GCC, version 4.4 or later is required])
+-    AC_MSG_ERROR([GCC too old])
+-  ]
+-)
+-
+ # /tmp/ccB6kF2d.s: Assembler messages:
+ # /tmp/ccB6kF2d.s:1325: Error: symbol `_ZZN10SafeVectorIdEixEPdS1_jE19__PRETTY_FUNCTION__' is already defined
+ # /tmp/ccB6kF2d.s:1330: Error: symbol `_ZZN10SafeVectorI5AngleEixEPS0_S2_jE19__PRETTY_FUNCTION__' is already defined
diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
index 7a38bb900964..e723c4be1d88 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use>
+		<flag name="gps">Use <pkg>sci-geosciences/gpsd</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sci-geosciences/xtide/xtide-2.13.2.ebuild b/sci-geosciences/xtide/xtide-2.13.2.ebuild
new file mode 100644
index 000000000000..16379601e784
--- /dev/null
+++ b/sci-geosciences/xtide/xtide-2.13.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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}"/${PN}-2.13.1-{Werror,gps-switch}.patch \
+		"${FILESDIR}"/${P}-clang.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
+}