games-util/pyfa: version bump to 1.37.0 #7367

ZeroPointEnergy · 2018-03-05T20:35:17Z

Package-Manager: Portage-2.3.19, Repoman-2.3.6

Simple version bump, no changes to the ebuild

gentoo-repo-qa-bot · 2018-03-05T20:36:50Z

Pull Request assignment

Areas affected: ebuilds
Packages affected: games-util/pyfa

games-util/pyfa: ~~a.zuber[at]gmx.ch~~, @gentoo/proxy-maint

No bugs to link found. If your pull request references any of the Gentoo bug reports, please add appropriate GLEP 66 tags to the commit message and ping us to reset the assignment.

If you do not receive any reply to this pull request, please open or link a bug to attract the attention of maintainers.

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

monsieurp · 2018-03-10T22:48:42Z

games-util/pyfa/pyfa-1.35.2.ebuild

+
+	eapply_user
+
+	touch __init__.py


The intention of the application developers is that pyfa is installed somewhere in the users home directory. The ebuild however installs it in the proper locations for python packages and since there is no __init__.py coming with the sources one is created to make python recognize it as a proper package.

The ebuild and program works without this, but I think it is the right thing to do here: https://docs.python.org/3/tutorial/modules.html#packages

Just ||die, please.

I'd also suggest adding a comment so that future maintainers aren't confused with this line.

monsieurp · 2018-03-10T22:48:59Z

games-util/pyfa/pyfa-1.35.2.ebuild

