Created attachment 386868 [details] /var/tmp/portage/dev-python/psycopg-2.5.4/temp/2.5.4-docbuild.patch.out 'emerge psycopg' fails with: ... >>> Source unpacked in /var/tmp/portage/dev-python/psycopg-2.5.4/work >>> Preparing source in /var/tmp/portage/dev-python/psycopg-2.5.4/work/psycopg2-2.5.4 ... * Applying psycopg-2.4.2-setup.py.patch ... [ ok ] * Applying 2.5.4-docbuild.patch ... * Failed Patch: 2.5.4-docbuild.patch ! * ( /usr/portage_lynx2/dev-python/psycopg/files/2.5.4-docbuild.patch ) root@lynx2:/root(5)# emerge --info '=dev-python/psycopg-2.5.4::gentoo' Portage 2.2.14_rc1 (python 2.7.8-final-0, default/linux/amd64/13.0/desktop/gnome/systemd, gcc-4.8.3, glibc-2.19-r1, 3.17.1-gentoo x86_64) ================================================================= System Settings ================================================================= System uname: Linux-3.17.1-gentoo-x86_64-Intel-R-_Core-TM-2_Duo_CPU_T7500_@_2.20GHz-with-gentoo-2.2 KiB Mem: 3972528 total, 575544 free KiB Swap: 12582908 total, 12363104 free Timestamp of tree: Sat, 18 Oct 2014 02:30:01 +0000 ld GNU ld (GNU Binutils) 2.24 app-shells/bash: 4.2_p53 dev-java/java-config: 2.2.0 dev-lang/perl: 5.20.1-r1 dev-lang/python: 2.7.8, 3.3.5-r1, 3.4.2 dev-util/cmake: 3.0.2 dev-util/pkgconfig: 0.28-r2 sys-apps/baselayout: 2.2 sys-apps/openrc: 0.13.1 sys-apps/sandbox: 2.6-r1 sys-devel/autoconf: 2.13, 2.69 sys-devel/automake: 1.9.6-r3, 1.10.3, 1.11.6, 1.12.6, 1.14.1 sys-devel/binutils: 2.24-r3 sys-devel/gcc: 4.8.3 sys-devel/gcc-config: 1.8 sys-devel/libtool: 2.4.2-r1 sys-devel/make: 4.1 sys-kernel/linux-headers: 3.17 (virtual/os-headers) sys-libs/glibc: 2.19-r1 Repositories: gentoo sunrise x11 sage-on-gentoo science tlp x-portage g-cpan g-octave ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="* -@EULA PUEL Intel-SDP dlj-1.1 skype-eula skype-4.0.0.7-copyright googleearth AdobeFlash-11.x cadsoft Oracle-BCLA-JavaSE MakeMKV-EULA NVIDIA-CUDA Nero-AAC-EULA GIMPS" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/config /usr/share/gnupg/qualified.txt /var/lib/hsqldb" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.6/ext-active/ /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5.6/ext-active/ /etc/php/cli-php5/ext-active/ /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 /etc/udev/rules.d" CXXFLAGS="-march=native -O2 -pipe -fomit-frame-pointer" 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="-march=native -O2 -pipe -fomit-frame-pointer" GENTOO_MIRRORS="http://distfiles.gentoo.org" LANG="en_US.UTF-8" LDFLAGS="-Wl,-O1 -Wl,--as-needed" MAKEOPTS="-j3" 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" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage_lynx2" PORTDIR_OVERLAY="/var/lib/layman/sunrise /var/lib/layman/x11 /var/lib/layman/sage-on-gentoo /var/lib/layman/science /var/lib/layman/tlp /usr/local/portage /var/lib/cpan /var/lib/g-octave" USE="64bit R X Xaw3d a52 aac acl acpi admin afs alsa amd64 ao apache2 apng applet archive armadillo arpack asf aspell atlas audacious audiofile automap automount bash-completion berkdb blas blast bluetooth bluray boost branding bzip2 cairo cdda cddb cdf cdio cdparanoia cdr cgi chm cli cmake colord cracklib crypt css cups curl cxx daap db dbi dbm dbus declarative designer devhelp device-mapper dga dia dirac djvu doc dot dri ds2490 ds9097 ds9097u dts dv dvb dvd dvdr dvi dynamicplugin eds egl elf emacs emboss emf encode epiphany evo examples exif expat extensions extra extras faac faad fam ffmpeg fftw firefox fits flac fltk fontconfig foomaticdb fortran fortran95 fpm fpx fuse g3dvl garmin gcj gd gdal gdbm gdu gedit geoip geolocation geos gfortran gif gimp git glade glamor glib glpk gml gmp gnome gnome-keyring gnome-online-accounts gnome-print gnuplot gnutls gold gphoto2 gpm grammar graphics graphtft graphviz grass gsl gsm gstreamer gtk gtk3 gudev guile hdaps hddtemp hdf hdf5 hdri html http httpd hvm hwdb iconv icq icu id3tag ide imagemagick imap inotify introspection ipod ipv6 irda ithreads jabber jadetex java jbig jit john jpeg jpeg2k kate kde kdepim kdrive kerberos keymap kpathsea kvm ladspa lame lapack laptop latex lcms ldap lensfun libffi libkms libnotify libsamplerate libsecret lirc live lua lzma lzo mad mail maildir mapnik math matroska media-library mercurial mikmod mkl mmx mmxext mng mod modules mono motif mozilla mp3 mp4 mpeg mpi mplayer mtp multilib multimedia musepack musicbrainz mysql mysqli nautilus ncurses netcdf netpbm network networking nfs nls nntp nptl nsplugin ntfs ntp numpy obex objc ocaml ocr octave odbc ofa ogdi ogg openexr opengl openmp openvg pam pango pcre pda pdf pdl2 perl plasma plotutils plugins png podcast policykit portaudio posix postgres postscript ppds preview-latex proj projectm pstricks pulseaudio python python-bindings q32 qemu qhull qt3support qt4 quicktime raw readline reiserfs reports rle romio rpc rrdcgi rrdtool sage samba sasl schroedinger science sdk sdl secure-delete semantic-desktop server session shout sip slang slp smart smbclient smp sms sndfile snmp soap socialweb sockets sound soup sox speex spell sql sqlite sse sse2 ssl ssse3 startup-notification stlport subtitles subversion sudo suexec svg svm swig systemd szip t1lib tcl tcpd tex tex4ht texmacs theora thesaurus thinkpad threads thunderbird tidy tiff tk tools truetype udev udisks unicode upower usb utempter v4l vaapi vala valgrind vdpau video virt-network virtualbox visio vorbis vpx vtk wav webdav webdav-serf webkit wifi wmf wxwidgets x264 xa xattr xcb xetex xext xft xine xml xmlreader xmlrpc xpm xv xvid xvmc yaml youtube zlib zvbi" ABI_X86="64" ALSA_CARDS="intel8x0" APACHE2_MODULES="actions alias auth_basic auth_digest authn_anon authn_dbd authn_core authn_dbm authn_default authn_file authz_core authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgid dav dav_fs dav_lock dbd deflate dir disk_cache env expires ext_filter file_cache filter headers ident imagemap include info lbmethod_byrequests log_config logio mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_http rewrite setenvif slotmem_shm so socache_shmcb speling status unique_id unixd userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" CAMERAS="canon fuji ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CURL_SSL="nss" DVB_CARDS="usb-wt220u" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ublox ubx" INPUT_DEVICES="keyboard mouse evdev synaptics void" KERNEL="linux" LCD_DEVICES="cfontz hd44780 mtxorb ncurses X lcd2usb lcdlinux png usblcd" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="de fr ru" NETBEANS_MODULES="apisupport cnd dlight enterprise ergonomics groovy gsf harness ide identity j2ee java mobility nb php profiler websvccommon xml" OFFICE_IMPLEMENTATION="libreoffice" PYTHON_SINGLE_TARGET="python2_7" PYTHON_TARGETS="python2_7 python3_3" QEMU_SOFTMMU_TARGETS="arm i386 x86_64" QEMU_USER_TARGETS="arm i386 x86_64" RUBY_TARGETS="ruby19 ruby20" USERLAND="GNU" VIDEO_CARDS="intel displaylink" 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: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, SYNC, USE_PYTHON root@lynx2:/root(6)# emerge -pqv '=dev-python/psycopg-2.5.4::gentoo' [ebuild U ] dev-python/psycopg-2.5.4 [2.5.3] USE="doc examples -debug" PYTHON_TARGETS="python2_7 python3_3 (-python3_2) -python3_4"
Ian asked me to run this and post the results here: alunduil@elijah psycopg % ebuild psycopg-2.5.4.ebuild clean prepare Appending /home/alunduil/Projects/gentoo/portage-tree to PORTDIR_OVERLAY... >>> Downloading 'http://gentoo.mirrors.easynews.com/linux/gentoo/distfiles/psycopg2-2.5.4.tar.gz' --2014-10-18 09:09:50-- http://gentoo.mirrors.easynews.com/linux/gentoo/distfiles/psycopg2-2.5.4.tar.gz Resolving gentoo.mirrors.easynews.com... 69.16.168.244 Connecting to gentoo.mirrors.easynews.com|69.16.168.244|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 682578 (667K) [application/x-gzip] Saving to: ‘/usr/portage/distfiles/psycopg2-2.5.4.tar.gz’ 100%[======================================================================================================================================================================================================================================>] 682,578 667KB/s in 1.0s 2014-10-18 09:09:51 (667 KB/s) - ‘/usr/portage/distfiles/psycopg2-2.5.4.tar.gz’ saved [682578/682578] * psycopg2-2.5.4.tar.gz SHA256 SHA512 WHIRLPOOL size ;-) ... [ ok ] * checking ebuild checksums ;-) ... [ ok ] * checking auxfile checksums ;-) ... [ ok ] * checking miscfile checksums ;-) ... [ ok ] >>> Unpacking source... >>> Unpacking psycopg2-2.5.4.tar.gz to /var/tmp/portage/dev-python/psycopg-2.5.4/work >>> Source unpacked in /var/tmp/portage/dev-python/psycopg-2.5.4/work >>> Preparing source in /var/tmp/portage/dev-python/psycopg-2.5.4/work/psycopg2-2.5.4 ... * Applying psycopg-2.4.2-setup.py.patch ... [ ok ] * Applying 2.5.4-docbuild.patch ... [ ok ] >>> Source prepared. alunduil@elijah psycopg % echo $? 0 This is based off of the current ebuild in CVS at the time of this posting though.
Works for me.
Created attachment 386900 [details] build.log for psycopg-2.5.4 Not for me with USE="doc". The sed in python_prepare_all modifies doc/src/conf.py before 2.5.4-docbuild.patch is applied.
Ian: Please fix this.
Also, speaking as the python lead, I would prefer that we not apply this sed-craziness for objects.inv as a solution for building docs. Please do not apply this in future ebuilds.
(In reply to Mike Gilbert from comment #5) Just for some added clarity on this comment: I think this adds complexity to the ebuild for very little benefit. I think the python team would be better served by leaving things as they were: we lose some hyperlinks in local documentation, but we don't have to mess with every package that uses intersphinx and points a docs.python.org.
(In reply to Mike Gilbert from comment #6) > I think this adds complexity to the ebuild for very little benefit. I think the problem is just using sed and patch at the same time for the same reason (adjusting intersphinx_mapping). In this case, I think maintaining a patch or sed that inserted local paths would be only slightly more complicated than a patch or sed that knocked them both out. For details on the slight complications, see #522794.
(In reply to W. Trevor King from comment #7) > (In reply to Mike Gilbert from comment #6) > > I think this adds complexity to the ebuild for very little benefit. > > I think the problem is just using sed and patch at the same time for the > same reason (adjusting intersphinx_mapping). In this specific instance, yes, that is the problem. I was speaking more generally; adding that sed logic to every ebuild that uses intersphinx in this way seems like a bad idea to me.
intersphinx_mapping = { 'py': ('/usr/share/doc/python-docs-2.7.6-r1/html', '/usr/share/doc/python-docs-2.7.6-r1/html/objects.inv'), } By way of a brief explain; this storm in a teacup came about because the 2nd line of intersphinx_mapping = { pulled in a redundant py3.2 file of objects.inv. With the exasperation of not figuring a clause in sed to remove it, I resorted to the patch, which then competed with the sed statement, which means my skill of sed is rudimentary. On a second attempt with fresh patience, the ebuild now has an effective clause. 20 Oct 2014; Ian Delaney <idella4@gentoo.org> -files/2.5.4-docbuild.patch, psycopg-2.5.4.ebuild: remove patch, substituted with entry in sed statement (as initially intended) wrt the doc build, fixes Bug 525732 Comments 5 & 6 made it a true storm
