sci-geosciences/geographiclib: WIP, installed datasets

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>

3 files changed, 80 insertions, 64 deletions

diff --git a/sci-geosciences/geographiclib/Manifest b/sci-geosciences/geographiclib/Manifest
index ddd70285c..bee036f1f 100644
--- a/sci-geosciences/geographiclib/Manifest
+++ b/sci-geosciences/geographiclib/Manifest
@@ -1,20 +1,20 @@
-DIST egm2008-1.tar.bz2 162388303 BLAKE2B ec79dbe2b25e8f9474fb4e8b704f9cb3c99d80004d0049bcfd956f7bcaa0822e6c0fcdc076f14075c688aeaac47bf68e192a114fca4c21edd81be880114b85f4 SHA512 0928a6e19aea2f372e946ce69c3a3826c2685c0a4029eb4bec7ab16873c03fbcc224ce47d99e6b6798e274a7d469fd3d303954938fb1f58c5dd5ba74907913d9
-DIST egm2008-2_5.tar.bz2 34927299 BLAKE2B bd4e3a04221669fe58e41eb4b93965415f3e238cd9af475fe78fe00592ebc80470309ac63366d9416bb2e0fd835dcb28a1302d89670d85271546a712c0918cc6 SHA512 dd65c8dc916f98a8592cc64518e2a6ac657d7d02d8316ff74cf3fcc62e413a8780ec52421b90e2ab4d846bd7fa2231e6d0a39467a7ea5b8774c71b9fece3cb34
-DIST egm2008-5.tar.bz2 10414793 BLAKE2B ee4fa8e8ab9e87b21197a0a6149a52a49e16a1cde3b5490b4590bede8f67ce6854c9fd2b55491a20963a150aeed53efef95aadde27ca9e9c3a88526940ba402d SHA512 cb3598219df6c7c4a3aea0df0005561aae90dd85c33b79ef39da00cf7512509ae3a3962178e83bed6a1ea85614618bfaf523653a56e6492d3fef243d8483eb0d
-DIST egm2008.tar.bz2 74456990 BLAKE2B 6f64b60d5506d7c27d22ea979d666103d529aaa9b12ec1a2cb9248c0cd6ac97c6ec1e4c64bb8f690999143d9e2e76e528b8ed66fc5c48ecbc20ffd94b9b767bb SHA512 c921c3bd66fb00d05ee983c3e9ad49b38f4a8d881e9073ccf250f3737486701beeac66d0d8726626282a91bdc44ddce073f2e6729bfa914b78887009aed0ad0f
-DIST egm84-15.tar.bz2 1475184 BLAKE2B 3249dd2e724c33468542548070f5f0e8443480b627f046ced8316d6741a1566b3c43c88f20b18e56b599b71ecb5076295ac5cc099880ed5da82d74e5ccd07777 SHA512 06919c11044df7bd1b669e66972ccb19c0b439709becb5623ebb5a2f80ce5ed5fca3b3b47b519db80eb796f402919b093f6dcb68ee3a171096d84bcb051fa267
-DIST egm84-30.tar.bz2 416481 BLAKE2B f86c29543dc6ac3df0a7e95085872d84dc7a172a6d2636b0cd1e20bc7587fe8632911dff9821961c981edbadb7b68bb56e97a233ab7165d13810e920cce8bb34 SHA512 446d272afe925f7d73b4f0b251b3477d1f92e10a7335b5a05bf4d1f247e04413fb856f7a3f73958c87cbdf59fc516296d15bf7ed438cc1bed8f0ee4cd1630b67
-DIST egm84.tar.bz2 258023 BLAKE2B 58820879bf22a50a4c39824971fe8921eab9610af9a913d0aaf6b0457274c48373ba4f1aad63f35c0c24e302fef4ae0923b900cd3dfffd6f3b38f77977332b4e SHA512 350a182912580dfc8072f6c9e92d1f3559094bb19d167008228e3888ed0b6af69dc22bd0ac63ee6074cb91266a9c7ce29452076c96b72c5b39feae84f0dd7a54
-DIST egm96-15.tar.bz2 1490277 BLAKE2B c2fff9874dd2c155a5c63899841937fda0f66a1bd8cec6acc2d6c8242f1dd097c7f0a315288c0aee1c23b325634cddd56981f7a50833feb1ea57ded96bd9a30a SHA512 82f362483e605502ba2d996d3c05095d2967357b61322d18f1313fdb77c39a0307087eefadba10b9c260abf73b3c0013e84339ae173420e77f75d2da6f0a95bb
-DIST egm96-5.tar.bz2 10225152 BLAKE2B 81fbfb0095fc9a496a9434f8462b2aaeb2ce7fdaff2332aa38e9d57ab79e5801fa93705683a513a7990738494c57fc729520597353faa9a79775563f93018d69 SHA512 cbb4f2ca4df26f98af2848c0ec9d485567475ae510da1b8559c67e32a2b6abe1e4f1c24153952feca73a92b045454e44a2506b63f4f9ed634a296af085b99511
-DIST egm96.tar.bz2 2055724 BLAKE2B f2a844f565aa5383f6443bcdc22daf515b9f75b2e68091b07a59a9f70d8f0dea238198104fed746c16bd308429d8ee5487273b073eb1edcb86128fa72ac5ea79 SHA512 8c1db592355dad1a2ed5db9782cc8589abd83857eae0e476495695ab66e8b67a6c8df9afa277fdefb23f24a900f41d49e40a4f18f0deae98f23659848b3e2e3d
-DIST emm2010.tar.bz2 3627692 BLAKE2B 61e28905710781735bdb214cd7758aa371dd3409269a7793054afd43bf257274badf068647925c4da94d4bb5b06c0a24a0f8cb97ee2ac935818ed4eaaa3c4465 SHA512 09a2059158d9bfc40047a5680d96c026c399d319669ffda32bfc2eb6bcc7449201c0fb4244d074b4d4c0445719e3c4415cc18af51c93f66edcbcc3b92cf0a8b7
-DIST emm2015.tar.bz2 659405 BLAKE2B 927d5b884b7a4c89301b0f53863674dbd8e8d4d597d21c39412620b475010bfa0878bd79933f3724ba6c9fa3722f475519d913157204f1ff7b3c1735c59ad26a SHA512 44a0f8d9c4b9cdc86bac397858af6b15d4d6d6e7638641cc09e4e95b2757cdcf1a690280b4b593504cdab48e5dc09a98b08575117329a7c0473efa9649769098
-DIST emm2017.tar.bz2 1733711 BLAKE2B 4ad26905d3db94d41c3d6336b88e9eb72c14b14de2101f384166613ca5a5c8690b71dfa1510d010dfb3c5080194cbc66974f747d8df31733c3c5b642fcebed18 SHA512 e6b3d54bd9b10eefd6cd331e0ab011b04f0c71bb023d3356436afe0109e64ba54b35abd059c39d7d920eb826106fb562b424d4239fbffe0ae517823e8f9a36f8
 DIST geographiclib-1.50.tar.gz 2463958 BLAKE2B f3d136f5c90453542bfc8976c7e01b8e6721389d5b92bc4baa18fbbe6775dd6e171bc6eed39d658e579005718a3366d5b7769dd34fc7a45b0947a9de703ad505 SHA512 e4571780daa4f0a83f83d92a812c7059f27e33621a8643edfaf58fe66f395973fbd3559157f52ca54369136331189f0be3e3e458cc7cd243b09b75b466434afe
