cleanup

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.23-gentoo-r3-20080120 ppc

4 files changed, 9 insertions, 1021 deletions

diff --git a/x11-libs/fox/ChangeLog b/x11-libs/fox/ChangeLog
index 4faac8c87080..ce35f428555a 100644
--- a/x11-libs/fox/ChangeLog
+++ b/x11-libs/fox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.118 2008/10/03 16:51:12 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/ChangeLog,v 1.119 2008/11/29 16:45:40 mabi Exp $
+
+  29 Nov 2008; Matti Bickel <mabi@gentoo.org>
+  -files/1.2.18-gcc4-fix-includes.patch, -fox-1.2.18-r1.ebuild:
+  cleanup (solves bug #249023)
 
 *fox-1.6.34 (03 Oct 2008)
 
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
index 81b23c77f97e..46c65c3ddd2c 100644
--- a/x11-libs/fox/Manifest
+++ b/x11-libs/fox/Manifest
@@ -1,24 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.2.18-gcc4-fix-includes.patch 32889 RMD160 55b89157d204dd3231039acf49a224926a0a36d6 SHA1 ef98e3a2d8ac6fdff59cb4ec565b32e7c60aea1f SHA256 d191f9f3ce721faa423effde554aeb23131251d3bd77bf2b3823063ff226ec59
 AUX 1.4.34-gcc4-fix-includes.patch 3218 RMD160 beb324ebe8b4d166ffc8cf6f59ceb90d6cc64ace SHA1 ca8a445b816d47a201f9279911e9785b003215e8 SHA256 93da83288b35ecbd7520edd6f556503a87e5af0751928dbf54a54bf7b6ccd0e4
-DIST fox-1.2.18.tar.gz 3896090 RMD160 8c36939541e28f68bfd332fe1e12891faa15daca SHA1 3e17a6fd31c5e1bba5357c237fcb950834c28c38 SHA256 77509ed17fb736b83f3073fc04986eed79ce70338f6c12596c966551e0d56a1b
 DIST fox-1.4.34.tar.gz 4028423 RMD160 35701bff6937f4753310b364dba1553109e661a4 SHA1 cd532233436082fda3bd077741236f118c71e1b8 SHA256 63acfd4815d3d71cdf2cbccf6e2fdf022192daec1674ab90cc294732948169ab
 DIST fox-1.6.30.tar.gz 4193328 RMD160 7fba6f4c306ae3169f12630c9e88643e92acca3b SHA1 3e0572221aaa83416fce3f248fbdc8298f194f4c SHA256 150fb5a7966ada0e7ebbfc1b98f3ee344399c55886fe796afc83bf80d6981914
 DIST fox-1.6.31.tar.gz 4193330 RMD160 3aef0492b6ab3f64307bc5486f733735dee81d2a SHA1 5f5720597bcd39b3e0805aaa761e6564ecf1913a SHA256 069bf2c5c62f9606ef9ef64410bfe8dcb731eed4911e56d14af0b0006153a6f8
 DIST fox-1.6.34.tar.gz 4339347 RMD160 d883a80e6a986d67bd56cf87f789e218c6b8f370 SHA1 8c504c3339d69f5dd8ff983fa76ffb1cc03d2ceb SHA256 aa88e08d5c2ae970c204d88e7ec31cea10ca5ec532a0e3e37f995b3a00d59dfa
-EBUILD fox-1.2.18-r1.ebuild 1270 RMD160 de1c475ba9ff34430002a0e69210c51f12d7b6f5 SHA1 677f95fc4dbc1a8afa1c3ca5e99806b82388c81a SHA256 822b75995e4dde0b6b33512aba130e8d87c9e0af4bdd3685b3444052069d988b
 EBUILD fox-1.4.34-r1.ebuild 1121 RMD160 a4703381fcbf8f598af63f58cdc47ff9932f35c8 SHA1 246b5ef84faee044f2fe9068dbe4c9a2dec63694 SHA256 d947bc56296ca79dad6095746b5b9e6157ec8f6220d8aeab1fa607860271676f
 EBUILD fox-1.6.30.ebuild 1024 RMD160 f30382a7317bebdb5647e59ab035d145d4ece6e6 SHA1 e3048bb25ea9aa5a35020d38da163fd854ea3ab8 SHA256 9db78646f11acd9fcc10eceafdc2290b9b7a8dd6b064b9f84f2157248b8c7396
 EBUILD fox-1.6.31.ebuild 1029 RMD160 9442bcd86adf0f0eab324c3e60c3ba3a84125eaf SHA1 77fd245afc6de5aa86889666dd842e3a164ab22f SHA256 9ad134f3ee44564866ca03c9b5749821a0ae95579b7ecd9c0d42d7b995460179
 EBUILD fox-1.6.34.ebuild 1029 RMD160 d3920ea55067fa46d1567f5dd19c2453558a4f54 SHA1 7453fd8f18245bf1e6b00e33f1ced17d91d446ca SHA256 26e827e2c23c0b61714b4c99663b6f913964759a5c55385307a78c6fe220fcc7
-MISC ChangeLog 14075 RMD160 49a85f79988cdc363c04255407341527c3e19a39 SHA1 3352c4d446bdb2d04de2476d252b3bf5a12952d3 SHA256 1ec097b5217dea05e2f7c2f3c72c1fab7b21c451e241ae4e762c28569cc292d8
+MISC ChangeLog 14217 RMD160 b768ca3dcfdba453f6833cf65c52bf231070ec94 SHA1 19ed83462145568f258dec4dc56cc3bca341b11e SHA256 c9a30680d3766764f9d6ad3fd9fc768ffe72ba8d41c8d2baa311bc96f144ae4a
 MISC metadata.xml 246 RMD160 d8be15833db0ddabf74171f9e87a2a930ad6bcd2 SHA1 76fdc0af8e2d1dbb1214b95c49f8cd2da3d3832a SHA256 6a089a75a70b3b69d4cae78762fdc69afa25678c5b8692c61245f50bc49ab531
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjmUhEACgkQfNMcoUhJ7GzVQACfaBFFik2/Zy/e9/NPqT05SUXy
-q50AnRcPHac55beX+ArqawIDmtlJgw8N
-=Na/J
+iEYEARECAAYFAkkxccsACgkQfNMcoUhJ7GyhvwCfT0gk0uxVIHXmBMnb+b/ACHhI
+gwcAn0zX41t6GB9T/XgDo3/SW9c8QI6d
+=AUJ+
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fox/files/1.2.18-gcc4-fix-includes.patch b/x11-libs/fox/files/1.2.18-gcc4-fix-includes.patch
deleted file mode 100644
index bc626aaaba8d..000000000000
--- a/x11-libs/fox/files/1.2.18-gcc4-fix-includes.patch
+++ /dev/null
@@ -1,965 +0,0 @@
-diff -ur fox1.2-1.2.13.orig/include/FXCharset.h fox1.2-1.2.13/include/FXCharset.h
---- fox1.2-1.2.13.orig/include/FXCharset.h	2004-02-08 17:17:33.000000000 +0000
-+++ fox1.2-1.2.13/include/FXCharset.h	2006-03-10 00:48:51.722421154 +0000
-@@ -27,6 +27,15 @@
- namespace FX {
- 
- /// A set of characters
-+
-+class FXCharset;
-+
-+/// Save set to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXCharset& cs);
-+
-+/// Load set from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXCharset& cs);
-+
- class FXAPI FXCharset {
- private:
-   FXuint s[8];              // Because 8*32 is 256 characters
-diff -ur fox1.2-1.2.13.orig/include/FXMat3d.h fox1.2-1.2.13/include/FXMat3d.h
---- fox1.2-1.2.13.orig/include/FXMat3d.h	2004-02-08 17:17:33.000000000 +0000
-+++ fox1.2-1.2.13/include/FXMat3d.h	2006-03-10 00:48:03.526775898 +0000
-@@ -29,6 +29,42 @@
- 
- 
- /// Double-precision 3x3 matrix
-+
-+class FXMat3d;
-+
-+/// Other operators
-+FXAPI FXMat3d operator+(const FXMat3d& a,const FXMat3d& b);
-+FXAPI FXMat3d operator-(const FXMat3d& a,const FXMat3d& b);
-+FXAPI FXMat3d operator-(const FXMat3d& a);
-+FXAPI FXMat3d operator*(const FXMat3d& a,const FXMat3d& b);
-+FXAPI FXMat3d operator*(FXdouble x,const FXMat3d& a);
-+FXAPI FXMat3d operator*(const FXMat3d& a,FXdouble x);
-+FXAPI FXMat3d operator/(const FXMat3d& a,FXdouble x);
-+FXAPI FXMat3d operator/(FXdouble x,const FXMat3d& a);
-+
-+/// Multiply matrix and vector
-+FXAPI FXVec3d operator*(const FXVec3d& v,const FXMat3d& m);
-+FXAPI FXVec3d operator*(const FXMat3d& a,const FXVec3d& v);
-+
-+/// Mutiply matrix and vector, for non-projective matrix
-+FXAPI FXVec2d operator*(const FXVec2d& v,const FXMat3d& m);
-+FXAPI FXVec2d operator*(const FXMat3d& a,const FXVec2d& v);
-+
-+/// Determinant
-+FXAPI FXdouble det(const FXMat3d& m);
-+
-+/// Transpose
-+FXAPI FXMat3d transpose(const FXMat3d& m);
-+
-+/// Invert
-+FXAPI FXMat3d invert(const FXMat3d& m);
-+
-+/// Save to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXMat3d& m);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXMat3d& m);
-+
- class FXAPI FXMat3d {
- protected:
-   FXVec3d m[3];
-diff -ur fox1.2-1.2.13.orig/include/FXMat3f.h fox1.2-1.2.13/include/FXMat3f.h
---- fox1.2-1.2.13.orig/include/FXMat3f.h	2004-02-08 17:17:33.000000000 +0000
-+++ fox1.2-1.2.13/include/FXMat3f.h	2006-03-10 01:04:38.131634188 +0000
-@@ -29,6 +29,42 @@
- 
- 
- /// Single-precision 3x3 matrix
-+
-+class FXMat3f;
-+
-+/// Other operators
-+FXAPI FXMat3f operator+(const FXMat3f& a,const FXMat3f& b);
-+FXAPI FXMat3f operator-(const FXMat3f& a,const FXMat3f& b);
-+FXAPI FXMat3f operator-(const FXMat3f& a);
-+FXAPI FXMat3f operator*(const FXMat3f& a,const FXMat3f& b);
-+FXAPI FXMat3f operator*(FXfloat x,const FXMat3f& a);
-+FXAPI FXMat3f operator*(const FXMat3f& a,FXfloat x);
-+FXAPI FXMat3f operator/(const FXMat3f& a,FXfloat x);
-+FXAPI FXMat3f operator/(FXfloat x,const FXMat3f& a);
-+
-+/// Multiply matrix and vector
-+FXAPI FXVec3f operator*(const FXVec3f& v,const FXMat3f& m);
-+FXAPI FXVec3f operator*(const FXMat3f& a,const FXVec3f& v);
-+
-+/// Mutiply matrix and vector, for non-projective matrix
-+FXAPI FXVec2f operator*(const FXVec2f& v,const FXMat3f& m);
-+FXAPI FXVec2f operator*(const FXMat3f& a,const FXVec2f& v);
-+
-+/// Determinant
-+FXAPI FXfloat det(const FXMat3f& m);
-+
-+/// Transpose
-+FXAPI FXMat3f transpose(const FXMat3f& m);
-+
-+/// Invert
-+FXAPI FXMat3f invert(const FXMat3f& m);
-+
-+/// Save to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXMat3f& m);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXMat3f& m);
-+
- class FXAPI FXMat3f {
- protected:
-   FXVec3f m[3];
-diff -ur fox1.2-1.2.13.orig/include/FXMat4d.h fox1.2-1.2.13/include/FXMat4d.h
---- fox1.2-1.2.13.orig/include/FXMat4d.h	2004-02-08 17:17:33.000000000 +0000
-+++ fox1.2-1.2.13/include/FXMat4d.h	2006-03-10 00:52:32.796271887 +0000
-@@ -29,6 +29,42 @@
- 
- 
- /// Double-precision 4x4 matrix
-+
-+class FXMat4d;
-+
-+/// Other operators
-+FXAPI FXMat4d operator+(const FXMat4d& a,const FXMat4d& b);
-+FXAPI FXMat4d operator-(const FXMat4d& a,const FXMat4d& b);
-+FXAPI FXMat4d operator-(const FXMat4d& a);
-+FXAPI FXMat4d operator*(const FXMat4d& a,const FXMat4d& b);
-+FXAPI FXMat4d operator*(FXdouble x,const FXMat4d& a);
-+FXAPI FXMat4d operator*(const FXMat4d& a,FXdouble x);
-+FXAPI FXMat4d operator/(const FXMat4d& a,FXdouble x);
-+FXAPI FXMat4d operator/(FXdouble x,const FXMat4d& a);
-+
-+/// Multiply matrix and vector
-+FXAPI FXVec4d operator*(const FXVec4d& v,const FXMat4d& m);
-+FXAPI FXVec4d operator*(const FXMat4d& a,const FXVec4d& v);
-+
-+/// Mutiply matrix and vector, for non-projective matrix
-+FXAPI FXVec3d operator*(const FXVec3d& v,const FXMat4d& m);
-+FXAPI FXVec3d operator*(const FXMat4d& a,const FXVec3d& v);
-+
-+/// Determinant
-+FXAPI FXdouble det(const FXMat4d& m);
-+
-+/// Transpose
-+FXAPI FXMat4d transpose(const FXMat4d& m);
-+
-+/// Invert
-+FXAPI FXMat4d invert(const FXMat4d& m);
-+
-+/// Save to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXMat4d& m);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXMat4d& m);
-+
- class FXAPI FXMat4d {
- protected:
-   FXVec4d m[4];
-diff -ur fox1.2-1.2.13.orig/include/FXMat4f.h fox1.2-1.2.13/include/FXMat4f.h
---- fox1.2-1.2.13.orig/include/FXMat4f.h	2004-02-08 17:17:33.000000000 +0000
-+++ fox1.2-1.2.13/include/FXMat4f.h	2006-03-10 00:56:14.302065666 +0000
-@@ -29,6 +29,42 @@
- 
- 
- /// Single-precision 4x4 matrix
-+
-+class FXMat4f;
-+
-+/// Other operators
-+FXAPI FXMat4f operator+(const FXMat4f& a,const FXMat4f& b);
-+FXAPI FXMat4f operator-(const FXMat4f& a,const FXMat4f& b);
-+FXAPI FXMat4f operator-(const FXMat4f& a);
-+FXAPI FXMat4f operator*(const FXMat4f& a,const FXMat4f& b);
-+FXAPI FXMat4f operator*(FXfloat x,const FXMat4f& a);
-+FXAPI FXMat4f operator*(const FXMat4f& a,FXfloat x);
-+FXAPI FXMat4f operator/(const FXMat4f& a,FXfloat x);
-+FXAPI FXMat4f operator/(FXfloat x,const FXMat4f& a);
-+
-+/// Multiply matrix and vector
-+FXAPI FXVec4f operator*(const FXVec4f& v,const FXMat4f& m);
-+FXAPI FXVec4f operator*(const FXMat4f& a,const FXVec4f& v);
-+
-+/// Mutiply matrix and vector, for non-projective matrix
-+FXAPI FXVec3f operator*(const FXVec3f& v,const FXMat4f& m);
-+FXAPI FXVec3f operator*(const FXMat4f& a,const FXVec3f& v);
-+
-+/// Determinant
-+FXAPI FXfloat det(const FXMat4f& m);
-+
-+/// Transpose
-+FXAPI FXMat4f transpose(const FXMat4f& m);
-+
-+/// Invert
-+FXAPI FXMat4f invert(const FXMat4f& m);
-+
-+/// Save to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXMat4f& m);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXMat4f& m);
-+
- class FXAPI FXMat4f {
- protected:
-   FXVec4f m[4];
-diff -ur fox1.2-1.2.13.orig/include/FXPoint.h fox1.2-1.2.13/include/FXPoint.h
---- fox1.2-1.2.13.orig/include/FXPoint.h	2004-02-08 17:17:34.000000000 +0000
-+++ fox1.2-1.2.13/include/FXPoint.h	2006-03-10 00:46:23.623948393 +0000
-@@ -28,6 +28,15 @@
- namespace FX {
- 
- /// Point
-+
-+class FXPoint;
-+
-+/// Save object to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXPoint& p);
-+
-+/// Load object from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXPoint& p);
-+
- class FXAPI FXPoint {
- public:
-   FXshort x;
-diff -ur fox1.2-1.2.13.orig/include/FXQuatd.h fox1.2-1.2.13/include/FXQuatd.h
---- fox1.2-1.2.13.orig/include/FXQuatd.h	2004-02-27 18:30:06.000000000 +0000
-+++ fox1.2-1.2.13/include/FXQuatd.h	2006-03-10 00:51:04.020977182 +0000
-@@ -29,6 +29,36 @@
- 
- 
- /// double-precision quaternion
-+
-+class FXQuatd;
-+
-+/// Exponentiate quaternion
-+FXAPI FXQuatd exp(const FXQuatd& q);
-+
-+/// Take logarithm of quaternion
-+FXAPI FXQuatd log(const FXQuatd& q);
-+
-+/// Invert quaternion
-+FXAPI FXQuatd invert(const FXQuatd& q);
-+
-+/// Invert unit quaternion
-+FXAPI FXQuatd unitinvert(const FXQuatd& q);
-+
-+/// Conjugate quaternion
-+FXAPI FXQuatd conj(const FXQuatd& q);
-+
-+/// Multiply quaternions
-+FXAPI FXQuatd operator*(const FXQuatd& p,const FXQuatd& q);
-+
-+// Rotation of a vector by a quaternion
-+FXAPI FXVec3d operator*(const FXQuatd& quat,const FXVec3d& vec);
-+
-+/// Construct quaternion from arc a->b on unit sphere
-+FXAPI FXQuatd arc(const FXVec3d& a,const FXVec3d& b);
-+
-+/// Spherical lerp
-+FXAPI FXQuatd lerp(const FXQuatd& u,const FXQuatd& v,FXdouble f);
-+
- class FXAPI FXQuatd : public FXVec4d {
- public:
- 
-diff -ur fox1.2-1.2.13.orig/include/FXQuatf.h fox1.2-1.2.13/include/FXQuatf.h
---- fox1.2-1.2.13.orig/include/FXQuatf.h	2004-02-27 18:30:06.000000000 +0000
-+++ fox1.2-1.2.13/include/FXQuatf.h	2006-03-10 00:54:14.995796565 +0000
-@@ -29,6 +29,36 @@
- 
- 
- /// Single-precision quaternion
-+
-+class FXQuatf;
-+
-+/// Exponentiate quaternion
-+FXAPI FXQuatf exp(const FXQuatf& q);
-+
-+/// Take logarithm of quaternion
-+FXAPI FXQuatf log(const FXQuatf& q);
-+
-+/// Invert quaternion
-+FXAPI FXQuatf invert(const FXQuatf& q);
-+
-+/// Invert unit quaternion
-+FXAPI FXQuatf unitinvert(const FXQuatf& q);
-+
-+/// Conjugate quaternion
-+FXAPI FXQuatf conj(const FXQuatf& q);
-+
-+/// Multiply quaternions
-+FXAPI FXQuatf operator*(const FXQuatf& p,const FXQuatf& q);
-+
-+// Rotation of a vector by a quaternion
-+FXAPI FXVec3f operator*(const FXQuatf& quat,const FXVec3f& vec);
-+
-+/// Construct quaternion from arc a->b on unit sphere
-+FXAPI FXQuatf arc(const FXVec3f& a,const FXVec3f& b);
-+
-+/// Spherical lerp
-+FXAPI FXQuatf lerp(const FXQuatf& u,const FXQuatf& v,FXfloat f);
-+
- class FXAPI FXQuatf : public FXVec4f {
- public:
- 
-diff -ur fox1.2-1.2.13.orig/include/FXRanged.h fox1.2-1.2.13/include/FXRanged.h
---- fox1.2-1.2.13.orig/include/FXRanged.h	2004-02-29 17:54:17.000000000 +0000
-+++ fox1.2-1.2.13/include/FXRanged.h	2006-03-10 00:49:50.525667765 +0000
-@@ -32,6 +32,24 @@
- 
- 
- /// Bounds
-+
-+class FXRanged;
-+
-+/// Test if bounds overlap
-+FXAPI FXbool overlap(const FXRanged& a,const FXRanged& b);
-+
-+/// Union of two boxes
-+FXAPI FXRanged unite(const FXRanged& a,const FXRanged& b);
-+
-+/// Intersection of two boxes
-+FXAPI FXRanged intersect(const FXRanged& a,const FXRanged& b);
-+
-+/// Save object to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXRanged& bounds);
-+
-+/// Load object from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXRanged& bounds);
-+
- class FXAPI FXRanged {
- public:
-   FXVec3d lower;
-diff -ur fox1.2-1.2.13.orig/include/FXRangef.h fox1.2-1.2.13/include/FXRangef.h
---- fox1.2-1.2.13.orig/include/FXRangef.h	2004-02-29 17:54:17.000000000 +0000
-+++ fox1.2-1.2.13/include/FXRangef.h	2006-03-10 00:53:08.458569703 +0000
-@@ -32,6 +32,24 @@
- 
- 
- /// Bounds
-+
-+class FXRangef;
-+
-+/// Test if boxes a and b overlap
-+FXAPI FXbool overlap(const FXRangef& a,const FXRangef& b);
-+
-+/// Union of two boxes
-+FXAPI FXRangef unite(const FXRangef& a,const FXRangef& b);
-+
-+/// Intersection of two boxes
-+FXAPI FXRangef intersect(const FXRangef& a,const FXRangef& b);
-+
-+/// Save object to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXRangef& bounds);
-+
-+/// Load object from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXRangef& bounds);
-+
- class FXAPI FXRangef {
- public:
-   FXVec3f lower;
-diff -ur fox1.2-1.2.13.orig/include/FXRectangle.h fox1.2-1.2.13/include/FXRectangle.h
---- fox1.2-1.2.13.orig/include/FXRectangle.h	2004-02-11 20:33:36.000000000 +0000
-+++ fox1.2-1.2.13/include/FXRectangle.h	2006-03-10 00:59:02.699861899 +0000
-@@ -28,6 +28,18 @@
- namespace FX {
- 
- /// Rectangle
-+
-+class FXRectangle;
-+
-+/// Rectangles overlap
-+FXAPI FXbool overlap(const FXRectangle& a,const FXRectangle& b);
-+
-+/// Save object to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXRectangle& r);
-+
-+/// Load object from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXRectangle& r);
-+
- class FXAPI FXRectangle {
- public:
-   FXshort x;
-diff -ur fox1.2-1.2.13.orig/include/FXRegion.h fox1.2-1.2.13/include/FXRegion.h
---- fox1.2-1.2.13.orig/include/FXRegion.h	2004-02-11 20:33:36.000000000 +0000
-+++ fox1.2-1.2.13/include/FXRegion.h	2006-03-10 01:00:28.133597198 +0000
-@@ -27,6 +27,27 @@
- namespace FX {
- 
- /// Region
-+
-+class FXRegion;
-+
-+/// Union of region r1 and region r2
-+FXAPI FXRegion operator+(const FXRegion& r1,const FXRegion& r2);
-+
-+/// Intersection of region r1 and region r2
-+FXAPI FXRegion operator*(const FXRegion& r1,const FXRegion& r2);
-+
-+/// Substract region r2 from region r1
-+FXAPI FXRegion operator-(const FXRegion& r1,const FXRegion& r2);
-+
-+/// Xor of region r1 and region r2
-+FXAPI FXRegion operator^(const FXRegion& r1,const FXRegion& r2);
-+
-+/// Return TRUE if region equal to this one
-+FXAPI FXbool operator==(const FXRegion& r1,const FXRegion& r2);
-+
-+/// Return TRUE if region not equal to this one
-+FXAPI FXbool operator!=(const FXRegion& r1,const FXRegion& r2);
-+    
- class FXAPI FXRegion {
-   friend class FXDC;
-   friend class FXDCWindow;
-diff -ur fox1.2-1.2.13.orig/include/FXRex.h fox1.2-1.2.13/include/FXRex.h
---- fox1.2-1.2.13.orig/include/FXRex.h	2004-02-08 17:17:34.000000000 +0000
-+++ fox1.2-1.2.13/include/FXRex.h	2006-03-10 00:53:42.405093749 +0000
-@@ -96,6 +96,17 @@
- * or line end. The flag REX_NOT_EMPTY causes a match to fail if
- * the empty string was matched.
- */
-+
-+class FXRex;
-+
-+/// Comparison operators
-+FXAPI FXbool operator==(const FXRex &r1,const FXRex &r2);
-+FXAPI FXbool operator!=(const FXRex &r1,const FXRex &r2);
-+
-+/// Saving and loading
-+FXAPI FXStream& operator<<(FXStream& store,const FXRex& s);
-+FXAPI FXStream& operator>>(FXStream& store,FXRex& s);
-+
- class FXAPI FXRex {
- private:
-   FXint *code;
-diff -ur fox1.2-1.2.13.orig/include/FXSize.h fox1.2-1.2.13/include/FXSize.h
---- fox1.2-1.2.13.orig/include/FXSize.h	2004-02-08 17:17:34.000000000 +0000
-+++ fox1.2-1.2.13/include/FXSize.h	2006-03-10 00:42:11.995126427 +0000
-@@ -28,6 +28,14 @@
- namespace FX {
- 
- /// Size
-+class FXSize;
-+
-+/// Save object to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXSize& s);
-+
-+/// Load object from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXSize& s);
-+
- class FXAPI FXSize {
- public:
-   FXshort w;
-diff -ur fox1.2-1.2.13.orig/include/FXSphered.h fox1.2-1.2.13/include/FXSphered.h
---- fox1.2-1.2.13.orig/include/FXSphered.h	2004-03-21 19:07:57.000000000 +0000
-+++ fox1.2-1.2.13/include/FXSphered.h	2006-03-10 00:50:26.049983775 +0000
-@@ -32,6 +32,24 @@
- 
- 
- // Spherical bounds
-+
-+class FXSphered;
-+
-+/// Test if box overlaps with sphere
-+FXAPI FXbool overlap(const FXRanged& a,const FXSphered& b);
-+
-+/// Test if sphere overlaps with box
-+FXAPI FXbool overlap(const FXSphered& a,const FXRanged& b);
-+
-+/// Test if spheres overlap
-+FXAPI FXbool overlap(const FXSphered& a,const FXSphered& b);
-+
-+/// Save object to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXSphered& sphere);
-+
-+/// Load object from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXSphered& sphere);
-+
- class FXAPI FXSphered {
- public:
-   FXVec3d  center;
-diff -ur fox1.2-1.2.13.orig/include/FXSpheref.h fox1.2-1.2.13/include/FXSpheref.h
---- fox1.2-1.2.13.orig/include/FXSpheref.h	2004-03-21 19:07:57.000000000 +0000
-+++ fox1.2-1.2.13/include/FXSpheref.h	2006-03-10 00:51:38.656410394 +0000
-@@ -32,6 +32,24 @@
- 
- 
- // Spherical bounds
-+
-+class FXSpheref;
-+
-+/// Test if box overlaps with sphere
-+FXAPI FXbool overlap(const FXRangef& a,const FXSpheref& b);
-+
-+/// Test if sphere overlaps with box
-+FXAPI FXbool overlap(const FXSpheref& a,const FXRangef& b);
-+
-+/// Test if spheres overlap
-+FXAPI FXbool overlap(const FXSpheref& a,const FXSpheref& b);
-+
-+/// Save object to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXSpheref& sphere);
-+
-+/// Load object from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXSpheref& sphere);
-+
- class FXAPI FXSpheref {
- public:
-   FXVec3f center;
-diff -ur fox1.2-1.2.13.orig/include/FXString.h fox1.2-1.2.13/include/FXString.h
---- fox1.2-1.2.13.orig/include/FXString.h	2004-08-28 02:10:02.000000000 +0100
-+++ fox1.2-1.2.13/include/FXString.h	2006-03-10 00:41:13.793800451 +0000
-@@ -30,6 +30,108 @@
- /**
- * FXString provides essential string manipulation capabilities.
- */
-+class FXString;
-+    
-+/// Compare
-+FXAPI FXint compare(const FXchar* s1,const FXchar* s2);
-+FXAPI FXint compare(const FXchar* s1,const FXString& s2);
-+FXAPI FXint compare(const FXString& s1,const FXchar* s2);
-+FXAPI FXint compare(const FXString& s1,const FXString& s2);
-+
-+/// Compare up to n
-+FXAPI FXint compare(const FXchar* s1,const FXchar* s2,FXint n);
-+FXAPI FXint compare(const FXchar* s1,const FXString& s2,FXint n);
-+FXAPI FXint compare(const FXString& s1,const FXchar* s2,FXint n);
-+FXAPI FXint compare(const FXString& s1,const FXString& s2,FXint n);
-+
-+/// Compare case insensitive
-+FXAPI FXint comparecase(const FXchar* s1,const FXchar* s2);
-+FXAPI FXint comparecase(const FXchar* s1,const FXString& s2);
-+FXAPI FXint comparecase(const FXString& s1,const FXchar* s2);
-+FXAPI FXint comparecase(const FXString& s1,const FXString& s2);
-+
-+/// Compare case insensitive up to n
-+FXAPI FXint comparecase(const FXchar* s1,const FXchar* s2,FXint n);
-+FXAPI FXint comparecase(const FXchar* s1,const FXString& s2,FXint n);
-+FXAPI FXint comparecase(const FXString& s1,const FXchar* s2,FXint n);
-+FXAPI FXint comparecase(const FXString& s1,const FXString& s2,FXint n);
-+
-+/// Comparison operators
-+FXAPI FXbool operator==(const FXString& s1,const FXString& s2);
-+FXAPI FXbool operator==(const FXString& s1,const FXchar* s2);
-+FXAPI FXbool operator==(const FXchar* s1,const FXString& s2);
-+
-+FXAPI FXbool operator!=(const FXString& s1,const FXString& s2);
-+FXAPI FXbool operator!=(const FXString& s1,const FXchar* s2);
-+FXAPI FXbool operator!=(const FXchar* s1,const FXString& s2);
-+
-+FXAPI FXbool operator<(const FXString& s1,const FXString& s2);
-+FXAPI FXbool operator<(const FXString& s1,const FXchar* s2);
-+FXAPI FXbool operator<(const FXchar* s1,const FXString& s2);
-+
-+FXAPI FXbool operator<=(const FXString& s1,const FXString& s2);
-+FXAPI FXbool operator<=(const FXString& s1,const FXchar* s2);
-+FXAPI FXbool operator<=(const FXchar* s1,const FXString& s2);
-+
-+FXAPI FXbool operator>(const FXString& s1,const FXString& s2);
-+FXAPI FXbool operator>(const FXString& s1,const FXchar* s2);
-+FXAPI FXbool operator>(const FXchar* s1,const FXString& s2);
-+
-+FXAPI FXbool operator>=(const FXString& s1,const FXString& s2);
-+FXAPI FXbool operator>=(const FXString& s1,const FXchar* s2);
-+FXAPI FXbool operator>=(const FXchar* s1,const FXString& s2);
-+
-+/// Concatenate two strings
-+FXAPI FXString operator+(const FXString& s1,const FXString& s2);
-+FXAPI FXString operator+(const FXString& s1,const FXchar* s2);
-+FXAPI FXString operator+(const FXchar* s1,const FXString& s2);
-+
-+/// Concatenate with single character
-+FXAPI FXString operator+(const FXString& s,FXchar c);
-+FXAPI FXString operator+(FXchar c,const FXString& s);
-+
-+/// Saving to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXString& s);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXString& s);
-+
-+/// Format a string a-la printf
-+FXAPI FXString FXStringFormat(const FXchar* fmt,...) FX_PRINTF(1,2) ;
-+FXAPI FXString FXStringVFormat(const FXchar* fmt,va_list args);
-+
-+/**
-+* Convert integer number to a string, using the given number
-+* base, which must be between 2 and 16.
-+*/
-+FXAPI FXString FXStringVal(FXint num,FXint base=10);
-+FXAPI FXString FXStringVal(FXuint num,FXint base=10);
-+
-+/**
-+* Convert real number to a string, using the given procision and
-+* exponential notation mode, which may be FALSE (never), TRUE (always), or
-+* MAYBE (when needed).
-+*/
-+FXAPI FXString FXStringVal(FXfloat num,FXint prec=6,FXbool exp=MAYBE);
-+FXAPI FXString FXStringVal(FXdouble num,FXint prec=6,FXbool exp=MAYBE);
-+
-+/// Convert string to a integer number, assuming given number base
-+FXAPI FXint FXIntVal(const FXString& s,FXint base);
-+FXAPI FXuint FXUIntVal(const FXString& s,FXint base);
-+
-+/// Convert string into real number
-+FXAPI FXfloat FXFloatVal(const FXString& s);
-+FXAPI FXdouble FXDoubleVal(const FXString& s);
-+
-+/// Escape special characters in a string
-+FXAPI FXString escape(const FXString& s);
-+
-+/// Unescape special characters in a string
-+FXAPI FXString unescape(const FXString& s);
-+
-+/// Swap two strings
-+FXAPI void swap(FXString& a,FXString& b);
-+
- class FXAPI FXString {
- private:
-   FXchar* str;
-@@ -359,25 +461,21 @@
-   FXuint hash() const;
- 
-   /// Compare
--  friend FXAPI FXint compare(const FXchar* s1,const FXchar* s2);
-   friend FXAPI FXint compare(const FXchar* s1,const FXString& s2);
-   friend FXAPI FXint compare(const FXString& s1,const FXchar* s2);
-   friend FXAPI FXint compare(const FXString& s1,const FXString& s2);
- 
-   /// Compare up to n
--  friend FXAPI FXint compare(const FXchar* s1,const FXchar* s2,FXint n);
-   friend FXAPI FXint compare(const FXchar* s1,const FXString& s2,FXint n);
-   friend FXAPI FXint compare(const FXString& s1,const FXchar* s2,FXint n);
-   friend FXAPI FXint compare(const FXString& s1,const FXString& s2,FXint n);
- 
-   /// Compare case insensitive
--  friend FXAPI FXint comparecase(const FXchar* s1,const FXchar* s2);
-   friend FXAPI FXint comparecase(const FXchar* s1,const FXString& s2);
-   friend FXAPI FXint comparecase(const FXString& s1,const FXchar* s2);
-   friend FXAPI FXint comparecase(const FXString& s1,const FXString& s2);
- 
-   /// Compare case insensitive up to n
--  friend FXAPI FXint comparecase(const FXchar* s1,const FXchar* s2,FXint n);
-   friend FXAPI FXint comparecase(const FXchar* s1,const FXString& s2,FXint n);
-   friend FXAPI FXint comparecase(const FXString& s1,const FXchar* s2,FXint n);
-   friend FXAPI FXint comparecase(const FXString& s1,const FXString& s2,FXint n);
-@@ -431,21 +529,6 @@
-   friend FXAPI FXString FXStringFormat(const FXchar* fmt,...) FX_PRINTF(1,2) ;
-   friend FXAPI FXString FXStringVFormat(const FXchar* fmt,va_list args);
- 
--  /**
--  * Convert integer number to a string, using the given number
--  * base, which must be between 2 and 16.
--  */
--  friend FXAPI FXString FXStringVal(FXint num,FXint base=10);
--  friend FXAPI FXString FXStringVal(FXuint num,FXint base=10);
--
--  /**
--  * Convert real number to a string, using the given procision and
--  * exponential notation mode, which may be FALSE (never), TRUE (always), or
--  * MAYBE (when needed).
--  */
--  friend FXAPI FXString FXStringVal(FXfloat num,FXint prec=6,FXbool exp=MAYBE);
--  friend FXAPI FXString FXStringVal(FXdouble num,FXint prec=6,FXbool exp=MAYBE);
--
-   /// Convert string to a integer number, assuming given number base
-   friend FXAPI FXint FXIntVal(const FXString& s,FXint base=10);
-   friend FXAPI FXuint FXUIntVal(const FXString& s,FXint base=10);
-@@ -454,12 +537,6 @@
-   friend FXAPI FXfloat FXFloatVal(const FXString& s);
-   friend FXAPI FXdouble FXDoubleVal(const FXString& s);
- 
--  /// Escape special characters in a string
--  friend FXAPI FXString escape(const FXString& s);
--
--  /// Unescape special characters in a string
--  friend FXAPI FXString unescape(const FXString& s);
--
-   /// Swap two strings
-   friend FXAPI void swap(FXString& a,FXString& b){ FXchar *t=a.str; a.str=b.str; b.str=t; }
- 
-diff -ur fox1.2-1.2.13.orig/include/FXVec2d.h fox1.2-1.2.13/include/FXVec2d.h
---- fox1.2-1.2.13.orig/include/FXVec2d.h	2004-02-13 22:48:37.000000000 +0000
-+++ fox1.2-1.2.13/include/FXVec2d.h	2006-03-10 00:55:10.350497877 +0000
-@@ -29,6 +29,26 @@
- 
- 
- /// Double-precision 2-element vector
-+
-+class FXVec2d;
-+
-+/// Length and square of length
-+FXAPI FXdouble len2(const FXVec2d& a);
-+FXAPI FXdouble len(const FXVec2d& a);
-+
-+/// Normalize vector
-+FXAPI FXVec2d normalize(const FXVec2d& a);
-+
-+/// Lowest or highest components
-+FXAPI FXVec2d lo(const FXVec2d& a,const FXVec2d& b);
-+FXAPI FXVec2d hi(const FXVec2d& a,const FXVec2d& b);
-+
-+/// Save vector to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXVec2d& v);
-+
-+/// Load vector from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXVec2d& v);
-+
- class FXAPI FXVec2d {
- public:
-   FXdouble x;
-diff -ur fox1.2-1.2.13.orig/include/FXVec2f.h fox1.2-1.2.13/include/FXVec2f.h
---- fox1.2-1.2.13.orig/include/FXVec2f.h	2004-02-13 22:48:37.000000000 +0000
-+++ fox1.2-1.2.13/include/FXVec2f.h	2006-03-10 00:58:11.589600944 +0000
-@@ -29,6 +29,26 @@
- 
- 
- /// Single-precision 2-element vector
-+
-+class FXVec2f;
-+
-+/// Length and square of length
-+FXAPI FXfloat len2(const FXVec2f& a);
-+FXAPI FXfloat len(const FXVec2f& a);
-+
-+/// Normalize vector
-+FXAPI FXVec2f normalize(const FXVec2f& a);
-+
-+/// Lowest or highest components
-+FXAPI FXVec2f lo(const FXVec2f& a,const FXVec2f& b);
-+FXAPI FXVec2f hi(const FXVec2f& a,const FXVec2f& b);
-+
-+/// Save vector to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXVec2f& v);
-+
-+/// Load vector from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXVec2f& v);
-+
- class FXAPI FXVec2f {
- public:
-   FXfloat x;
-diff -ur fox1.2-1.2.13.orig/include/FXVec3d.h fox1.2-1.2.13/include/FXVec3d.h
---- fox1.2-1.2.13.orig/include/FXVec3d.h	2004-02-13 22:48:37.000000000 +0000
-+++ fox1.2-1.2.13/include/FXVec3d.h	2006-03-10 00:57:09.046847398 +0000
-@@ -29,6 +29,26 @@
- 
- 
- /// Double-precision 3-element vector
-+
-+class FXVec3d;
-+
-+/// Length and square of length
-+FXAPI FXdouble len2(const FXVec3d& a);
-+FXAPI FXdouble len(const FXVec3d& a);
-+
-+/// Normalize vector
-+FXAPI FXVec3d normalize(const FXVec3d& a);
-+
-+/// Lowest or highest components
-+FXAPI FXVec3d lo(const FXVec3d& a,const FXVec3d& b);
-+FXAPI FXVec3d hi(const FXVec3d& a,const FXVec3d& b);
-+
-+/// Save vector to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXVec3d& v);
-+
-+/// Load vector from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXVec3d& v);
-+
- class FXAPI FXVec3d {
- public:
-   FXdouble x;
-diff -ur fox1.2-1.2.13.orig/include/FXVec3f.h fox1.2-1.2.13/include/FXVec3f.h
---- fox1.2-1.2.13.orig/include/FXVec3f.h	2004-05-13 23:36:05.000000000 +0100
-+++ fox1.2-1.2.13/include/FXVec3f.h	2006-03-10 00:44:21.585039599 +0000
-@@ -29,6 +29,26 @@
- 
- 
- /// Single-precision 3-element vector
-+
-+class FXVec3f;
-+   
-+/// Length and square of length
-+FXAPI FXfloat len2(const FXVec3f& a);
-+FXAPI FXfloat len(const FXVec3f& a);
-+
-+/// Normalize vector
-+FXAPI FXVec3f normalize(const FXVec3f& a);
-+
-+/// Lowest or highest components
-+FXAPI FXVec3f lo(const FXVec3f& a,const FXVec3f& b);
-+FXAPI FXVec3f hi(const FXVec3f& a,const FXVec3f& b);
-+
-+/// Save vector to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXVec3f& v);
-+
-+/// Load vector from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXVec3f& v);
-+
- class FXAPI FXVec3f {
- public:
-   FXfloat x;
-diff -ur fox1.2-1.2.13.orig/include/FXVec4d.h fox1.2-1.2.13/include/FXVec4d.h
---- fox1.2-1.2.13.orig/include/FXVec4d.h	2004-06-04 05:32:23.000000000 +0100
-+++ fox1.2-1.2.13/include/FXVec4d.h	2006-03-10 00:45:40.856587401 +0000
-@@ -29,6 +29,26 @@
- 
- 
- /// Double-precision 4-element vector
-+
-+class FXVec4d;
-+
-+/// Length and square of length
-+FXAPI FXdouble len2(const FXVec4d& a);
-+FXAPI FXdouble len(const FXVec4d& a);
-+
-+/// Normalize vector
-+FXAPI FXVec4d normalize(const FXVec4d& a);
-+
-+/// Lowest or highest components
-+FXAPI FXVec4d lo(const FXVec4d& a,const FXVec4d& b);
-+FXAPI FXVec4d hi(const FXVec4d& a,const FXVec4d& b);
-+
-+/// Save to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXVec4d& v);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXVec4d& v);
-+
- class FXAPI FXVec4d {
- public:
-   FXdouble x;
-diff -ur fox1.2-1.2.13.orig/include/FXVec4f.h fox1.2-1.2.13/include/FXVec4f.h
---- fox1.2-1.2.13.orig/include/FXVec4f.h	2004-06-04 05:32:23.000000000 +0100
-+++ fox1.2-1.2.13/include/FXVec4f.h	2006-03-10 01:02:29.506593795 +0000
-@@ -29,6 +29,26 @@
- 
- 
- /// Single-precision 4-element vector
-+
-+class FXVec4f;
-+
-+/// Length and square of length
-+FXAPI FXfloat len2(const FXVec4f& a);
-+FXAPI FXfloat len(const FXVec4f& a);
-+
-+/// Normalize vector
-+FXAPI FXVec4f normalize(const FXVec4f& a);
-+
-+/// Lowest or highest components
-+FXAPI FXVec4f lo(const FXVec4f& a,const FXVec4f& b);
-+FXAPI FXVec4f hi(const FXVec4f& a,const FXVec4f& b);
-+
-+/// Save to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXVec4f& v);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXVec4f& v);
-+
- class FXAPI FXVec4f {
- public:
-   FXfloat x;
-diff -ur fox1.2-1.2.13.orig/include/FXWString.h fox1.2-1.2.13/include/FXWString.h
---- fox1.2-1.2.13.orig/include/FXWString.h	2004-02-08 17:17:34.000000000 +0000
-+++ fox1.2-1.2.13/include/FXWString.h	2006-03-10 00:41:09.187407818 +0000
-@@ -34,6 +34,75 @@
- /**
- * FXWString provides a "wide" string class suitable for storing Unicode strings.
- */
-+class FXWString;
-+
-+/// Compare
-+FXAPI FXint compare(const FXwchar *s1,const FXwchar *s2);
-+FXAPI FXint compare(const FXwchar *s1,const FXWString &s2);
-+FXAPI FXint compare(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXint compare(const FXWString &s1,const FXWString &s2);
-+
-+/// Compare up to n
-+FXAPI FXint compare(const FXwchar *s1,const FXwchar *s2,FXint n);
-+FXAPI FXint compare(const FXwchar *s1,const FXWString &s2,FXint n);
-+FXAPI FXint compare(const FXWString &s1,const FXwchar *s2,FXint n);
-+FXAPI FXint compare(const FXWString &s1,const FXWString &s2,FXint n);
-+
-+/// Compare case insensitive
-+FXAPI FXint comparecase(const FXwchar *s1,const FXwchar *s2);
-+FXAPI FXint comparecase(const FXwchar *s1,const FXWString &s2);
-+FXAPI FXint comparecase(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXint comparecase(const FXWString &s1,const FXWString &s2);
-+
-+/// Compare case insensitive up to n
-+FXAPI FXint comparecase(const FXwchar *s1,const FXwchar *s2,FXint n);
-+FXAPI FXint comparecase(const FXwchar *s1,const FXWString &s2,FXint n);
-+FXAPI FXint comparecase(const FXWString &s1,const FXwchar *s2,FXint n);
-+FXAPI FXint comparecase(const FXWString &s1,const FXWString &s2,FXint n);
-+
-+/// Comparison operators
-+FXAPI FXbool operator==(const FXWString &s1,const FXWString &s2);
-+FXAPI FXbool operator==(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXbool operator==(const FXwchar *s1,const FXWString &s2);
-+
-+FXAPI FXbool operator!=(const FXWString &s1,const FXWString &s2);
-+FXAPI FXbool operator!=(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXbool operator!=(const FXwchar *s1,const FXWString &s2);
-+
-+FXAPI FXbool operator<(const FXWString &s1,const FXWString &s2);
-+FXAPI FXbool operator<(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXbool operator<(const FXwchar *s1,const FXWString &s2);
-+
-+FXAPI FXbool operator<=(const FXWString &s1,const FXWString &s2);
-+FXAPI FXbool operator<=(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXbool operator<=(const FXwchar *s1,const FXWString &s2);
-+
-+FXAPI FXbool operator>(const FXWString &s1,const FXWString &s2);
-+FXAPI FXbool operator>(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXbool operator>(const FXwchar *s1,const FXWString &s2);
-+
-+FXAPI FXbool operator>=(const FXWString &s1,const FXWString &s2);
-+FXAPI FXbool operator>=(const FXWString &s1,const FXwchar *s2);
-+FXAPI FXbool operator>=(const FXwchar *s1,const FXWString &s2);
-+
-+/// Concatenate two strings
-+FXAPI FXWString operator+(const FXWString& s1,const FXWString& s2);
-+FXAPI FXWString operator+(const FXWString& s1,const FXwchar* s2);
-+FXAPI FXWString operator+(const FXwchar* s1,const FXWString& s2);
-+
-+/// Concatenate with single character
-+FXAPI FXWString operator+(const FXWString& s,FXwchar c);
-+FXAPI FXWString operator+(FXwchar c,const FXWString& s);
-+
-+/// Saving to a stream
-+FXAPI FXStream& operator<<(FXStream& store,const FXWString& s);
-+
-+/// Load from a stream
-+FXAPI FXStream& operator>>(FXStream& store,FXWString& s);
-+
-+/// Swap two strings
-+FXAPI void swap(FXWString& a,FXWString& b);
-+
- class FXAPI FXWString {
- private:
-   FXwchar* str;
-@@ -363,25 +432,21 @@
-   FXuint hash() const;
- 
-   /// Compare
--  friend FXAPI FXint compare(const FXwchar *s1,const FXwchar *s2);
-   friend FXAPI FXint compare(const FXwchar *s1,const FXWString &s2);
-   friend FXAPI FXint compare(const FXWString &s1,const FXwchar *s2);
-   friend FXAPI FXint compare(const FXWString &s1,const FXWString &s2);
- 
-   /// Compare up to n
--  friend FXAPI FXint compare(const FXwchar *s1,const FXwchar *s2,FXint n);
-   friend FXAPI FXint compare(const FXwchar *s1,const FXWString &s2,FXint n);
-   friend FXAPI FXint compare(const FXWString &s1,const FXwchar *s2,FXint n);
-   friend FXAPI FXint compare(const FXWString &s1,const FXWString &s2,FXint n);
- 
-   /// Compare case insensitive
--  friend FXAPI FXint comparecase(const FXwchar *s1,const FXwchar *s2);
-   friend FXAPI FXint comparecase(const FXwchar *s1,const FXWString &s2);
-   friend FXAPI FXint comparecase(const FXWString &s1,const FXwchar *s2);
-   friend FXAPI FXint comparecase(const FXWString &s1,const FXWString &s2);
- 
-   /// Compare case insensitive up to n
--  friend FXAPI FXint comparecase(const FXwchar *s1,const FXwchar *s2,FXint n);
-   friend FXAPI FXint comparecase(const FXwchar *s1,const FXWString &s2,FXint n);
-   friend FXAPI FXint comparecase(const FXWString &s1,const FXwchar *s2,FXint n);
-   friend FXAPI FXint comparecase(const FXWString &s1,const FXWString &s2,FXint n);
-
diff --git a/x11-libs/fox/fox-1.2.18-r1.ebuild b/x11-libs/fox/fox-1.2.18-r1.ebuild
deleted file mode 100644
index 02dedbe6b19e..000000000000
--- a/x11-libs/fox/fox-1.2.18-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fox/fox-1.2.18-r1.ebuild,v 1.11 2007/03/26 14:24:20 armin76 Exp $
-
-inherit eutils toolchain-funcs flag-o-matic fox
-
-LICENSE="LGPL-2.1"
-SLOT="1.2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="bzip2 cups jpeg opengl png threads tiff truetype zlib"
-
-RDEPEND="x11-libs/libXrandr
-	x11-libs/libXcursor
-	x11-libs/fox-wrapper
-	bzip2? ( >=app-arch/bzip2-1.0.2 )
-	cups? ( net-print/cups )
-	jpeg? ( >=media-libs/jpeg-6b )
-	opengl? ( virtual/opengl virtual/glu )
-	png? ( >=media-libs/libpng-1.2.5 )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-	truetype? ( =media-libs/freetype-2*
-		virtual/xft )
-	zlib? ( >=sys-libs/zlib-1.1.4 )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-libs/libXt"
-
-FOXCONF="$(use_enable bzip2 bz2lib) \
-	$(use_enable cups) \
-	$(use_enable jpeg) \
-	$(use_with opengl) \
-	$(use_enable png) \
-	$(use_enable threads threadsafe) \
-	$(use_enable tiff) \
-	$(use_with truetype xft) \
-	$(use_enable zlib)"
-
-src_unpack() {
-	fox_src_unpack
-	epatch "${FILESDIR}"/${PV}-gcc4-fix-includes.patch
-}
-
-src_compile() {
-#	if [[ $(gcc-major-version) -ge 4 ]]; then
-#		append-flags -ffriend-injection
-#	fi
-	fox_src_compile
-}