Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 613568 - games-util/pyfa-9999 does not merge (games-util/pyfa-1.28.1 version bump)
Summary: games-util/pyfa-9999 does not merge (games-util/pyfa-1.28.1 version bump)
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Normal enhancement (vote)
Assignee: Alexandre Rostovtsev (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2017-03-22 19:01 UTC by Martin McCourt
Modified: 2017-12-18 23:41 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
pyfa-9999 ebuild for pyfa-1.29.1 release (pyfa-9999.ebuild,2.67 KB, text/plain)
2017-03-22 19:06 UTC, Martin McCourt
Details
staticdata patch for pyfa-9999/pyfa-1.28.1 release (pyfa-1.27.2-staticdata.patch,1.43 KB, patch)
2017-03-22 19:09 UTC, Martin McCourt
Details | Diff
html-export-path patch (pyfa-1.27.0-html-export-path.patch,916 bytes, patch)
2017-03-22 19:11 UTC, Martin McCourt
Details | Diff
working import pyfa patch for pyfa-9999/pyfa-1.29.1 release (pyfa-1.15.1-import-pyfa.patch,590 bytes, patch)
2017-03-22 19:14 UTC, Martin McCourt
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Martin McCourt 2017-03-22 19:01:13 UTC
New dependency on >=dev-python/logbook-1.0.0
current git release is stable v1.28.1 for YC119.3
games-util/pyfa-9999 currently does not merge

Reproducible: Always

Steps to Reproduce:
1. emerge -va =games-util/pyfa-9999
Will attach all patches and updated ebuild
Actual Results:  
Patches do not apply. 
Package does not compile.
If patches are updated to allow it to compile, the executable fails due to missing logbook python package. 

Expected Results:  
Patches should apply and package should merge

sudo emerge -va1 =games-util/pyfa-9999::gentoo
Password: 

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

Calculating dependencies... done!
[ebuild   R   *] games-util/pyfa-9999::gentoo [9999::localverlay] 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/git-r3/HEAD
 * Checking out https://github.com/pyfa-org/Pyfa.git to /var/tmp/portage/games-util/pyfa-9999/work/pyfa-9999 ...
git checkout --quiet refs/git-r3/HEAD
GIT update -->
   repository:               https://github.com/pyfa-org/Pyfa.git
   at the commit:            4a6c0db4fa2185a7f77a1f421235a7c21aa6fa49
>>> 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 ...
1 out of 1 hunk FAILED -- saving rejects to file gui/bitmapLoader.py.rej                                                                                                            [ !! ]
 * ERROR: games-util/pyfa-9999::gentoo failed (prepare phase):
 *   patch -p1  failed with /usr/portage/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch
 * 
 * Call stack:
 *               ebuild.sh, line  115:  Called src_prepare
 *             environment, line 4044:  Called eapply '/usr/portage/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch'
 *             environment, line  944:  Called _eapply_patch '/usr/portage/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch'
 *             environment, line  882:  Called __helpers_die 'patch -p1  failed with /usr/portage/games-util/pyfa/files/pyfa-1.15.1-staticdata.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.15.1-staticdata.patch
 * 
 * Call stack:
 *               ebuild.sh, line  115:  Called src_prepare
 *             environment, line 4044:  Called eapply '/usr/portage/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch'
 *             environment, line  944:  Called _eapply_patch '/usr/portage/games-util/pyfa/files/pyfa-1.15.1-staticdata.patch'
 *             environment, line  882:  Called __helpers_die 'patch -p1  failed with /usr/portage/games-util/pyfa/files/pyfa-1.15.1-staticdata.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'
mmccourt@lampjaw ~ $
Comment 1 Martin McCourt 2017-03-22 19:02:45 UTC
emerge --info
Portage 2.3.3 (python 2.7.12-final-0, default/linux/amd64/13.0/desktop/gnome/systemd, gcc-4.9.4, glibc-2.23-r3, 4.9.6-gentoo-r1 x86_64)
=================================================================
System uname: Linux-4.9.6-gentoo-r1-x86_64-Intel-R-_Core-TM-_i5-3230M_CPU_@_2.60GHz-with-gentoo-2.3
KiB Mem:    16138852 total,   6459796 free
KiB Swap:   33554428 total,  33343424 free
Timestamp of repository gentoo: Wed, 22 Mar 2017 13:45:01 +0000
sh bash 4.3_p48-r1
ld GNU ld (Gentoo 2.25.1 p1.1) 2.25.1
ccache version 3.2.4 [disabled]
app-shells/bash:          4.3_p48-r1::gentoo
dev-java/java-config:     2.2.0-r3::gentoo
dev-lang/perl:            5.22.3_rc4::gentoo
dev-lang/python:          2.7.12::gentoo, 3.4.5::gentoo
dev-util/ccache:          3.2.4::gentoo
dev-util/cmake:           3.7.2::gentoo
dev-util/pkgconfig:       0.28-r2::gentoo
sys-apps/baselayout:      2.3::gentoo
sys-apps/openrc:          0.23.2::gentoo
sys-apps/sandbox:         2.10-r3::gentoo
sys-devel/autoconf:       2.13::gentoo, 2.69::gentoo
sys-devel/automake:       1.11.6-r1::gentoo, 1.14.1::gentoo, 1.15::gentoo
sys-devel/binutils:       2.25.1-r1::gentoo, 2.26.1::gentoo
sys-devel/gcc:            4.9.4::gentoo
sys-devel/gcc-config:     1.7.3::gentoo
sys-devel/libtool:        2.4.6-r3::gentoo
sys-devel/make:           4.2.1::gentoo
sys-kernel/linux-headers: 4.4::gentoo (virtual/os-headers)
sys-libs/glibc:           2.23-r3::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync2.ca.gentoo.org/gentoo-portage

localverlay
    location: /usr/local/portage
    masters: gentoo

ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/libreoffice/program/sofficerc /usr/share/config /usr/share/gnupg/qualified.txt /usr/share/maven-bin-3.3/conf /usr/share/themes/oxygen-gtk/gtk-2.0"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://gentoo.gossamerhost.com rsync://gentoo.gossamerhost.com/gentoo-distfiles/"
LANG="en_CA.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j5"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="X a52 aac acl acpi alsa amd64 apm audit bash-completion berkdb bluetooth branding bzip2 cairo cdda cdr cli colord cracklib cryptsetup cups cxx dbus device-mapper drawing dri dts dvd dvdr eds emboss encode evo exif fam firefox flac fortran gbm gconf gdbm gdm gif glamor gnome gnome-keyring gnome-shell gpm gstreamer gtk gudev iconv icu imagemagick introspection ipv6 jack java jpeg jpeg2k kdbus lcms ldap libnotify libsecret lvm2create_initrd mad mbox mmx mng modemmanager modules mp3 mp4 mpeg msn mtp multilib multiuser nautilus ncurses networkmanager nls nptl nsplugin offensive ogg opengl openmp openvg osmesa pam pango pcre pdf png ppds pulseaudio qt3support qt4 readline samba sdl seccomp session sound spell sqlite sse sse2 sse3 sse4 sse4_1 ssh ssl ssse3 startup-notification static-libs sudo suid svg symlink system-cairo system-ffmpeg system-icu system-jpeg system-libvpx system-sqlite system-wine systemd tcpd tiff tracker truetype udev udisks unicode upower usb vala vim-syntax vlc vorbis webstart wifi wxwidgets x264 xattr xcb xinerama xml xmpp xorg xscreensaver xv xvid xvmc zlib zsh-completion" ABI_X86="64 32" ALSA_CARDS="usb-audio hda-intel" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="mmx mmxext sse sse2" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="coreboot multiboot pc" INPUT_DEVICES="evdev keyboard mouse synaptics" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="wiki-publisher presenter-minimizer" LINGUAS="en_CA en_US fr_CA ro_RO" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-6" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_4" RUBY_TARGETS="ruby21 ruby22 ruby23" USERLAND="GNU" VIDEO_CARDS="i915 i965 fb intel modesetting" XFCE_PLUGINS="trash power clock brightness battery" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON
Comment 2 Martin McCourt 2017-03-22 19:06:31 UTC
Created attachment 467974 [details]
pyfa-9999 ebuild for pyfa-1.29.1 release

pyfa-9999 ebuild updated for pyfa-1.29.1 git release
Comment 3 Martin McCourt 2017-03-22 19:09:17 UTC
Created attachment 467976 [details, diff]
staticdata patch for pyfa-9999/pyfa-1.28.1 release

working staticdata patch for pyfa-9999 as of pyfa-1.28.1 release in git
Comment 4 Martin McCourt 2017-03-22 19:11:58 UTC
Created attachment 467978 [details, diff]
html-export-path patch

working exported html to python sitedir patch for pyfa-9999/pyfa-1.28.1 release
Comment 5 Martin McCourt 2017-03-22 19:14:00 UTC
Created attachment 467982 [details, diff]
working import pyfa patch for pyfa-9999/pyfa-1.29.1 release
Comment 6 Larry the Git Cow gentoo-dev 2017-12-18 23:41:39 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=654682f3f883e1af6c5eed1325c68803930fa645

commit 654682f3f883e1af6c5eed1325c68803930fa645
Author:     Andreas <zuber@puzzle.ch>
AuthorDate: 2017-10-31 20:52:38 +0000
Commit:     Aaron W. Swenson <titanofold@gentoo.org>
CommitDate: 2017-12-18 23:39:41 +0000

    games-util/pyfa: Version bump
    
    Version bump to 1.34.0, rebase and fixing of all the patches
    
    Cleanup old version and patches.
    
    Remove html-export-path patch. This issue was fixed upstream:
    https://github.com/pyfa-org/Pyfa/pull/1124
    
    New proxy maintainer.
    
    Closes: https://bugs.gentoo.org/596490
    Closes: https://bugs.gentoo.org/613568
    Closes: https://github.com/gentoo/gentoo/pull/6097
    
    Signed-off-by: Aaron W. Swenson <titanofold@gentoo.org>

 games-util/pyfa/Manifest                           |   3 +-
 .../pyfa/files/pyfa-1.15.1-import-pyfa.patch       |  27 ------
 games-util/pyfa/files/pyfa-1.15.1-staticdata.patch |  61 -------------
 .../pyfa/files/pyfa-1.20.2-html-export-path.patch  |  33 -------
 .../pyfa/files/pyfa-1.21.4-html-export-path.patch  |  33 -------
 .../pyfa/files/pyfa-1.33.1-import-pyfa.patch       |  28 ++++++
 games-util/pyfa/files/pyfa-1.33.1-staticdata.patch |  59 ++++++++++++
 games-util/pyfa/metadata.xml                       |   8 +-
 .../{pyfa-1.21.3.ebuild => pyfa-1.33.2.ebuild}     |  21 ++---
 games-util/pyfa/pyfa-1.34.0.ebuild                 | 101 +++++++++++++++++++++
 games-util/pyfa/pyfa-9999.ebuild                   |  21 ++---
 11 files changed, 214 insertions(+), 181 deletions(-)