-DIST igrf11.tar.bz2 6011 BLAKE2B 342f2ac19f3de151e726c42b3d2e63967c5d8986c580c43ccdf003902997ea2a4e57495c5f5098168cce8410ca267dd84d2e5508e9e6e5a9d7074b48d600c76e SHA512 fd406c642aa551db0d1bc04c895ef84899367807709020bf774e8e944410252e9072ec3ef4273c46fce18d115e0a04e9ea4f83ac890638a21a414fb742a67c0d
-DIST igrf12.tar.bz2 6640 BLAKE2B 0cd310d64e9eae1d43302a7ec2b2b90e4a963dc041ff03437a44b299e16feb38ba2719411da7dfeaa7378c7469546c03c6aae11260e439574e7df2f68518a5b9 SHA512 f15744e19e1bf45bfafa62ed03b9966dd068c7baec761601d102f29e3bd801ec92355f169ac18b8f7b9fae001af13903aaab38b05334d9784dff30ce1c01e5d8
-DIST wgs84.tar.bz2 807 BLAKE2B 3092194633b838d7f589341b5696c5206516ded394f2c1a36f4d1c40c408e3755543ce03d8d34fdff6fa8f6739bff6d285bfadf99c4d43e0c9104b98ed0192ff SHA512 a786941bf978dd3cb10cd554110c1bc27d9647a3377468022785e85d9900c20732c3a9bce2dd84f1df69221d00f90c06e0b08685c1cfa006019885e0758c363e
-DIST wmm2010.tar.bz2 1442 BLAKE2B 1a22029dc69e015a092527640315e5fda3017178a4604bf58da5b4b3362570d5e6f49f3425ade94adfb15fb93b1e9e4f0bc08cfaf1466944f0cb013ca0e7846c SHA512 fba2dd2017e6b832d46e98dcc0e09ae0d8b2a904f172fef0f1085c924df22c2edad443167f176623ba7d4f047bf5c3a91d870e5854f03fc90ae2e536694e8dea
-DIST wmm2015v2.tar.bz2 1448 BLAKE2B 7570e05cfd7cf217d72ee917d17c66411461251db97792dbd71c292374482127cf6febb92e27d5722e215878ac5d741ec942b654490947155d2ca3f1d984c064 SHA512 d4f1cf83c5d893b60f78764139f486c55d808ebf0bf647bb163d4582bd6e515ab68d3ba00c74c5aa570017208dfad0a042ce848199c335a961755cab25d1fb86
-DIST wmm2020.tar.bz2 1434 BLAKE2B 1eee2dcd5731a8d192fe00399b3d500a8b5353b2c457ca3330845aef90a0fc5fcd66025cae0a2577438d6561174565b8b2516aa2ad27086326073ffa6ea9726c SHA512 7e64a9c15b2a29f6cc96151eef0d97225cdd6bf02afcd65b19eef13464f80c1dab753e21900c481074ebdd3410d8ab81b83c288bf0d3e24d91a3810f8e63cf6f
+DIST geoids-egm2008-1.tar.bz2 162388303 BLAKE2B ec79dbe2b25e8f9474fb4e8b704f9cb3c99d80004d0049bcfd956f7bcaa0822e6c0fcdc076f14075c688aeaac47bf68e192a114fca4c21edd81be880114b85f4 SHA512 0928a6e19aea2f372e946ce69c3a3826c2685c0a4029eb4bec7ab16873c03fbcc224ce47d99e6b6798e274a7d469fd3d303954938fb1f58c5dd5ba74907913d9
+DIST geoids-egm2008-2_5.tar.bz2 34927299 BLAKE2B bd4e3a04221669fe58e41eb4b93965415f3e238cd9af475fe78fe00592ebc80470309ac63366d9416bb2e0fd835dcb28a1302d89670d85271546a712c0918cc6 SHA512 dd65c8dc916f98a8592cc64518e2a6ac657d7d02d8316ff74cf3fcc62e413a8780ec52421b90e2ab4d846bd7fa2231e6d0a39467a7ea5b8774c71b9fece3cb34
+DIST geoids-egm2008-5.tar.bz2 10414793 BLAKE2B ee4fa8e8ab9e87b21197a0a6149a52a49e16a1cde3b5490b4590bede8f67ce6854c9fd2b55491a20963a150aeed53efef95aadde27ca9e9c3a88526940ba402d SHA512 cb3598219df6c7c4a3aea0df0005561aae90dd85c33b79ef39da00cf7512509ae3a3962178e83bed6a1ea85614618bfaf523653a56e6492d3fef243d8483eb0d
+DIST geoids-egm84-15.tar.bz2 1475184 BLAKE2B 3249dd2e724c33468542548070f5f0e8443480b627f046ced8316d6741a1566b3c43c88f20b18e56b599b71ecb5076295ac5cc099880ed5da82d74e5ccd07777 SHA512 06919c11044df7bd1b669e66972ccb19c0b439709becb5623ebb5a2f80ce5ed5fca3b3b47b519db80eb796f402919b093f6dcb68ee3a171096d84bcb051fa267
+DIST geoids-egm84-30.tar.bz2 416481 BLAKE2B f86c29543dc6ac3df0a7e95085872d84dc7a172a6d2636b0cd1e20bc7587fe8632911dff9821961c981edbadb7b68bb56e97a233ab7165d13810e920cce8bb34 SHA512 446d272afe925f7d73b4f0b251b3477d1f92e10a7335b5a05bf4d1f247e04413fb856f7a3f73958c87cbdf59fc516296d15bf7ed438cc1bed8f0ee4cd1630b67
+DIST geoids-egm96-15.tar.bz2 1490277 BLAKE2B c2fff9874dd2c155a5c63899841937fda0f66a1bd8cec6acc2d6c8242f1dd097c7f0a315288c0aee1c23b325634cddd56981f7a50833feb1ea57ded96bd9a30a SHA512 82f362483e605502ba2d996d3c05095d2967357b61322d18f1313fdb77c39a0307087eefadba10b9c260abf73b3c0013e84339ae173420e77f75d2da6f0a95bb
+DIST geoids-egm96-5.tar.bz2 10225152 BLAKE2B 81fbfb0095fc9a496a9434f8462b2aaeb2ce7fdaff2332aa38e9d57ab79e5801fa93705683a513a7990738494c57fc729520597353faa9a79775563f93018d69 SHA512 cbb4f2ca4df26f98af2848c0ec9d485567475ae510da1b8559c67e32a2b6abe1e4f1c24153952feca73a92b045454e44a2506b63f4f9ed634a296af085b99511
+DIST gravity-egm2008.tar.bz2 74456990 BLAKE2B 6f64b60d5506d7c27d22ea979d666103d529aaa9b12ec1a2cb9248c0cd6ac97c6ec1e4c64bb8f690999143d9e2e76e528b8ed66fc5c48ecbc20ffd94b9b767bb SHA512 c921c3bd66fb00d05ee983c3e9ad49b38f4a8d881e9073ccf250f3737486701beeac66d0d8726626282a91bdc44ddce073f2e6729bfa914b78887009aed0ad0f
+DIST gravity-egm84.tar.bz2 258023 BLAKE2B 58820879bf22a50a4c39824971fe8921eab9610af9a913d0aaf6b0457274c48373ba4f1aad63f35c0c24e302fef4ae0923b900cd3dfffd6f3b38f77977332b4e SHA512 350a182912580dfc8072f6c9e92d1f3559094bb19d167008228e3888ed0b6af69dc22bd0ac63ee6074cb91266a9c7ce29452076c96b72c5b39feae84f0dd7a54
+DIST gravity-egm96.tar.bz2 2055724 BLAKE2B f2a844f565aa5383f6443bcdc22daf515b9f75b2e68091b07a59a9f70d8f0dea238198104fed746c16bd308429d8ee5487273b073eb1edcb86128fa72ac5ea79 SHA512 8c1db592355dad1a2ed5db9782cc8589abd83857eae0e476495695ab66e8b67a6c8df9afa277fdefb23f24a900f41d49e40a4f18f0deae98f23659848b3e2e3d
+DIST gravity-wgs84.tar.bz2 807 BLAKE2B 3092194633b838d7f589341b5696c5206516ded394f2c1a36f4d1c40c408e3755543ce03d8d34fdff6fa8f6739bff6d285bfadf99c4d43e0c9104b98ed0192ff SHA512 a786941bf978dd3cb10cd554110c1bc27d9647a3377468022785e85d9900c20732c3a9bce2dd84f1df69221d00f90c06e0b08685c1cfa006019885e0758c363e
+DIST magnetic-emm2010.tar.bz2 3627692 BLAKE2B 61e28905710781735bdb214cd7758aa371dd3409269a7793054afd43bf257274badf068647925c4da94d4bb5b06c0a24a0f8cb97ee2ac935818ed4eaaa3c4465 SHA512 09a2059158d9bfc40047a5680d96c026c399d319669ffda32bfc2eb6bcc7449201c0fb4244d074b4d4c0445719e3c4415cc18af51c93f66edcbcc3b92cf0a8b7
+DIST magnetic-emm2015.tar.bz2 659405 BLAKE2B 927d5b884b7a4c89301b0f53863674dbd8e8d4d597d21c39412620b475010bfa0878bd79933f3724ba6c9fa3722f475519d913157204f1ff7b3c1735c59ad26a SHA512 44a0f8d9c4b9cdc86bac397858af6b15d4d6d6e7638641cc09e4e95b2757cdcf1a690280b4b593504cdab48e5dc09a98b08575117329a7c0473efa9649769098
+DIST magnetic-emm2017.tar.bz2 1733711 BLAKE2B 4ad26905d3db94d41c3d6336b88e9eb72c14b14de2101f384166613ca5a5c8690b71dfa1510d010dfb3c5080194cbc66974f747d8df31733c3c5b642fcebed18 SHA512 e6b3d54bd9b10eefd6cd331e0ab011b04f0c71bb023d3356436afe0109e64ba54b35abd059c39d7d920eb826106fb562b424d4239fbffe0ae517823e8f9a36f8
+DIST magnetic-igrf11.tar.bz2 6011 BLAKE2B 342f2ac19f3de151e726c42b3d2e63967c5d8986c580c43ccdf003902997ea2a4e57495c5f5098168cce8410ca267dd84d2e5508e9e6e5a9d7074b48d600c76e SHA512 fd406c642aa551db0d1bc04c895ef84899367807709020bf774e8e944410252e9072ec3ef4273c46fce18d115e0a04e9ea4f83ac890638a21a414fb742a67c0d
+DIST magnetic-igrf12.tar.bz2 6640 BLAKE2B 0cd310d64e9eae1d43302a7ec2b2b90e4a963dc041ff03437a44b299e16feb38ba2719411da7dfeaa7378c7469546c03c6aae11260e439574e7df2f68518a5b9 SHA512 f15744e19e1bf45bfafa62ed03b9966dd068c7baec761601d102f29e3bd801ec92355f169ac18b8f7b9fae001af13903aaab38b05334d9784dff30ce1c01e5d8
+DIST magnetic-wmm2010.tar.bz2 1442 BLAKE2B 1a22029dc69e015a092527640315e5fda3017178a4604bf58da5b4b3362570d5e6f49f3425ade94adfb15fb93b1e9e4f0bc08cfaf1466944f0cb013ca0e7846c SHA512 fba2dd2017e6b832d46e98dcc0e09ae0d8b2a904f172fef0f1085c924df22c2edad443167f176623ba7d4f047bf5c3a91d870e5854f03fc90ae2e536694e8dea
+DIST magnetic-wmm2015v2.tar.bz2 1448 BLAKE2B 7570e05cfd7cf217d72ee917d17c66411461251db97792dbd71c292374482127cf6febb92e27d5722e215878ac5d741ec942b654490947155d2ca3f1d984c064 SHA512 d4f1cf83c5d893b60f78764139f486c55d808ebf0bf647bb163d4582bd6e515ab68d3ba00c74c5aa570017208dfad0a042ce848199c335a961755cab25d1fb86
+DIST magnetic-wmm2020.tar.bz2 1434 BLAKE2B 1eee2dcd5731a8d192fe00399b3d500a8b5353b2c457ca3330845aef90a0fc5fcd66025cae0a2577438d6561174565b8b2516aa2ad27086326073ffa6ea9726c SHA512 7e64a9c15b2a29f6cc96151eef0d97225cdd6bf02afcd65b19eef13464f80c1dab753e21900c481074ebdd3410d8ab81b83c288bf0d3e24d91a3810f8e63cf6f
diff --git a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild
index 96acef621..a880de3b7 100644
--- a/sci-geosciences/geographiclib/geographiclib-1.50.ebuild
+++ b/sci-geosciences/geographiclib/geographiclib-1.50.ebuild
@@ -16,14 +16,14 @@ HOMEPAGE="https://sourceforge.net/projects/geographiclib/"
 
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE_GEOID_DATASET="
-	geoid_dataset_egm84-30
-	geoid_dataset_egm84-15
-	geoid_dataset_egm96-15
-	geoid_dataset_egm96-5
-	geoid_dataset_egm2008-5
-	geoid_dataset_egm2008-2-5
-	geoid_dataset_egm2008-1
+IUSE_GEOIDS_DATASET="
+	geoids_dataset_egm84-30
+	geoids_dataset_egm84-15
+	geoids_dataset_egm96-15
+	geoids_dataset_egm96-5
+	geoids_dataset_egm2008-5
+	geoids_dataset_egm2008-2-5
+	geoids_dataset_egm2008-1
 "
 IUSE_GRAVITY_MODEL="
 	gravity_model_egm84
