error follows
Created attachment 21593 [details] error log
This only happens is USE=acpi" is set. ON line 43 of the ebuild EPATCH_OPTS is set to "-d ${S}/battstat" but not unset before trying to apply the multiload patch. Adding EPATCH_OPTS="" after "epatch ${FILESDIR}/battstat-acpi-events-2.3.90.diff" did the trick for me. A quick diff of the change I made: ------------------------------------------------------------------------------- --- gnome-applets-2.4.1-r2.ebuild.old 2003-12-03 01:54:22.535725800 -0500 +++ gnome-applets-2.4.1-r2.ebuild 2003-12-03 01:50:38.434794320 -0500 @@ -42,6 +42,7 @@ if [ -n "`use acpi`" ]; then EPATCH_OPTS="-d ${S}/battstat" epatch ${FILESDIR}/battstat-acpi-events-2.3.90.diff + EPATCH_OPTS="" fi # -------------------------------------------------------------------------------
bug and bug-fix confirmed anyone to push it into portage ?
Created attachment 21641 [details, diff] Correct the ebuild when 'ACPI' use flag is set, the variable EPATCH_OPTS is set to -d ${S}/battstat which prevent next patch (i.e. multiload_mem_fix) from applying in the right directory. My patch set the EPATCH_OPTS to the right directory for the multiload_mem_fix patch.
This happens to me too.
Same problem here, but the patch with EPATCH_OPTS="" works. Martin
Hmm yeah.. fixed now in r2, just using old style cd. gnome devs : don't use EPATCH_OPTS for now, lets try to keep ebuilds consistent here and i don't see what it adds (besides being longer and more abstract). Thanks for the report.
well, i've been using EPATCH_OPTS because it saves us from make a new patch every version bump because ${S} has changed.
maybe i should elaborate a bit more on this: if [ -n "`use acpi`" ]; then EPATCH_OPTS="-d ${S}/battstat" epatch ${FILESDIR}/battstat-acpi-events$ fi einfo "EPATCH_OPTS:" $EPATCH_OPTS outputs: mcvaio /usr/portage/gnome-base/gnome-applets % USE="acpi" sudo ebuild gnome-applets-2.4.1-r2.ebuild clean unpack >>> md5 src_uri ;-) gnome-applets-2.4.1.tar.bz2 >>> Unpacking source... >>> Unpacking gnome-applets-2.4.1.tar.bz2 to /fire/1/portage/scratch/portage/gnome-applets-2.4.1-r2/work * Applying battstat-acpi-events-2.3.90.diff... [ ok ] * EPATCH_OPTS: * Applying gnome-applets-2.4.1-multiload_mem_fix.patch... [ ok ] * Fixing OMF Makefile: omf.make >>> Source unpacked. whereas: if [ -n "`use acpi`" ]; then EPATCH_OPTS="-d ${S}/battstat" epatch ${FILESDIR}/battstat-acpi-events-2.3.90.diff fi einfo "EPATCH_OPTS:" $EPATCH_OPTS produces an error: mcvaio /usr/portage/gnome-base/gnome-applets % USE="acpi" sudo ebuild gnome-applets-2.4.1-r2.ebuild clean unpack >>> md5 src_uri ;-) gnome-applets-2.4.1.tar.bz2 >>> Unpacking source... >>> Unpacking gnome-applets-2.4.1.tar.bz2 to /fire/1/portage/scratch/portage/gnome-applets-2.4.1-r2/work * Applying battstat-acpi-events-2.3.90.diff... [ ok ] * EPATCH_OPTS: -d /fire/1/portage/scratch/portage/gnome-applets-2.4.1-r2/work/gnome-applets-2.4.1/battstat * Applying gnome-applets-2.4.1-multiload_mem_fix.patch... * Failed Patch: gnome-applets-2.4.1-multiload_mem_fix.patch! * * Include in your bugreport the contents of: * * /fire/1/portage/scratch/portage/gnome-applets-2.4.1-r2/temp/gnome-applets-2.4.1-multiload_mem_fix.patch-11553.out so just keep EPATCH_OPTS on the same line as epatch and there won't be any variable leakage. looking through the logs, it was my fault that i put a new line between EPATCH_OPTS and epatch when i committed the acpi patch.
*** Bug 35089 has been marked as a duplicate of this bug. ***
