Bug 584624 – games-util/pyfa-9999 patch -p1 failed with /usr/portage/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Martin McCourt 2016-05-31 02:57:16 UTC]

Created attachment 435888 [details, diff]
updated patch for version 1.21.4

The most recent git version of Pyfa does take well to the current pyfa-1.20.2-html-export-path.patch:
# emerge -va1 pyfa                             

These are the packages that would be merged, in order:

Calculating dependencies... done!
[ebuild   R   *] games-util/pyfa-9999::gentoo  USE="graph" PYTHON_TARGETS="python2_7" 0 KiB

Total: 1 package (1 reinstall), Size of downloads: 0 KiB

Would you like to merge these packages? [Yes/No] yes

>>> Verifying ebuild manifests

>>> Emerging (1 of 1) games-util/pyfa-9999::gentoo
>>> Unpacking source...
 * Fetching https://github.com/pyfa-org/Pyfa.git ...
git fetch https://github.com/pyfa-org/Pyfa.git +HEAD:refs/git-r3/HEAD
git symbolic-ref refs/git-r3/games-util/pyfa/0/__main__ refs/heads/master
 * 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 update -->
   repository:               https://github.com/pyfa-org/Pyfa.git
   at the commit:            e70ea67fece8ff8ff5e0a343228a5a474c58a107
>>> Source unpacked in /var/tmp/portage/games-util/pyfa-9999/work
>>> Preparing source in /var/tmp/portage/games-util/pyfa-9999/work/pyfa-9999 ...
 * Applying pyfa-1.15.1-staticdata.patch ...                                                                        [ ok ]
 * Applying pyfa-1.20.2-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.20.2-html-export-path.patch
 * 
 * Call stack:
 *               ebuild.sh, line  133:  Called src_prepare
 *             environment, line 3972:  Called eapply '/usr/portage/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch'
 *             environment, line  892:  Called _eapply_patch '/usr/portage/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch'
 *             environment, line  830:  Called __helpers_die 'patch -p1  failed with /usr/portage/games-util/pyfa/files/pyfa-1.20.2-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'

>>> Failed to emerge games-util/pyfa-9999, Log file:
>>>  '/var/tmp/portage/games-util/pyfa-9999/temp/build.log'

 * 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.20.2-html-export-path.patch
 * 
 * Call stack:
 *               ebuild.sh, line  133:  Called src_prepare
 *             environment, line 3972:  Called eapply '/usr/portage/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch'
 *             environment, line  892:  Called _eapply_patch '/usr/portage/games-util/pyfa/files/pyfa-1.20.2-html-export-path.patch'
 *             environment, line  830:  Called __helpers_die 'patch -p1  failed with /usr/portage/games-util/pyfa/files/pyfa-1.20.2-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.

[Comment 1 Martin McCourt 2016-05-31 03:02:58 UTC]

Created attachment 435890 [details]
updated ebuild for games-util/pyfa-9999

requires associated pyfa-1.21.4-html-export-path.patch

[Comment 2 Alexandre Rostovtsev (RETIRED) 2016-06-05 22:16:04 UTC]

Why remove the "minimal" parameter?

[Comment 3 Alexandre Rostovtsev (RETIRED) 2016-06-05 22:20:19 UTC]

Thanks, fixed with an adjusted patch in https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ffb77e246b4c9c62fd18464589791fb27db4d36

Also finally bumped the non-live version to 1.21.3