@@ -48,44 +48,48 @@ IUSE_PRECISION="
 	precision_quad
 	precision_single
 "
-IUSE="${IUSE_GEOID_DATASET} ${IUSE_GRAVITY_MODEL} ${IUSE_MAGNETIC_MODEL} ${IUSE_PRECISION} boost doc examples geoid gravity magnetic python"
-IUSE_EXPAND="GEOID_DATASET GRAVITY_MODEL MAGNETIC_MODEL PRECISION"
+IUSE="${IUSE_GEOIDS_DATASET} ${IUSE_GRAVITY_MODEL} ${IUSE_MAGNETIC_MODEL} ${IUSE_PRECISION} boost doc examples geoids gravity magnetic python"
+IUSE_EXPAND="GEOIDS_DATASET GRAVITY_MODEL MAGNETIC_MODEL PRECISION"
+
+#reverse required use needed, e.g. !geoids? ( !geoids_dataset_egm2008-1 ) and so on, use bash magic to generate them
 REQUIRED_USE="
 	^^ ( ${IUSE_PRECISION/+/} )
-	geoid? ( || ( ${IUSE_GEOID_DATASET/+/} ) )
+	geoids? ( || ( ${IUSE_GEOIDS_DATASET/+/} ) )
 	gravity? ( || ( ${IUSE_GRAVITY_MODEL/+/} ) )
 	magnetic? ( || ( ${IUSE_MAGNETIC_MODEL/+/} ) )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
