commit: e04e3bca89ab34a3168c33fdadbe7006da038bd9
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 13:15:45 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 13:47:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04e3bca
sci-geosciences/xtide: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sci-geosciences/xtide/Manifest | 1 -
.../xtide/files/xtide-2.13.1-Werror.patch | 21 ------
.../xtide/files/xtide-2.13.1-gps-switch.patch | 88 ----------------------
.../xtide/files/xtide-2.13.2-clang.patch | 33 --------
sci-geosciences/xtide/metadata.xml | 3 -
sci-geosciences/xtide/xtide-2.13.2.ebuild | 62 ---------------
6 files changed, 208 deletions(-)
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index cf6dd7af201..8a0d05ae376 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,2 +1 @@
-DIST xtide-2.13.2.tar.bz2 481183 BLAKE2B
b9d294ef1e212ecf2a9850082f0861efd85a8e151da265e3faf06e51a77c2769f68135cad4751edb3517a9dacfc75d45b43f2dc1810351e6d7788228c46ccbfc
SHA512
31b35190932413bf5021c82c640ec3f03424807ffd5295abd8ab9554febbe495896bc0d08f901e70e11b04d92c0d1991b8214dcdd5e95e04173f3e7bbf5faec0
DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B
31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462
SHA512
3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
diff --git a/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
b/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
deleted file mode 100644
index fcfd147e51b..00000000000
--- a/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 9cf2369051fa887bd5f13bf7df80c51bcf040306
-Author: hasufell <hasuf...@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], [d...@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
deleted file mode 100644
index 54c6546fe29..00000000000
--- a/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-commit 755677baae16fd8772efd523a25b787ea3fc0772
-Author: hasufell <hasuf...@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
deleted file mode 100644
index 090aa6c4f7a..00000000000
--- a/sci-geosciences/xtide/files/xtide-2.13.2-clang.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Julian Ospald <hasuf...@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 e723c4be1d8..7a38bb90096 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -2,7 +2,4 @@
<!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
deleted file mode 100644
index 16379601e78..00000000000
--- a/sci-geosciences/xtide/xtide-2.13.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-}
