When trying to upgrade to javatoolkit-0.2.0-r1, the patching fails. Here's the output from the patch attempt: >>> Unpacking javatoolkit-0.2.0.tar.bz2 to /var/tmp/portage/dev-java/javatoolkit-0.2.0-r1/work * Applying 0.2.0-use-sax.patch ... * Failed Patch: 0.2.0-use-sax.patch ! * ( /usr/portage/dev-java/javatoolkit/files/0.2.0-use-sax.patch ) * * Include in your bugreport the contents of: * * /var/tmp/portage/dev-java/javatoolkit-0.2.0-r1/temp/0.2.0-use-sax.patch-20685.out !!! ERROR: dev-java/javatoolkit-0.2.0-r1 failed. Call stack: ebuild.sh, line 1593: Called dyn_unpack ebuild.sh, line 731: Called src_unpack javatoolkit-0.2.0-r1.ebuild, line 22: Called epatch '/usr/portage/dev-java/javatoolkit/files/0.2.0-use-sax.patch' eutils.eclass, line 341: Called die !!! Failed Patch: 0.2.0-use-sax.patch! !!! If you need support, post the topmost build error, and the call stack if relevant # cat /var/tmp/portage/dev-java/javatoolkit-0.2.0-r1/temp/0.2.0-use-sax.patch-20685.out ***** 0.2.0-use-sax.patch ***** =============================== PATCH COMMAND: patch -p0 -g0 -E --no-backup-if-mismatch < /usr/portage/dev-java/javatoolkit/files/0.2.0-use-sax.patch =============================== patching file src/bsfix/xml-rewrite-2.py Hunk #1 FAILED at 3. Hunk #2 succeeded at 28 with fuzz 1. 1 out of 6 hunks FAILED -- saving rejects to file src/bsfix/xml-rewrite-2.py.rej =============================== PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < /usr/portage/dev-java/javatoolkit/files/0.2.0-use-sax.patch =============================== can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: src/bsfix/xml-rewrite-2.py |=================================================================== |--- src/bsfix/xml-rewrite-2.py (revision 3421) |+++ src/bsfix/xml-rewrite-2.py (revision 3432) -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored =============================== PATCH COMMAND: patch -p2 -g0 -E --no-backup-if-mismatch < /usr/portage/dev-java/javatoolkit/files/0.2.0-use-sax.patch =============================== can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: src/bsfix/xml-rewrite-2.py |=================================================================== |--- src/bsfix/xml-rewrite-2.py (revision 3421) |+++ src/bsfix/xml-rewrite-2.py (revision 3432) -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored =============================== PATCH COMMAND: patch -p3 -g0 -E --no-backup-if-mismatch < /usr/portage/dev-java/javatoolkit/files/0.2.0-use-sax.patch =============================== missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: src/bsfix/xml-rewrite-2.py |=================================================================== |--- src/bsfix/xml-rewrite-2.py (revision 3421) |+++ src/bsfix/xml-rewrite-2.py (revision 3432) -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored =============================== PATCH COMMAND: patch -p4 -g0 -E --no-backup-if-mismatch < /usr/portage/dev-java/javatoolkit/files/0.2.0-use-sax.patch =============================== missing header for unified diff at line 5 of patch can't find file to patch at input line 5 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |Index: src/bsfix/xml-rewrite-2.py |=================================================================== |--- src/bsfix/xml-rewrite-2.py (revision 3421) |+++ src/bsfix/xml-rewrite-2.py (revision 3432) -------------------------- No file to patch. Skipping patch. 6 out of 6 hunks ignored
Fixed in CVS. The patch was ok until mangled by CVS because it contained $Header: and $Version: fields, which were rewritten. I've readded the patch with some cvs -ko magic that suppresses this.