+
+COMMON_URI="https://sourceforge.net/projects/${PN}/files"
 SRC_URI="
-https://sourceforge.net/projects/${PN}/files/distrib/${MY_P}.tar.gz/download -> ${P}.tar.gz
-
-geoid_dataset_egm84-30?		( https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-30.tar.bz2 )
-geoid_dataset_egm84-15?		( https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm84-15.tar.bz2 )
-geoid_dataset_egm96-15?		( https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-15.tar.bz2 )
-geoid_dataset_egm96-5?		( https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm96-5.tar.bz2 )
-geoid_dataset_egm2008-5?	( https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-5.tar.bz2 )
-geoid_dataset_egm2008-2-5?	( https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-2_5.tar.bz2 )
-geoid_dataset_egm2008-1?	( https://sourceforge.net/projects/geographiclib/files/geoids-distrib/egm2008-1.tar.bz2 )
-
-gravity_model_egm84?		( https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm84.tar.bz2 )
-gravity_model_egm96?		( https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm96.tar.bz2 )
-gravity_model_egm2008?		( https://sourceforge.net/projects/geographiclib/files/gravity-distrib/egm2008.tar.bz2 )
-gravity_model_wgs84?		( https://sourceforge.net/projects/geographiclib/files/gravity-distrib/wgs84.tar.bz2 )
-
-magnetic_model_wmm2010?		( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2010.tar.bz2 )
-magnetic_model_wmm2015v2?	( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2015v2.tar.bz2 )
-magnetic_model_wmm2020?		( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/wmm2020.tar.bz2 )
-magnetic_model_igrf11?		( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf11.tar.bz2 )
-magnetic_model_igrf12?		( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/igrf12.tar.bz2 )
-magnetic_model_emm2010?		( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2010.tar.bz2 )
-magnetic_model_emm2015?		( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2015.tar.bz2 )
-magnetic_model_emm2017?		( https://sourceforge.net/projects/geographiclib/files/magnetic-distrib/emm2017.tar.bz2 )
+${COMMON_URI}/distrib/${MY_P}.tar.gz/download -> ${P}.tar.gz
+
+geoids_dataset_egm84-30?         ( ${COMMON_URI}/geoids-distrib/egm84-30.tar.bz2	-> geoids-egm84-30.tar.bz2	)
+geoids_dataset_egm84-15?         ( ${COMMON_URI}/geoids-distrib/egm84-15.tar.bz2	-> geoids-egm84-15.tar.bz2	)
+geoids_dataset_egm96-15?         ( ${COMMON_URI}/geoids-distrib/egm96-15.tar.bz2	-> geoids-egm96-15.tar.bz2	)
+geoids_dataset_egm96-5?          ( ${COMMON_URI}/geoids-distrib/egm96-5.tar.bz2		-> geoids-egm96-5.tar.bz2	)
+geoids_dataset_egm2008-5?        ( ${COMMON_URI}/geoids-distrib/egm2008-5.tar.bz2	-> geoids-egm2008-5.tar.bz2	)
+geoids_dataset_egm2008-2-5?      ( ${COMMON_URI}/geoids-distrib/egm2008-2_5.tar.bz2	-> geoids-egm2008-2_5.tar.bz2	)
+geoids_dataset_egm2008-1?        ( ${COMMON_URI}/geoids-distrib/egm2008-1.tar.bz2	-> geoids-egm2008-1.tar.bz2	)
+
+gravity_model_egm84?            ( ${COMMON_URI}/gravity-distrib/egm84.tar.bz2		-> gravity-egm84.tar.bz2	)
+gravity_model_egm96?            ( ${COMMON_URI}/gravity-distrib/egm96.tar.bz2		-> gravity-egm96.tar.bz2	)
+gravity_model_egm2008?          ( ${COMMON_URI}/gravity-distrib/egm2008.tar.bz2		-> gravity-egm2008.tar.bz2	)
+gravity_model_wgs84?            ( ${COMMON_URI}/gravity-distrib/wgs84.tar.bz2		-> gravity-wgs84.tar.bz2	)
+
+magnetic_model_wmm2010?         ( ${COMMON_URI}/magnetic-distrib/wmm2010.tar.bz2	-> magnetic-wmm2010.tar.bz2	)
+magnetic_model_wmm2015v2?       ( ${COMMON_URI}/magnetic-distrib/wmm2015v2.tar.bz2	-> magnetic-wmm2015v2.tar.bz2	)
+magnetic_model_wmm2020?         ( ${COMMON_URI}/magnetic-distrib/wmm2020.tar.bz2	-> magnetic-wmm2020.tar.bz2	)
+magnetic_model_igrf11?          ( ${COMMON_URI}/magnetic-distrib/igrf11.tar.bz2		-> magnetic-igrf11.tar.bz2	)
+magnetic_model_igrf12?          ( ${COMMON_URI}/magnetic-distrib/igrf12.tar.bz2		-> magnetic-igrf12.tar.bz2	)
+magnetic_model_emm2010?         ( ${COMMON_URI}/magnetic-distrib/emm2010.tar.bz2	-> magnetic-emm2010.tar.bz2	)
+magnetic_model_emm2015?         ( ${COMMON_URI}/magnetic-distrib/emm2015.tar.bz2	-> magnetic-emm2015.tar.bz2	)
+magnetic_model_emm2017?         ( ${COMMON_URI}/magnetic-distrib/emm2017.tar.bz2	-> magnetic-emm2017.tar.bz2	)
 "
 #TODO: find out the licenses of the geoid and gravity datasets
 LICENSE="
 	MIT
-	geoid? ( public-domain )
+	geoids? ( public-domain )
 	gravity? ( public-domain )
 	magnetic? ( public-domain )
 "
@@ -111,6 +115,9 @@ distutils_enable_tests setup.py
 
 src_prepare() {
 	#TODO: strip cflags
+#	sed -i "s|CXXFLAGS = -g -Wall -Wextra -O3 -std=c++0x||" tools/Makefile.mk || die
+#	sed -i "s|CXXFLAGS = -g -Wall -Wextra -O3 -std=c++0x||" src/Makefile.mk || die
+
 	default
 
 	# FATAL: cmake_src_prepare has not been run
@@ -131,11 +138,15 @@ src_configure() {
 	use precision_quad		&& precision="4"
 	use precision_single		&& precision="1"
 
+	export GEODATAPATH="/usr/share/GeographicLib"
+
 	local mycmakeargs=(
 		-DGEOGRAPHICLIB_DOCUMENTATION=$(usex doc ON OFF)
 		-DGEOGRAPHICLIB_LIB_TYPE="SHARED"
 		-DUSE_BOOST_FOR_EXAMPLES=$(usex boost ON OFF)
 		-DGEOGRAPHICLIB_PRECISION="${precision}"
+		-DGEOGRAPHICLIB_DATA="${GEODATAPATH}"
+		-DCMAKE_INSTALL_PREFIX="/usr"
 	)
 
 	cmake_src_configure
@@ -163,15 +174,20 @@ src_test() {
 }
 
 src_install() {
+	insinto "${GEODATAPATH}/geoids"
+	use geoids && doins -r "${WORKDIR}"/geoids/.
+	insinto "${GEODATAPATH}/gravity"
+	use gravity && doins -r "${WORKDIR}"/gravity/.
+	insinto "${GEODATAPATH}/magnetic"
+	use magnetic && doins -r "${WORKDIR}"/magnetic/.
+
 	if use python; then
 		cd "python" || die
 		distutils-r1_python_install_all
 		cd ".."
 	fi
-
 	# Access denied, make file needs patching
 	# to correctly install in ${D}
 	default
-	#TODO: install datasets
 	#TODO: find out if java stuff need something
 }
diff --git a/sci-geosciences/geographiclib/metadata.xml b/sci-geosciences/geographiclib/metadata.xml
index 06b4973fd..589c87f8d 100644
--- a/sci-geosciences/geographiclib/metadata.xml
+++ b/sci-geosciences/geographiclib/metadata.xml
@@ -12,15 +12,15 @@
 	<use>
 		<flag name="boost">Boost library is searched for in order to build the NearestNeighbor example</flag>
 		<flag name="gravity">Install the gravity models</flag>
-		<flag name="geoid">Install the geoid datasets</flag>
+		<flag name="geoids">Install the geoids datasets</flag>
 		<flag name="magnetic">Install the magnetic field models</flag>
-		<flag name="geoid_dataset_egm84-30">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid</flag>
-		<flag name="geoid_dataset_egm84-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid</flag>
-		<flag name="geoid_dataset_egm96-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid</flag>
-		<flag name="geoid_dataset_egm96-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 5' grid</flag>
-		<flag name="geoid_dataset_egm2008-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid</flag>
-		<flag name="geoid_dataset_egm2008-2-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 2.5' grid</flag>
-		<flag name="geoid_dataset_egm2008-1">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 1' grid</flag>
+		<flag name="geoids_dataset_egm84-30">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 30' grid</flag>
+		<flag name="geoids_dataset_egm84-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/wgs84_180/wgs84_180.html 15' grid</flag>
+		<flag name="geoids_dataset_egm96-15">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 15' grid</flag>
+		<flag name="geoids_dataset_egm96-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/egm96.html 5' grid</flag>
+		<flag name="geoids_dataset_egm2008-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 5' grid</flag>
+		<flag name="geoids_dataset_egm2008-2-5">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 2.5' grid</flag>
+		<flag name="geoids_dataset_egm2008-1">http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008 1' grid</flag>
 		<flag name="gravity_model_egm84">the Earth Gravity Model 1984, which includes terms up to degree 180</flag>
 		<flag name="gravity_model_egm96">the Earth Gravity Model 1996, which includes terms up to degree 360</flag>
 		<flag name="gravity_model_egm2008"> the Earth Gravity Model 2008, which includes terms up to degree 2190</flag>