9 files changed, 18 insertions, 33 deletions
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 25b456b43f74..5fdd675ee845 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
index 21bdf16134ff..987649b96823 100644
--- a/games-simulation/flightgear-data/Manifest
+++ b/games-simulation/flightgear-data/Manifest
@@ -1,6 +1,6 @@
 DIST FlightGear-2018.3.1-data.tar.bz2 1735407015 BLAKE2B e076e0096656c607cd32c7f86999685bc65bc1d8a28a260e0e7d760a5d4ea645f3a84f8410f9091e9767fcc143d0910f3e2ac2546e9408a49032b864bdd3c742 SHA512 495ef2dc87244c10cbca6deed7731e84f07c4a495e6d70ea7a88581e655b366c17900603f2388d2d21c4fe5cc4279820ae2a112376deeba4d37a53cd3495c102
 DIST FlightGear-2018.3.2-data.tar.bz2 1744998558 BLAKE2B 8ce8b34973687df907695c11eb385fc87526e6c6b54a2e1180819a6d0b503f27d0bbce7f400041a4f724e5dc940a84db90faf267e4ab012457ac753f243eb1d1 SHA512 64baa8a42d6a6e930cc2a14e62f6f3488f08cb3121973aece8818275b8f4934a94539e24b95646d7c5bb8bd5eef65ff91d63013c07dabf79f452908b749640bb
-EBUILD flightgear-data-2018.3.1.ebuild 515 BLAKE2B a360626ccf5d47b379f96d0eb69813697eb6428a4933c8243298855ec90094252aa0ac2047467245be2edf0242238f65a0f6f004adccbfef353a5d1e4f040a76 SHA512 adea1e43c16a43b4c16ddaa43af7c55c6390f82c78dbdd42fe6ce77a317a324cbe5fd22137e251b50dd2fdea317680d69cb802192386e26e05b840c2699addcd
-EBUILD flightgear-data-2018.3.2.ebuild 515 BLAKE2B a360626ccf5d47b379f96d0eb69813697eb6428a4933c8243298855ec90094252aa0ac2047467245be2edf0242238f65a0f6f004adccbfef353a5d1e4f040a76 SHA512 adea1e43c16a43b4c16ddaa43af7c55c6390f82c78dbdd42fe6ce77a317a324cbe5fd22137e251b50dd2fdea317680d69cb802192386e26e05b840c2699addcd
-EBUILD flightgear-data-9999.ebuild 546 BLAKE2B ea1647fcbee2eee6a213ad67e6fa6ca22ee66d8a7ed4cc6928a75a9e2852b9befbba63aa5032921da37aa83cbb22d3d6433d459faa5787d80cdd33678215125c SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508
+EBUILD flightgear-data-2018.3.1.ebuild 413 BLAKE2B 32dab4a039b905eac166d7694ae7d5fc2859151bede845242ac0297369e6c0169d996721028e2a69770873945de97e98a5d38aa9173b3b275ee08c2ecc2e62d6 SHA512 b87017373187d3c7035b7d615a56b2bea612e716ba1efeb38b6f78d1ab6bd687761763728dc6dac0363d736ba2958ee19dab126d58f90636b36ecce63661aec7
+EBUILD flightgear-data-2018.3.2.ebuild 413 BLAKE2B 32dab4a039b905eac166d7694ae7d5fc2859151bede845242ac0297369e6c0169d996721028e2a69770873945de97e98a5d38aa9173b3b275ee08c2ecc2e62d6 SHA512 b87017373187d3c7035b7d615a56b2bea612e716ba1efeb38b6f78d1ab6bd687761763728dc6dac0363d736ba2958ee19dab126d58f90636b36ecce63661aec7
+EBUILD flightgear-data-9999.ebuild 441 BLAKE2B 3b7ee68c01c42e28bef40f5aca34f9453b6fdcdf7fd25d4122a96c8436f4c4486d49f31376f936d407067ef866191e32a4a7729ee7ecb5a01a144e1d32399554 SHA512 0d0a2a49074e50aeb9660082af1851c71743ecb4f4388f937bea1ff5dfc2d7eff757f37ff0eae98a97b7a7b244e05d41b4c003a39959414a040b01984b6f29d8
 MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
index 5e2859ac4b45..30bc1d192aa2 100644
--- a/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2018.3.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
 SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
 
 LICENSE="GPL-2"
