The most recent git version of Pyfa does take well to the current pyfa-1.1.8-html-export-path.patch: # emerge -va pyfa [ebuild R ] games-util/pyfa-9999 USE="-graph" PYTHON_TARGETS="python2_7" Would you like to merge these packages? [Yes/No] yes >>> Verifying ebuild manifests >>> Emerging (1 of 1) games-util/pyfa-9999::gentoo >>> Failed to emerge games-util/pyfa-9999, Log file: >>> '/var/tmp/portage/games-util/pyfa-9999/temp/build.log' >>> Jobs: 0 of 1 complete, 1 failed Load avg: 0.91, 0.60, 0.43 * Package: games-util/pyfa-9999 * Repository: gentoo * Maintainer: tetromino@gentoo.org * USE: abi_x86_64 amd64 elibc_glibc kernel_linux python_targets_python2_7 userland_GNU * FEATURES: preserve-libs sandbox userpriv usersandbox Initialized empty Git repository in /usr/portage/distfiles/git3-src/pyfa-org_Pyfa.git/ * Fetching https://github.com/pyfa-org/Pyfa.git ... git fetch https://github.com/pyfa-org/Pyfa.git +HEAD:refs/git-r3/HEAD remote: Counting objects: 28013, done. remote: Compressing objects: 100% (4/4), done. remote: Total 28013 (delta 0), reused 4 (delta 0), pack-reused 28009 Receiving objects: 100% (28013/28013), 162.55 MiB | 5.70 MiB/s, done. Resolving deltas: 100% (17844/17844), done. From https://github.com/pyfa-org/Pyfa *snip* git noise *snip* * Checking out https://github.com/pyfa-org/Pyfa.git to /var/tmp/portage/games-util/pyfa-9999/work/pyfa-9999 ... git checkout --quiet master GIT NEW branch --> repository: https://github.com/pyfa-org/Pyfa.git at the commit: 87f865ce1f3ff5f6f003ec25af4b1bda4c8d0553 * Applying pyfa-1.15.1-staticdata.patch ... [ ok ] * Applying pyfa-1.1.8-html-export-path.patch ... 1 out of 2 hunks FAILED -- saving rejects to file service/settings.py.rej [ !! ] * ERROR: games-util/pyfa-9999::gentoo failed (prepare phase): * patch -p1 failed with /usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch * * Call stack: * ebuild.sh, line 133: Called src_prepare * environment, line 3974: Called eapply '/usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch' * environment, line 897: Called _eapply_patch '/usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch' * environment, line 835: Called __helpers_die 'patch -p1 failed with /usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch' * isolated-functions.sh, line 117: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=games-util/pyfa-9999::gentoo'`, * the complete build log and the output of `emerge -pqv '=games-util/pyfa-9999::gentoo'`. * The complete build log is located at '/var/tmp/portage/games-util/pyfa-9999/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/games-util/pyfa-9999/temp/environment'. * Working directory: '/var/tmp/portage/games-util/pyfa-9999/work/pyfa-9999' * S: '/var/tmp/portage/games-util/pyfa-9999/work/pyfa-9999' * Messages for package games-util/pyfa-9999: * ERROR: games-util/pyfa-9999::gentoo failed (prepare phase): * patch -p1 failed with /usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch * * Call stack: * ebuild.sh, line 133: Called src_prepare * environment, line 3974: Called eapply '/usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch' * environment, line 897: Called _eapply_patch '/usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch' * environment, line 835: Called __helpers_die 'patch -p1 failed with /usr/portage/games-util/pyfa/files/pyfa-1.1.8-html-export-path.patch' * isolated-functions.sh, line 117: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=games-util/pyfa-9999::gentoo'`, * the complete build log and the output of `emerge -pqv '=games-util/pyfa-9999::gentoo'`. * The complete build log is located at '/var/tmp/portage/games-util/pyfa-9999/temp/build.log'. * The ebuild environment file is located at '/var/tmp/portage/games-util/pyfa-9999/temp/environment'. * Working directory: '/var/tmp/portage/games-util/pyfa-9999/work/pyfa-9999' * S: '/var/tmp/portage/games-util/pyfa-9999/work/pyfa-9999' $ I was able to merge it after adjusting the patch and the ebuild that I'll attach shortly.
Created attachment 432442 [details, diff] patch for settings.py This needs to be used in combination with the ebuild patch
Created attachment 432444 [details] updated ebuild This requires the updated patch for settings.py as well.
After applying these and running the ebuild digest I was able to merge this package successfully: # ebuild /usr/portage/games-util/pyfa/pyfa-9999.ebuild digest >>> Creating Manifest for /usr/portage/games-util/pyfa lampjaw work # emerge -va pyfa [ebuild R ] games-util/pyfa-9999 USE="-graph" PYTHON_TARGETS="python2_7" Would you like to merge these packages? [Yes/No] yes >>> Verifying ebuild manifests >>> Emerging (1 of 1) games-util/pyfa-9999::gentoo >>> Installing (1 of 1) games-util/pyfa-9999::gentoo >>> Jobs: 1 of 1 complete Load avg: 0.86, 0.34, 0.27 #
(In reply to Martin McCourt from comment #1) > Created attachment 432442 [details, diff] [details, diff] > patch for settings.py > > This needs to be used in combination with the ebuild patch Why remove the "website" parameter that was added upstream in pr562?
Fixed with an adjusted patch: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f84cc674529981c0872915aad316a525b4f9f2c7 Thanks for reporting the issue and the proposed patch!
(In reply to Alexandre Rostovtsev from comment #5) > Fixed with an adjusted patch: > https://gitweb.gentoo.org/repo/gentoo.git/commit/ > ?id=f84cc674529981c0872915aad316a525b4f9f2c7 > > Thanks for reporting the issue and the proposed patch! my pleasure - thanks for fixing it!
