games-util/pyfa: Fix LICENSE in old versions.

Should be "all-rights-reserved", not "free-noncomm". Also add mirror
and bindist restriction, and move RESTRICT to its canonical location.

Closes: https://bugs.gentoo.org/702330
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm@gentoo.org>

6 files changed, 13 insertions, 10 deletions

diff --git a/games-util/pyfa/pyfa-1.34.0.ebuild b/games-util/pyfa/pyfa-1.34.0.ebuild
index e5a519fb0a62..d95e2cc04932 100644
--- a/games-util/pyfa/pyfa-1.34.0.ebuild
+++ b/games-util/pyfa/pyfa-1.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ inherit eutils gnome2-utils python-r1
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
 
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 all-rights-reserved"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
@@ -22,6 +22,7 @@ else
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
diff --git a/games-util/pyfa/pyfa-1.35.0.ebuild b/games-util/pyfa/pyfa-1.35.0.ebuild
index 566b23ecc2d1..c0429060cc70 100644
--- a/games-util/pyfa/pyfa-1.35.0.ebuild
+++ b/games-util/pyfa/pyfa-1.35.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ inherit eutils gnome2-utils python-r1
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
 
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 all-rights-reserved"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
@@ -22,6 +22,7 @@ else
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
diff --git a/games-util/pyfa/pyfa-1.35.1.ebuild b/games-util/pyfa/pyfa-1.35.1.ebuild
index 566b23ecc2d1..c0429060cc70 100644
--- a/games-util/pyfa/pyfa-1.35.1.ebuild
+++ b/games-util/pyfa/pyfa-1.35.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ inherit eutils gnome2-utils python-r1
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
 
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
+LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 all-rights-reserved"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
@@ -22,6 +22,7 @@ else
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
 
 RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
diff --git a/games-util/pyfa/pyfa-1.37.0.ebuild b/games-util/pyfa/pyfa-1.37.0.ebuild
index 32200ccbee19..a366235de533 100644
--- a/games-util/pyfa/pyfa-1.37.0.ebuild
+++ b/games-util/pyfa/pyfa-1.37.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,6 @@ inherit desktop eutils gnome2-utils python-r1
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
 
-RESTRICT="mirror bindist"
 LICENSE="GPL-3+ all-rights-reserved"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
@@ -23,6 +22,7 @@ else
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
 
 RDEPEND="
 	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
diff --git a/games-util/pyfa/pyfa-2.14.1.ebuild b/games-util/pyfa/pyfa-2.14.1.ebuild
index 2f7b3917e18b..e3c4bc186500 100644
--- a/games-util/pyfa/pyfa-2.14.1.ebuild
+++ b/games-util/pyfa/pyfa-2.14.1.ebuild
@@ -10,7 +10,6 @@ inherit desktop eutils python-single-r1 xdg-utils
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
 
-RESTRICT="mirror bindist"
 LICENSE="GPL-3+ all-rights-reserved"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
@@ -23,6 +22,7 @@ else
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
 
 DEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
index 2f7b3917e18b..e3c4bc186500 100644
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ b/games-util/pyfa/pyfa-9999.ebuild
@@ -10,7 +10,6 @@ inherit desktop eutils python-single-r1 xdg-utils
 DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
 HOMEPAGE="https://github.com/pyfa-org/Pyfa"
 
-RESTRICT="mirror bindist"
 LICENSE="GPL-3+ all-rights-reserved"
 SLOT="0"
 if [[ ${PV} = 9999 ]]; then
@@ -23,6 +22,7 @@ else
 fi
 IUSE="+graph"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="mirror bindist"
 
 DEPEND="
 	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]