Catastrophic: gcc upgrade from stable to test fails in some circumstances (Bug #355)

64 bit (have not tested 32)
gcc 4.6.1 (stable) with gcj
libffi installed
4.6.2 fails to install per below, leaving system in an unrepairable state unless the resurrect command and a previous cache of libffi and gcc are available from which to restore.

/usr/bin/grep: /usr/lib/libffi.la: No such file or directory
/bin/sed: can't read /usr/lib/libffi.la: No such file or directory
libtool: relink: `/usr/lib/libffi.la' is not a valid libtool archive
libtool: install: error: relink `libjawt.la' with the above command before installing it
make⁶: * [install-nativeexeclibLTLIBRARIES] Error 1
make⁶: Leaving directory `/usr/src/gcc-4.6.2.bld/i686-pc-linux-gnu/libjava/classpath/native/jawt'
make<sup>5</sup>: [install-am] Error 2
make<sup>5</sup>: Leaving directory `/usr/src/gcc-4.6.2.bld/i686-pc-linux-gnu/libjava/classpath/native/jawt'
make⁴: [install-recursive] Error 1
make⁴: Leaving directory `/usr/src/gcc-4.6.2.bld/i686-pc-linux-gnu/libjava/classpath/native'
make<sup>3</sup>: [install-recursive] Error 1
make<sup>3</sup>: Leaving directory `/usr/src/gcc-4.6.2.bld/i686-pc-linux-gnu/libjava/classpath'
make²: [install-recursive] Error 1
make²: Leaving directory `/usr/src/gcc-4.6.2.bld/i686-pc-linux-gnu/libjava'
make<sup>1</sup>: [install-target-libjava] Error 2
make<sup>1</sup>: Leaving directory `/usr/src/gcc-4.6.2.bld'
make: ** [install] Error 2
Problem Detected!
INSTALL failed!
INSTALL failed!
Creating compile log /var/log/sorcery/compile/gcc-4.6.2.bz2
Creating castfs debug log /var/log/sorcery/compile/gcc-4.6.2.castfs.dbglog.bz2

Spells that encountered problems:
---------------------------------
gcc (install)

------------
helpful gaze installs

root@hou-idd-smgl:~# gaze install gcc | grep ffi
/usr/include/c++/4.6.1/gnu/javax/crypto/jce/DiffieHellmanImpl.h
/usr/include/c++/4.6.1/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h
/usr/include/c++/4.6.1/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.h
/usr/include/c++/4.6.1/gnu/javax/crypto/key/dh/DiffieHellmanSender.h
/usr/include/c++/4.6.1/gnu/javax/net/ssl/provider/ClientDiffieHellmanPublic.h
/usr/include/c++/4.6.1/gnu/javax/net/ssl/provider/DiffieHellman.h
/usr/include/c++/4.6.1/java/awt/geom/AffineTransform.h
/usr/include/c++/4.6.1/java/awt/image/AffineTransformOp.h
/usr/include/c++/4.6.1/javax/naming/InsufficientResourcesException.h
/usr/lib/gcc/i686-pc-linux-gnu/4.6.1/include/ffi.h
/usr/lib/gcc/i686-pc-linux-gnu/4.6.1/include/ffitarget.h
/usr/lib/libffi.a
/usr/lib/libffi.la
/usr/lib/libffi.so
/usr/lib/libffi.so.4
/usr/lib/libffi.so.4.0.1
/usr/share/man/man3/ffi.3
/usr/share/man/man3/ffi_call.3
/usr/share/man/man3/ffi_prep_cif.3
root@hou-idd-smgl:~# gaze install libffi | grep ffi
/usr/lib/libffi-3.0.10
/usr/lib/libffi-3.0.10/include
/usr/lib/libffi-3.0.10/include/ffi.h
/usr/lib/libffi-3.0.10/include/ffitarget.h
/usr/lib/libffi.a
/usr/lib/libffi.la
/usr/lib/libffi.so/usr/lib/libffi.so.5
/usr/lib/libffi.so.5.0.10
/usr/lib/pkgconfig/libffi.pc
/usr/share/doc/libffi
/usr/share/doc/libffi/LICENSE
/usr/share/doc/libffi/README
/usr/share/doc/libffi/doc
/usr/share/doc/libffi/doc/libffi.info
/usr/share/doc/libffi/doc/libffi.texi
/usr/share/doc/libffi/doc/stamp-vti
/usr/share/doc/libffi/doc/version.texi
/usr/share/info/libffi.info
/usr/share/man/man3/ffi.3
/usr/share/man/man3/ffi_call.3
/usr/share/man/man3/ffi_prep_cif.3
/var/log/sorcery/compile/libffi-3.0.10.bz2
/var/log/sorcery/install/libffi-3.0.10
/var/log/sorcery/md5sum/libffi-3.0.10

----
libffi appears to be present in 4.6.1 as well as 4.6.2.
Possible solutions I see are:
1. add remove-libffi.patch to 4.6.1 AND require libffi dependency if java enabled
2. set libffi.{a,la,so} to volatile

I consider this a show-stopper on any further gcc updates, although I'm not absolutely certain that my system is not a niche case at this time.