commit: fe765919920affa950c651b8ae2cc0ab368f8228 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Thu May 26 22:50:45 2022 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Fri May 27 11:28:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fe765919
sci-geosciences/GeographicLib-data: move use expand descriptions to profiles/desc Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> profiles/desc/geoids_datasets.desc | 12 ++++ profiles/desc/gravity_models.desc | 12 ++++ profiles/desc/magnetic_models.desc | 13 ++++ .../GeographicLib-data-0-r1.ebuild | 76 +++++++++++----------- sci-geosciences/GeographicLib-data/metadata.xml | 21 ------ 5 files changed, 75 insertions(+), 59 deletions(-) diff --git a/profiles/desc/geoids_datasets.desc b/profiles/desc/geoids_datasets.desc new file mode 100644 index 000000000..fb413a506 --- /dev/null +++ b/profiles/desc/geoids_datasets.desc @@ -0,0 +1,12 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# This file contains descriptions of GEOIDS_DATASETS USE_EXPAND flags. + +egm84-30 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid +egm84-15 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid +egm96-15 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid +egm96-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 5' grid +egm2008-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid +egm2008-2-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 2.5' grid +egm2008-1 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 1' grid diff --git a/profiles/desc/gravity_models.desc b/profiles/desc/gravity_models.desc new file mode 100644 index 000000000..d021f4b15 --- /dev/null +++ b/profiles/desc/gravity_models.desc @@ -0,0 +1,12 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# This file contains descriptions of GRAVITY_MODELS USE_EXPAND flags. + +egm84-30 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid +egm84-15 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid +egm96-15 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid +egm96-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 5' grid +egm2008-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid +egm2008-2-5 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 2.5' grid +egm2008-1 - http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 1' grid diff --git a/profiles/desc/magnetic_models.desc b/profiles/desc/magnetic_models.desc new file mode 100644 index 000000000..018d06eee --- /dev/null +++ b/profiles/desc/magnetic_models.desc @@ -0,0 +1,13 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# This file contains descriptions of MAGNETIC_MODELS USE_EXPAND flags. + +wmm2010 - the World Magnetic Model 2010, which approximates the main magnetic field for the period 2010–2015. +wmm2020 - the World Magnetic Model 2020, which approximates the main magnetic field for the period 2020–2025. +wmm2015v2 - the World Magnetic Model 2015, which approximates the main magnetic field for the period 2015–2020. +igrf11 - the International Geomagnetic Reference Field (11th generation), which approximates the main magnetic field for the period 1900–2015. +igrf12 - the International Geomagnetic Reference Field (12th generation), which approximates the main magnetic field for the period 1900–2020. +emm2010 - the Enhanced Magnetic Model 2010, which approximates the main and crustal magnetic fields for the period 2010–2015. +emm2015 - the Enhanced Magnetic Model 2015, which approximates the main and crustal magnetic fields for the period 2000–2020. +emm2017 - the Enhanced Magnetic Model 2017, which approximates the main and crustal magnetic fields for the period 2000–2022. diff --git a/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild b/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild index 2a1d7eb52..1308ca9d9 100644 --- a/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild +++ b/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild @@ -14,29 +14,29 @@ KEYWORDS="~amd64" LICENSE="public-domain" IUSE_GEOIDS_DATASETS=" - geoids-datasets-egm84-30 - geoids-datasets-egm84-15 - geoids-datasets-egm96-15 - geoids-datasets-egm96-5 - geoids-datasets-egm2008-5 - geoids-datasets-egm2008-2-5 - +geoids-datasets-egm2008-1 + geoids_datasets_egm84-30 + geoids_datasets_egm84-15 + geoids_datasets_egm96-15 + geoids_datasets_egm96-5 + geoids_datasets_egm2008-5 + geoids_datasets_egm2008-2-5 + +geoids_datasets_egm2008-1 " IUSE_GRAVITY_MODELS=" - gravity-models-egm84 - gravity-models-egm96 - +gravity-models-egm2008 - gravity-models-wgs84 + gravity_models_egm84 + gravity_models_egm96 + +gravity_models_egm2008 + gravity_models_wgs84 " IUSE_MAGNETIC_MODELS=" - magnetic-models-wmm2010 - magnetic-models-wmm2015v2 - +magnetic-models-wmm2020 - magnetic-models-igrf11 - magnetic-models-igrf12 - magnetic-models-emm2010 - magnetic-models-emm2015 - magnetic-models-emm2017 + magnetic_models_wmm2010 + magnetic_models_wmm2015v2 + +magnetic_models_wmm2020 + magnetic_models_igrf11 + magnetic_models_igrf12 + magnetic_models_emm2010 + magnetic_models_emm2015 + magnetic_models_emm2017 " IUSE="${IUSE_GEOIDS_DATASETS} ${IUSE_GRAVITY_MODELS} ${IUSE_MAGNETIC_MODELS}" @@ -50,27 +50,27 @@ REQUIRED_USE=" COMMON_URI="https://sourceforge.net/projects/${MYPN}/files"; SRC_URI=" - geoids-datasets-egm84-30? ( ${COMMON_URI}/geoids-distrib/egm84-30.tar.bz2 -> geoids-egm84-30.tar.bz2 ) - geoids-datasets-egm84-15? ( ${COMMON_URI}/geoids-distrib/egm84-15.tar.bz2 -> geoids-egm84-15.tar.bz2 ) - geoids-datasets-egm96-15? ( ${COMMON_URI}/geoids-distrib/egm96-15.tar.bz2 -> geoids-egm96-15.tar.bz2 ) - geoids-datasets-egm96-5? ( ${COMMON_URI}/geoids-distrib/egm96-5.tar.bz2 -> geoids-egm96-5.tar.bz2 ) - geoids-datasets-egm2008-5? ( ${COMMON_URI}/geoids-distrib/egm2008-5.tar.bz2 -> geoids-egm2008-5.tar.bz2 ) - geoids-datasets-egm2008-2-5? ( ${COMMON_URI}/geoids-distrib/egm2008-2_5.tar.bz2 -> geoids-egm2008-2_5.tar.bz2 ) - geoids-datasets-egm2008-1? ( ${COMMON_URI}/geoids-distrib/egm2008-1.tar.bz2 -> geoids-egm2008-1.tar.bz2 ) + geoids_datasets_egm84-30? ( ${COMMON_URI}/geoids-distrib/egm84-30.tar.bz2 -> geoids-egm84-30.tar.bz2 ) + geoids_datasets_egm84-15? ( ${COMMON_URI}/geoids-distrib/egm84-15.tar.bz2 -> geoids-egm84-15.tar.bz2 ) + geoids_datasets_egm96-15? ( ${COMMON_URI}/geoids-distrib/egm96-15.tar.bz2 -> geoids-egm96-15.tar.bz2 ) + geoids_datasets_egm96-5? ( ${COMMON_URI}/geoids-distrib/egm96-5.tar.bz2 -> geoids-egm96-5.tar.bz2 ) + geoids_datasets_egm2008-5? ( ${COMMON_URI}/geoids-distrib/egm2008-5.tar.bz2 -> geoids-egm2008-5.tar.bz2 ) + geoids_datasets_egm2008-2-5? ( ${COMMON_URI}/geoids-distrib/egm2008-2_5.tar.bz2 -> geoids-egm2008-2_5.tar.bz2 ) + geoids_datasets_egm2008-1? ( ${COMMON_URI}/geoids-distrib/egm2008-1.tar.bz2 -> geoids-egm2008-1.tar.bz2 ) - gravity-models-egm84? ( ${COMMON_URI}/gravity-distrib/egm84.tar.bz2 -> gravity-egm84.tar.bz2 ) - gravity-models-egm96? ( ${COMMON_URI}/gravity-distrib/egm96.tar.bz2 -> gravity-egm96.tar.bz2 ) - gravity-models-egm2008? ( ${COMMON_URI}/gravity-distrib/egm2008.tar.bz2 -> gravity-egm2008.tar.bz2 ) - gravity-models-wgs84? ( ${COMMON_URI}/gravity-distrib/wgs84.tar.bz2 -> gravity-wgs84.tar.bz2 ) + gravity_models_egm84? ( ${COMMON_URI}/gravity-distrib/egm84.tar.bz2 -> gravity-egm84.tar.bz2 ) + gravity_models_egm96? ( ${COMMON_URI}/gravity-distrib/egm96.tar.bz2 -> gravity-egm96.tar.bz2 ) + gravity_models_egm2008? ( ${COMMON_URI}/gravity-distrib/egm2008.tar.bz2 -> gravity-egm2008.tar.bz2 ) + gravity_models_wgs84? ( ${COMMON_URI}/gravity-distrib/wgs84.tar.bz2 -> gravity-wgs84.tar.bz2 ) - magnetic-models-wmm2010? ( ${COMMON_URI}/magnetic-distrib/wmm2010.tar.bz2 -> magnetic-wmm2010.tar.bz2 ) - magnetic-models-wmm2015v2? ( ${COMMON_URI}/magnetic-distrib/wmm2015v2.tar.bz2 -> magnetic-wmm2015v2.tar.bz2 ) - magnetic-models-wmm2020? ( ${COMMON_URI}/magnetic-distrib/wmm2020.tar.bz2 -> magnetic-wmm2020.tar.bz2 ) - magnetic-models-igrf11? ( ${COMMON_URI}/magnetic-distrib/igrf11.tar.bz2 -> magnetic-igrf11.tar.bz2 ) - magnetic-models-igrf12? ( ${COMMON_URI}/magnetic-distrib/igrf12.tar.bz2 -> magnetic-igrf12.tar.bz2 ) - magnetic-models-emm2010? ( ${COMMON_URI}/magnetic-distrib/emm2010.tar.bz2 -> magnetic-emm2010.tar.bz2 ) - magnetic-models-emm2015? ( ${COMMON_URI}/magnetic-distrib/emm2015.tar.bz2 -> magnetic-emm2015.tar.bz2 ) - magnetic-models-emm2017? ( ${COMMON_URI}/magnetic-distrib/emm2017.tar.bz2 -> magnetic-emm2017.tar.bz2 ) + magnetic_models_wmm2010? ( ${COMMON_URI}/magnetic-distrib/wmm2010.tar.bz2 -> magnetic-wmm2010.tar.bz2 ) + magnetic_models_wmm2015v2? ( ${COMMON_URI}/magnetic-distrib/wmm2015v2.tar.bz2 -> magnetic-wmm2015v2.tar.bz2 ) + magnetic_models_wmm2020? ( ${COMMON_URI}/magnetic-distrib/wmm2020.tar.bz2 -> magnetic-wmm2020.tar.bz2 ) + magnetic_models_igrf11? ( ${COMMON_URI}/magnetic-distrib/igrf11.tar.bz2 -> magnetic-igrf11.tar.bz2 ) + magnetic_models_igrf12? ( ${COMMON_URI}/magnetic-distrib/igrf12.tar.bz2 -> magnetic-igrf12.tar.bz2 ) + magnetic_models_emm2010? ( ${COMMON_URI}/magnetic-distrib/emm2010.tar.bz2 -> magnetic-emm2010.tar.bz2 ) + magnetic_models_emm2015? ( ${COMMON_URI}/magnetic-distrib/emm2015.tar.bz2 -> magnetic-emm2015.tar.bz2 ) + magnetic_models_emm2017? ( ${COMMON_URI}/magnetic-distrib/emm2017.tar.bz2 -> magnetic-emm2017.tar.bz2 ) " RDEPEND="sci-geosciences/GeographicLib" diff --git a/sci-geosciences/GeographicLib-data/metadata.xml b/sci-geosciences/GeographicLib-data/metadata.xml index 3483fe2ce..3ebfafa0f 100644 --- a/sci-geosciences/GeographicLib-data/metadata.xml +++ b/sci-geosciences/GeographicLib-data/metadata.xml @@ -14,25 +14,4 @@ <bugs-to>https://sourceforge.net/p/geographiclib/bugs/</bugs-to> <remote-id type="sourceforge">geographiclib</remote-id> </upstream> - <use> - <flag name="geoids-datasets-egm84-30">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid</flag> - <flag name="geoids-datasets-egm84-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid</flag> - <flag name="geoids-datasets-egm96-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid</flag> - <flag name="geoids-datasets-egm96-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 5' grid</flag> - <flag name="geoids-datasets-egm2008-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid</flag> - <flag name="geoids-datasets-egm2008-2-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 2.5' grid</flag> - <flag name="geoids-datasets-egm2008-1">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 1' grid</flag> - <flag name="gravity-models-egm84">the Earth Gravity Model 1984, which includes terms up to degree 180</flag> - <flag name="gravity-models-egm96">the Earth Gravity Model 1996, which includes terms up to degree 360</flag> - <flag name="gravity-models-egm2008"> the Earth Gravity Model 2008, which includes terms up to degree 2190</flag> - <flag name="gravity-models-wgs84">the WGS84 Reference Ellipsoid. This is just reproduces the normal gravitational field for the reference ellipsoid. This includes the zonal coefficients up to order 20.</flag> - <flag name="magnetic-models-wmm2010">the World Magnetic Model 2010, which approximates the main magnetic field for the period 2010–2015.</flag> - <flag name="magnetic-models-wmm2020"> the World Magnetic Model 2020, which approximates the main magnetic field for the period 2020–2025.</flag> - <flag name="magnetic-models-wmm2015v2">the World Magnetic Model 2015, which approximates the main magnetic field for the period 2015–2020.</flag> - <flag name="magnetic-models-igrf11">the International Geomagnetic Reference Field (11th generation), which approximates the main magnetic field for the period 1900–2015.</flag> - <flag name="magnetic-models-igrf12">the International Geomagnetic Reference Field (12th generation), which approximates the main magnetic field for the period 1900–2020.</flag> - <flag name="magnetic-models-emm2010">the Enhanced Magnetic Model 2010, which approximates the main and crustal magnetic fields for the period 2010–2015.</flag> - <flag name="magnetic-models-emm2015">the Enhanced Magnetic Model 2015, which approximates the main and crustal magnetic fields for the period 2000–2020.</flag> - <flag name="magnetic-models-emm2017">the Enhanced Magnetic Model 2017, which approximates the main and crustal magnetic fields for the period 2000–2022.</flag> - </use> </pkgmetadata>
