Patching sources of net-print/hplip-3.10.5 fails applying hplip-3.10.2-plugin.patch. Reproducible: Always Steps to Reproduce: 1. emerge -1 =net-print/hplip-3.10.5 2. 3. Actual Results: * Failed Patch: hplip-3.10.2-plugin.patch ! * ( /usr/portage/net-print/hplip/files/hplip-3.10.2-plugin.patch ) Expected Results: hplip merged emerge --info net-print/hplip Portage 2.1.8.3 (default/linux/amd64/10.0/desktop/gnome, gcc-4.4.3, glibc-2.11.1-r0, 2.6.34-rc7 x86_64) ================================================================= System Settings ================================================================= System uname: Linux-2.6.34-rc7-x86_64-Intel-R-_Core-TM-2_Duo_CPU_E8500_@_3.16GHz-with-gentoo-2.0.1 Timestamp of tree: Sun, 30 May 2010 08:45:02 +0000 app-shells/bash: 4.1_p7 dev-java/java-config: 2.1.11 dev-lang/python: 2.6.5-r2, 3.1.2-r3 dev-python/pycrypto: 2.1.0 dev-util/cmake: 2.8.1-r2 sys-apps/baselayout: 2.0.1 sys-apps/openrc: 0.6.1-r1 sys-apps/sandbox: 2.2 sys-devel/autoconf: 2.13, 2.65 sys-devel/automake: 1.9.6-r3, 1.10.3, 1.11.1 sys-devel/binutils: 2.20.1-r1 sys-devel/gcc: 4.4.3-r2 sys-devel/gcc-config: 1.4.1 sys-devel/libtool: 2.2.7b virtual/os-headers: 2.6.33 ACCEPT_KEYWORDS="amd64 ~amd64" ACCEPT_LICENSE="* -@EULA dlj-1.1 skype-eula" CBUILD="x86_64-pc-linux-gnu" CFLAGS="-O2 -pipe -march=native -mtune=native -fomit-frame-pointer" CHOST="x86_64-pc-linux-gnu" CONFIG_PROTECT="/etc /usr/share/X11/xkb /var/lib/hsqldb" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /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 -march=native -mtune=native -fomit-frame-pointer" DISTDIR="/usr/portage/distfiles" EMERGE_DEFAULT_OPTS="--with-bdeps=y" FEATURES="assume-digests buildpkg distlocks fixpackages metadata-transfer news parallel-fetch protect-owned sandbox sfperms strict unmerge-logs unmerge-orphans userfetch" GENTOO_MIRRORS="http://mirrors.linuxant.fr/distfiles.gentoo.org" LANG="en_US.UTF-8" LDFLAGS="-Wl,-O1" LINGUAS="en en_US en_GB fr hr" MAKEOPTS="-j5" PKGDIR="/usr/portage/packages" PORTAGE_CONFIGROOT="/" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/var/lib/layman/gnome /var/lib/layman/x11 /usr/local/portage" SYNC="rsync://rsync1.fr.gentoo.org/gentoo-portage" USE="X a52 aac acl acpi alsa amd64 archive bash-completion branding bzip2 cairo cdda cdr cleartype cli consolekit cracklib crypt cups custom-cflags custom-optimization cxx dbus djvu dri dts dvd dvdr eds emboss encode evo exif fam firefox flac fortran fuse gdbm gdu gif gimp glitz gnome gnome-keyring gnutls gphoto2 gpm gstreamer gtk hal iconv icu idn ipv6 java jpeg lame lcms ldap libnotify lzma lzo mad mikmod mmx mmxext mng modules mp3 mp4 mpeg mudflap multilib nautilus ncurses network-cron nls nptl nptlonly nsplugin nss ogg opengl openmp pam pango pcre pdf perl png policykit ppds pppd pulseaudio python qt3support raw readline reflection samba sdl session smp spell spl sse sse2 ssl ssse3 startup-notification svg sysfs taglib tcpd theora threads thumbnail tiff timezone truetype udev unicode usb vim-syntax vorbis x264 xattr xml xmp xorg xulrunner xv xvid zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="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 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" ELIBC="glibc" INPUT_DEVICES="evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en en_US en_GB fr hr" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="nouveau" 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, FFLAGS, INSTALL_MASK, LC_ALL, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS ================================================================= Package Settings ================================================================= net-print/hplip-3.10.2-r4 was built with the following: USE="X hpcups libnotify (multilib) policykit qt4 scanner snmp static-ppds udev-acl -doc -fax -hpijs -minimal -parport"
Created attachment 233489 [details] Patch hplip-3.10.2-plugin.patch output
Created attachment 233491 [details] emerge =net-print/hplip-3.10.5 build.log
It applies fine here. Is your portage tree up to date? If not please sync and try again.
After previous posted emerge --info, you can see that portage tree timestamp is Sun, 30 May 2010 08:45:02 +0000 so, it's up to date. To confirm, i removed /usr/portage/net-print/hplip directory as well as /usr/portage/distfiles/hplip-*, and resynced my tree. Then, i retried to emerge -1 =net-print/hplip-3.5.10, and same error again. I tried to apply the patch manually, and no luck again, it fails to apply.
Created attachment 233499 [details, diff] hplip-3.10.2-plugin.patch (In reply to comment #4) > After previous posted emerge --info, you can see that portage tree timestamp is > Sun, 30 May 2010 08:45:02 +0000 so, it's up to date. To confirm, i removed > /usr/portage/net-print/hplip directory as well as > /usr/portage/distfiles/hplip-*, and resynced my tree. Then, i retried to emerge > -1 =net-print/hplip-3.5.10, and same error again. > > I tried to apply the patch manually, and no luck again, it fails to apply. > Sorry I should have took a closer look at the information you provided. I recreated the patch locally, but it does not look different to the patch I used before. I suspect this is a line ending problem. Please try if attached patch works for you.
Ok it works fine with provided patch. Thanks for your help.
(In reply to comment #6) > Ok it works fine with provided patch. Thanks for your help. > + 30 May 2010; Daniel Pielmeier <billie@gentoo.org> + files/hplip-3.10.2-plugin.patch: + Update plugin patch as ~arch patch does not seem to like it. I have replaced the patch. Thanks for your feedback.