+
+	pyfa_make_configforced() {
+		mkdir -p "${BUILD_DIR}" || die
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \


missing || die

monsieurp · 2018-03-10T22:49:05Z

games-util/pyfa/pyfa-1.35.2.ebuild

+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
+			-e "s:%%EPREFIX%%:${EPREFIX}:" \
+			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
+		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \


mgorny

Please squash the changes afterwards.

mgorny · 2018-03-14T11:15:14Z

games-util/pyfa/pyfa-1.35.2.ebuild

+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"


I think pyfa-${PV} is equivalent to ${P}, isn't it?

mgorny · 2018-03-14T11:15:46Z

games-util/pyfa/pyfa-1.35.2.ebuild

+
+	eapply_user
+
+	touch __init__.py


Just ||die, please.

mgorny · 2018-03-14T11:18:00Z

games-util/pyfa/pyfa-1.35.2.ebuild

+
+src_install() {
+	pyfa_py_install() {
+		local packagedir=$(python_get_sitedir)/${PN}


Please use python_domodule to install to site-packages. It should handle any kind of data files too.

mgorny · 2018-03-14T11:19:18Z

games-util/pyfa/pyfa-1.35.2.ebuild

+	python_foreach_impl pyfa_py_install
+
+	insinto /usr/share/${PN}
+	doins eve.db


I hope this file isn't modified at runtime.

This is an asset database for the program. The program does not change it at runtime, it only gets updated with new releases.

mgorny · 2018-03-14T11:19:49Z

games-util/pyfa/pyfa-1.35.2.ebuild

+	popd > /dev/null || die
+
+	dodoc README.md
+	doicon -s 32 imgs/gui/pyfa.png


This is desktop.eclass now, not eutils.

I added the desktop eclass, but the eutils is still needed because of a call to edos2unix

mgorny · 2018-03-14T11:19:59Z

games-util/pyfa/pyfa-1.35.2.ebuild

+}
+
+pkg_preinst() {
+	gnome2_icon_savelist


This is no longer necessary.

I was talking about savelist, not update calls. Updates are still necessary/

fixed, sorry

ZeroPointEnergy · 2018-03-27T07:50:55Z

Implemented the requested changes and squashed the commits onto the current master. I also added yet another release which came out two days ago.

mgorny · 2018-03-27T18:45:30Z

games-util/pyfa/pyfa-1.35.2.ebuild

+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,threads"
+
+inherit eutils desktop python-r1 python-utils-r1


Please sort lexically whenever possible, and don't inherit python-utils-r1 directly.

mgorny · 2018-03-27T18:46:39Z

games-util/pyfa/pyfa-1.35.2.ebuild

+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"


I'm sorry if you've been asked about this already but do you actually need all those licenses simultaneously?

You are absolutely right, I don't think they are correct. The software itself is GPL-3, but there are game assets bundled with the code which have another licenses and it is not clear to me what they are. I opened a ticked about it upstream and try to investigate this. May take some time.

If those assets are installed and are indeed licensed with all those licenses, then LICENSE is correct.

Ok, sorry for the long delay. The developer just got an answer from the asset owners and it's more or less "we don't know". pyfa-org/Pyfa#1505

What he proposes is that we include the text snipped he has on the bottom of the README here: https://github.com/pyfa-org/Pyfa/blob/master/README.md

So should I just add that text as a licence file and add that that as license together with GPL3 for the pyfa code? Is there a naming convention for this (I looked around but found none)?

CCP-assets-pfya (because the text is granting the rights to pyfa specifically) ?

Let's wait for @gentoo/licenses to advise. In the meantime, please implement all the remaining remarks.

I have already commented at pyfa-org/Pyfa#1505 but I must admit that I am somewhat at a loss concerning the license situation.

Especially, is the text below "License" at https://community.eveonline.com/community/fansites/toolkit/ a statement from the assets' copyright holder? To whom is it addressed (i.e., who is "you" in that text)? Note that the only clause that grants any rights is "we will give you a license to use them". All the rest of that text are conditions imposed on "you" restricting that usage right. There is no clause that would grant the right to redistribute.

My current conclusion would be that LICENSE needs to include "all-rights-reserved" (because it certainly isn't "free-noncomm") along with RESTRICT="mirror bindist".

I would also suggest that you file a Gentoo bug (with licenses team in CC or as assignee) if you want to further discuss the licensing situation, so that we have a traceable record of any decisions taken.

mgorny · 2018-03-27T18:48:02Z

games-util/pyfa/pyfa-1.35.2.ebuild

+	pyfa_py_install() {
+		python_moduleinto ${PN}
+		python_domodule eos gui service utils config*.py __init__.py
+		[[ -e info.py ]] && python_domodule info.py # only in zip releases


Are '.zip releases' even relevant here? Please change the condition to express when the file is expected, so that it'd explicitly fail when the file unexpectedly is missing.

This file does not exist anymore even in the zip archives it seems. I will remove the line

mgorny · 2018-03-27T18:48:56Z

games-util/pyfa/pyfa-1.36.0.ebuild

@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation


Please make it one commit per version.

ZeroPointEnergy · 2018-04-16T06:45:12Z

Implemented the remaining remarks, apart from the license issue

FuzzyGophers · 2018-05-05T02:24:25Z

@ZeroPointEnergy still want to work on this?

ZeroPointEnergy · 2018-05-05T09:38:23Z

@flappyports Yes, I implemented all the requested changes but the situation with the license seems to be the issue why this is not moving on: pyfa-org/Pyfa#1505

Can we merge the new ebuild while the license stuff gets sorted? Old versions of the program get useless really fast for the users as the game parameters change.

ZeroPointEnergy · 2018-05-29T07:08:40Z

@ulm @mgorny @monsieurp Ok, I just rebased and updated the ebuild to the newest version with all the requested changes and finally also with all the license changes. Sorry this took so long, there where a lot of personal things which came suddenly up and I just had no free time to work on this until now.

The live ebuild does not work any-more, I updated the licence information and restrictions anyway in a separate commit. The reason why it currently breaks is that pyfa has moved to wxpython 4, which is missing in gentoo and will block any further updates of this software for now.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

gentoo-repo-qa-bot · 2018-05-30T12:56:50Z

Pull request CI report

Report generated at: 2018-05-30 12:56 UTC
Newest commit scanned: 740c75d
Status: ✅ good

No issues found

mgorny · 2018-05-30T13:49:48Z

Thanks!

gentoo-repo-qa-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Mar 5, 2018

monsieurp suggested changes Mar 10, 2018

View reviewed changes

mgorny requested changes Mar 14, 2018

View reviewed changes

ZeroPointEnergy force-pushed the games-util/pyfa-1.35.2 branch from 8d272d7 to f109fd6 Compare March 27, 2018 07:45

mgorny reviewed Mar 27, 2018

View reviewed changes

ZeroPointEnergy force-pushed the games-util/pyfa-1.35.2 branch from f109fd6 to 11257f8 Compare April 16, 2018 06:43

ZeroPointEnergy changed the title ~~games-util/pyfa: version bump to 1.35.2~~ games-util/pyfa: version bump to 1.37.0 May 29, 2018

ZeroPointEnergy force-pushed the games-util/pyfa-1.35.2 branch from 11257f8 to fadd79a Compare May 29, 2018 07:00

ZeroPointEnergy added 2 commits May 30, 2018 14:27

games-util/pyfa: version bump to 1.37.0

df43ec5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

games-util/pyfa: update live ebuild

740c75d

Package-Manager: Portage-2.3.24, Repoman-2.3.6

ZeroPointEnergy force-pushed the games-util/pyfa-1.35.2 branch from fadd79a to 740c75d Compare May 30, 2018 12:31

mgorny approved these changes May 30, 2018

View reviewed changes

gentoo-bot closed this in 7ad5733 May 30, 2018

minlexx mentioned this pull request May 31, 2018

"live" build needs gui/bitmapLoader.py, file is actually gui/bitmap_loader.py pyfa-org/Pyfa#1623

Closed

ZeroPointEnergy mentioned this pull request Aug 10, 2020

License is all-rights, while source is gplv3 ZeroPointEnergy/gentoo-pyfa-overlay#2

Closed

games-util/pyfa: version bump to 1.37.0 #7367

games-util/pyfa: version bump to 1.37.0 #7367

Conversation

ZeroPointEnergy commented Mar 5, 2018

gentoo-repo-qa-bot commented Mar 5, 2018

Choose a reason for hiding this comment

ZeroPointEnergy Mar 12, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mgorny left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ZeroPointEnergy commented Mar 27, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ZeroPointEnergy commented Apr 16, 2018

FuzzyGophers commented May 5, 2018

ZeroPointEnergy commented May 5, 2018

ZeroPointEnergy commented May 29, 2018

gentoo-repo-qa-bot commented May 30, 2018

mgorny commented May 30, 2018

ZeroPointEnergy Mar 12, 2018 •

edited