From 0bd227178469cc0e86ea8e1ff4bbe06e091c3ba2 Mon Sep 17 00:00:00 2001
From: Wim Muskee <wimmuskee@gmail.com>
Date: Sat, 11 Jan 2020 16:35:19 +0100
Subject: [PATCH] games-simulation/flightgear-data: update HOMEPAGE use https,
 fix NonexistentBlocker

Closes: https://github.com/gentoo/gentoo/pull/14307
Signed-off-by: Wim Muskee <wimmuskee@gmail.com>
Signed-off-by: David Seifert <soap@gentoo.org>
---
 .../flightgear-data/flightgear-data-2018.3.1.ebuild      | 9 ++-------
 .../flightgear-data/flightgear-data-2018.3.2.ebuild      | 9 ++-------
 .../flightgear-data/flightgear-data-9999.ebuild          | 9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

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
-- 
2.26.2