@@ -12,11 +12,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# data files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
 S=${WORKDIR}/fgdata
 
 src_install() {
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
index 5e2859ac4b45..30bc1d192aa2 100644
--- a/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-2018.3.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
 SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
 
 LICENSE="GPL-2"
@@ -12,11 +12,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# data files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
 S=${WORKDIR}/fgdata
 
 src_install() {
diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
index 3e99ac372dbe..387835083e95 100644
--- a/games-simulation/flightgear-data/flightgear-data-9999.ebuild
+++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit git-r3
 
 DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
 EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
 	git://mapserver.flightgear.org/fgdata"
 EGIT_BRANCH="next"
@@ -16,11 +16,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-# data files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
 src_install() {
 	insinto /usr/share/flightgear
 	rm -fr .git
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
index 1025aa07261d..0986caa096b9 100644
--- a/games-simulation/flightgear/Manifest
+++ b/games-simulation/flightgear/Manifest
@@ -3,7 +3,7 @@ AUX flightgear-2018.3.2-cmake.patch 1322 BLAKE2B 4b68e744cf0cd7ea9582025980d055f
 AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
 DIST flightgear-2018.3.1.tar.bz2 8404294 BLAKE2B b90d64bc7381baef3adf3f2b77acb6822562d76319e85bebeda977754c281cd48b4ce137d910cc9f96947cfe1b7612c6ff45f2ed49775348b651944bb8796ba4 SHA512 ad07cdf90b1890519a22a1f79374b2d11e70191d85bc76d50913708a250801c3e091228999011367e374572a46c60f572f8b138d6a7c9fd2155f63107667d93c
 DIST flightgear-2018.3.2.tar.bz2 8405351 BLAKE2B 8abc3cc37281f1cc30c51518570e7278722f1d804f6568d7619150e7ddf13eef784314873571ea99d039ca4a94968e8e96779e26d8618eee4b1ed248e88dc52a SHA512 76a127949351fe48d847a1471002ecbc3daa769952fef7a7a141e83031771e87f4e23c329e9d03ddd2e99b4b96fb6af2ebe5ab90ca50c0111217c62492cd516d
-EBUILD flightgear-2018.3.1.ebuild 4086 BLAKE2B 3d9658d8fce4a0854aeafe8efac28fadd4e3b1a177909d6818aaf729fe94c40dcfc374ae3e394bb158e73140eeac7031a348fdaf921504bef9da2ec26984e691 SHA512 131765eefaf7b02e93bc09544561da9764565bc9d56c0d0fce017e7b3d1e58ae867eed46992b219d495093dd689571e63f3f6c14ec9512fa25344748456f0cee
-EBUILD flightgear-2018.3.2.ebuild 4309 BLAKE2B 57dd4e69c206f7aaf14b951d1a8274afdad34db8f9586f6a32416674aa357a5d9036d6dd7e7bf162feb9fe199187ae63ebdf539d621fb13c5e6301c54e9119fd SHA512 c639424a0be0f38362bcb8a744da37dd42a891f15df125e834d0921111aafaa300b431c3b12d0723f32cc9140f64ba11137b8ec56d5bc053b5aba34e1794da68
-EBUILD flightgear-9999.ebuild 4230 BLAKE2B 2d64e5ab90eef73665975514fd1845fbdcc143cb08fbacf34989e81c403d0fd946995ab8104d48e6948235cf97819c0675da3a51b595a30f3d6ac515c4029c59 SHA512 0f485ac4e40961867c8f895d42eecc3147cdb2c68961f5ed1bd6e1e1a65d8ce36d6bb280392d8252cbb31f2d722dced09e1ffb008c785565a1b3429cdaee8899
+EBUILD flightgear-2018.3.1.ebuild 4087 BLAKE2B 0a7b0911675ce783ce24f58787eee9cf68913c1e0c6fc6d2b3314deba9c11f4b7c9827af793f406256edc134b40bfbb237007342032d9946b036998b03c1e3ce SHA512 add99296631ba12248fca84385bbd0055d28b702afae17dee1025f5dd88bb46390dd85a59c43c195ca534a866ecb9894fbd047fcf0670a03de6705209a376407
+EBUILD flightgear-2018.3.2.ebuild 4310 BLAKE2B 65312f38f62182e651ceda96a80403d4f1f3e193c6f69aac8c89a38a7402fbf8e5358fd9b1b94fc45cde89d8cef53bc6dab5d93867e202318dc435a6ebcafc35 SHA512 4f57dedad121246e8d9e7350b523f51fac5516be0b8d0c035483a16e52c1dca671a916292e0a744fe482c454262438acf49a55cf24b71be7200d6c6172f226ce
+EBUILD flightgear-9999.ebuild 4231 BLAKE2B 294cf39adb8a9ca6295d0d374efd43568bf008df536ec06c661ff158c376ffcc314203a4849aeefd53e035b16158e34ffd9f0007c8c8063570953674e4d5690e SHA512 72dcd42ac6f639774326f6ab99e391cc304cb4c08973b7e3934c2905b8da899ffda1da0dc207a019b7389733cc9987c7a1229b198d788d992c33891c058b00a8
 MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/flightgear-2018.3.1.ebuild b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
index 0a793b2009ae..6e3aa9ddb610 100644
--- a/games-simulation/flightgear/flightgear-2018.3.1.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
 SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/games-simulation/flightgear/flightgear-2018.3.2.ebuild b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
index ddec50a3ac88..7b68e8112ef2 100644
--- a/games-simulation/flightgear/flightgear-2018.3.2.ebuild
+++ b/games-simulation/flightgear/flightgear-2018.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
 SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
index 0243250482c9..1dcf521d629d 100644
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ b/games-simulation/flightgear/flightgear-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
 
 DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
+HOMEPAGE="https://www.flightgear.org/"
 EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
 	git://mapserver.flightgear.org/${PN}"
 EGIT_BRANCH="next"