gentoo auto-resync : 22:09:2022 - 17:28:08

7 files changed, 4 insertions, 96 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f75ec0054e67..63793886755c 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gshhs/Manifest b/sci-geosciences/gshhs/Manifest
index bb5b1d10b3c7..88050732a471 100644
--- a/sci-geosciences/gshhs/Manifest
+++ b/sci-geosciences/gshhs/Manifest
@@ -1,3 +1,3 @@
 DIST gshhs_1.13_src.zip 19483 BLAKE2B b71bdd44f5ccfa090dcf4be4c9568b076d8a1b8a6fbf5bf16be1706737820f55bf9ce73338e4e94c236143f66d059db5450eb7c9bbb5da9a6f857f5922299c14 SHA512 c83574f2e2f3b795391d0016234974fb3f3956c8af568b78be07c58f4194ec2c8b34f2f91ab52f1b635f4e4870167d6ef357c4d362207521ed587d89c7d3738a
-EBUILD gshhs-1.13-r1.ebuild 976 BLAKE2B b028e6b4ceb21d63cb54dea202f253873e9c10beb882486007f8aa1a402ee859d192d03deca7fd8e82996c3f3dc1131f57a07373d29f4f6e37c038cf98c1d60e SHA512 f0f0a4e9da42b2f397af7c42d4220601ed63a95a85300bb9edc71756689eb546701122ebc495cd3c895bedfb90f2d7c1e6fbed925c26979f222a7d3b9f491a22
+EBUILD gshhs-1.13-r1.ebuild 977 BLAKE2B d940465a64d8cbfa4f946fdd187324951f8e5224755ca998c649c1a2da3bfcdbe10c719e4ed22164cde24174dfd9870f5285b824f0f46c64b09d4a04a680a714 SHA512 3d055bdd2ccf832f3100786cb840198a4184377db1a3c8974b3e9c591811246d04ec7767f14433d4beff392a25084196232c684c4870ba018052cdee3df85542
 MISC metadata.xml 645 BLAKE2B f2f4150d708dac7a70ad40094dd640d78204cd2a4f7d95c15eeb4780120f7ccb1bc0234025a906bf5ee3af78d58eaa14a2e1dd4b8c012e6882371211e8e9c0ee SHA512 4bf0a53903b6477ee73dc7d7236a4ade06993c7406b2cc3b67aa6ffe739a080cadd85f2476f69cb83954f25cda35f091eb25056a61a926b4290f91cd29f51777
diff --git a/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
index 14c8c92d67cb..dd460de1633c 100644
--- a/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
+++ b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs"
 HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html"
-SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_1.13_src.zip"
+SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_${PV}_src.zip"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index 28f5e4206069..718a71347fc4 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,6 +1,3 @@
-DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
 DIST xtide-2.15.5.tar.xz 574972 BLAKE2B b03a2d0b4c2616b0a81fc745a7781dba74e0d7977c84790ab5fc3aebaf3a04ae51fa9bd5b79166195e0b6cbe736efa3e31b5203a25bb6f60df385c0f357294f9 SHA512 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43
-EBUILD xtide-2.15.1-r2.ebuild 991 BLAKE2B 51bebd7801eccf98490132b29ba7023b0310c1b05ff3c8ebc984169018e8594e265bb1a5f660de44d9188cf0a5281530a26b35d13f9486d97945808d94b20ad2 SHA512 b5c31b3b6edaf8b39704e0eee83e27804635a85f1268d684766c3929b8ed5239530481bc93e49b955fef6f4e9a238ee7e8c00b43699fed090145b5635b4096e0
-EBUILD xtide-2.15.1-r3.ebuild 891 BLAKE2B 2ca90b0db4cee11a496c2f653eca2dc56e1269c77564bb576ad197476f7a32a705926edb9e184e92841c50bac1c2a9d52e607555d4d55b78122fd6e29f209fa9 SHA512 bf7bfd68d13f4f5255607c1b3057d5c942debab8c37a0deb5f076daeac523673c1e3d7d490b75fb302795fcf52adce2df74c95b543872796ad22b16f22da7c1e
-EBUILD xtide-2.15.5.ebuild 882 BLAKE2B ba75571f311403c42b6709e6048e2f2cfdd198881fe11cdaa3dd7c255e351847d954c76051c0953c847aef8fcb2670c712d51509565f5c7d16bab85ae2860817 SHA512 71231252c94b03b8ae4d85c56654f6e2f2888663cac97d899e5419b89c427c57a3491460b909c453387d54d1c9ec93b7b7321d69fe4375da3fbd9ba9a65e74ea
+EBUILD xtide-2.15.5.ebuild 880 BLAKE2B 356469114a8970dc978cf8ba22e8eddff1324d9e689670d397c931905f7632a56d6f4dc9fbf49bd29a0e21a4f06e1631b30d42d70b4055369044c5cb9836ee2c SHA512 e919332869138035c5041e202412ebccb501473c5436f5416da908f5f9edb147f01c9c5054aefab04702d54b5d4700823924a264f11d178f7844ae8a0fc60eb8
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/sci-geosciences/xtide/xtide-2.15.1-r2.ebuild b/sci-geosciences/xtide/xtide-2.15.1-r2.ebuild
deleted file mode 100644
index 5cd9b00baedf..000000000000
--- a/sci-geosciences/xtide/xtide-2.15.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
-HOMEPAGE="https://flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libpng:0=
-	sci-geosciences/gpsd
-	>=sci-geosciences/libtcd-2.2.5_p2
-	x11-libs/libX11
-	x11-libs/libXaw3d[unicode(+)]
-	x11-libs/libXaw3dXft
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXt
-"
-RDEPEND="${DEPEND}
-	media-fonts/font-schumacher-misc
-"
-
-src_install() {
-	default
-
-	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
-}
diff --git a/sci-geosciences/xtide/xtide-2.15.1-r3.ebuild b/sci-geosciences/xtide/xtide-2.15.1-r3.ebuild
deleted file mode 100644
index 60d326916506..000000000000
--- a/sci-geosciences/xtide/xtide-2.15.1-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
-HOMEPAGE="https://flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="media-libs/libpng:=
-	sci-geosciences/gpsd
-	>=sci-geosciences/libtcd-2.2.5_p2
-	x11-libs/libX11
-	x11-libs/libXaw3d[unicode(+)]
-	x11-libs/libXaw3dXft
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXt"
-RDEPEND="${DEPEND}
-	media-fonts/font-schumacher-misc"
-
-src_install() {
-	default
-
-	echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm || die
-	doenvd 50xtide_harm
-
-	newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
-	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-geosciences/xtide/xtide-2.15.5.ebuild b/sci-geosciences/xtide/xtide-2.15.5.ebuild
index 28ed3a79b08c..bda5dbc7ee96 100644
--- a/sci-geosciences/xtide/xtide-2.15.5.ebuild
+++ b/sci-geosciences/xtide/xtide-2.15.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://flaterco.com/files/xtide/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="media-libs/libpng:=
 	sci-geosciences/gpsd:=