Fix compatibility with boost >=1.49.0 (filesystem v2 gone), bug #425426.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 947 insertions, 7 deletions

diff --git a/dev-cpp/xsd/ChangeLog b/dev-cpp/xsd/ChangeLog
index b8fe7581f95f..2b7dbddab0da 100644
--- a/dev-cpp/xsd/ChangeLog
+++ b/dev-cpp/xsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-cpp/xsd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/xsd/ChangeLog,v 1.3 2012/06/01 20:52:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/xsd/ChangeLog,v 1.4 2012/08/23 13:40:52 dev-zero Exp $
+
+  23 Aug 2012; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.3.0-boost-filesystem-v2-deprecation.patch, xsd-3.3.0.ebuild:
+  Fix compatibility with boost >=1.49.0 (filesystem v2 gone), bug #425426.
 
   01 Jun 2012; Tiziano Müller <dev-zero@gentoo.org> xsd-3.3.0.ebuild:
   Fix bug #372925 by adding -DBOOST_FILESYSTEM_VERSION=2 to
@@ -16,4 +20,3 @@
   +files/3.3.0-fix_include.patch, +files/3.3.0-fix_tests.patch,
   +files/3.3.0-xsdcxx-rename.patch, +xsd-3.3.0.ebuild, +metadata.xml:
   Initial commit (ebuild written by me).
-
diff --git a/dev-cpp/xsd/Manifest b/dev-cpp/xsd/Manifest
index b68b9a4e5ac8..6068d8fee52e 100644
--- a/dev-cpp/xsd/Manifest
+++ b/dev-cpp/xsd/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 3.3.0-boost-filesystem-v2-deprecation.patch 30894 SHA256 1b41cf6a8a75ff9c5ec03875afacc374717cfbbbf22c2dce941adfcc5d9447c6 SHA512 7e30861275d24c813aa11c554743a297267c4bcfcd353d89c7271984e2dadfd52f6fb13dd26718a07c04b8575186d6c138505b8fb0c2a2802e8f50c9680ce984 WHIRLPOOL 1199ff1d95c60d19d16be243658ba03a73cb3080e1ddd7dde6d3ce26d220263c82f0308917dec56d76f6c515122a8eba20e10958ea3ead8abf3768b599a8030f
 AUX 3.3.0-disable_examples_and_tests.patch 2198 SHA256 03bbbd8253082dd4f843a39e6642257baa6efe6501206e445b24e123ba1e3803 SHA512 75fee56b6b3d4e834015aabf9c458e077c0f91bc0471f438b912ddf84db460f509edee35f6c4782d04e69510fd473161ebbc5e2e285646d171e6f8ce58ba83aa WHIRLPOOL cab4a5d82bb56cb0855affd3c1c3b969590f5e1c04a3e447ad1b07079a21c9848f6c30e6bc29b640202e8226773e35c073d87a5f37cdf0ae447bf84944c0c8dc
 AUX 3.3.0-fix_include.patch 510 SHA256 55edb0523f7bbb94ca488990a57442507fdb89a7b74edeff52a053223194b516 SHA512 cca56baff078f4d71837b51f5ca904e5d39c0b6553151f382d10642b468c62f48ce76148b5a90fba6f94944733199249e13d58536eb54caa1b8338520d6a66e6 WHIRLPOOL fc47914674638e53c50e2afccd7791c9741cc9c1ec04c9bce0f5b0261d1b9e02b75a8ce4c8b3c981b3d3398cfe2972952950b603e5ad9d0e508c34efd7e688b1
 AUX 3.3.0-fix_tests.patch 518 SHA256 c108b896b1c3a3f4da115a89c2e1ef3593a4aaef10639efe7a6072def28c4668 SHA512 244ebdb687adc3598889678bdadfef68beb0c8a424b54b658d90400a419edf941b4decc1d12cfcf727cce168aba2c14afdb924f875e070c1c63f9341e0c9f4bd WHIRLPOOL 2bcb37671edbc079b58fcb6cfca917142a8f9cab777c1be4910457d30b4a727682c8b26897a50834dcca735d8fece44838736b3f9c9ee65b2ee3f4bc358dfa08
 AUX 3.3.0-xsdcxx-rename.patch 3825 SHA256 d0b9193d9501c6d1d718a3b45de8d6e2a0e20ce11b6f68a4d73d2f77dbe3ceca SHA512 74fb8b0a7dfe9264c50b8ad9f9709b6d9da0b6569b6be964f7d82215c8af93ad68fe1e8f19666137dc891896824792c4f9dc5b5df8f185341d4d7e2fcbb3e8e5 WHIRLPOOL f020a4273f7a81cb7d80deb2137f70b59ffc0b22817c9b91c21267cd1904114edb18dea2e3e8ec2c8e8e7857d4e299c3d9a8cb35850869bdcff296e5a6bcc7ce
 DIST xsd-3.3.0.tar.bz2 999479 SHA256 6157e3b0f3108f69a8d9344956020c234841d4a1de28745b19e45f8ee34b0c66 SHA512 4e7d18d71b362c4b67ad70c59c68d9be4a5f7210c94306c1685c2991a5eb82496675ac0c53f2919237e658d2e1fcf7e1bf5abe295127c7cf175c8eed090a8570 WHIRLPOOL 70b4767c463d4c5be65f8757e519a98a3c9dbc00f9a8a86026bdba5115eae5c5c7008ea05709ba293a68ab8de718b070cc0b4f6390f5bac62dca5f8a63480341
-EBUILD xsd-3.3.0.ebuild 4105 SHA256 d23681d9ae7d3414dc1b7dafe703e1dbde534a6bf816c23c32c4076de7eda611 SHA512 69bb4945f272342d5ec1b36f63d4181dcaa7955e36c259690a55b8722373a067bb46e7813630c350061b00cee909161fd3d82cb7f24a088972d8a0580f6a14a5 WHIRLPOOL fcacd4631c9e7a18e6f2e4254496a5a6be5fadbd2cc2112324a44db767739c78bbb179d1ac44ad456ee0df47f2fe4ae467427b73761b9cb45dc630bc09bce99a
-MISC ChangeLog 763 SHA256 feec38000ae321e672ab395427b36233a88fcc4ec949e9606ad0a5486aa87846 SHA512 921939534b29a30f0b7c15e88bbedc0bd75a37d0b83f41d9d44c6c12b2cb18e91892ce14127e1a93769574ea9d4d421222542d055fcdc14c15fc73c056b9ba76 WHIRLPOOL 7fbd2700a5c5f0e16a8cb594b03a4994ab2c86ef9d751d9ebea2f518255b91b5e53914bdc58735539a5037641b15134b7166f30990e1a48b8e27882a8afedaf9
+EBUILD xsd-3.3.0.ebuild 4138 SHA256 99d6dc57ad4051feadfcd99cd7f5a2d1648c7a13617256765fe106c066925ead SHA512 7c08f6befe5231a46516a6cb12dcd19b2e4e55b9fcd2cfabc5ae070b1e908d111766cf785016c01ba10dde6a150439bce73ac362bf0652e857752672d7d724c2 WHIRLPOOL 1c97b57bc28fe0ba5361278c72a4e8f5497d2cd8c3f7052dd07271f74769e430f1f4a07358dcca4396ae5d8049fc597cd2f1acbe8cda046146f4ad1bb0dd0adb
+MISC ChangeLog 963 SHA256 3989fdd65a5b70b9251f18bd5f32f4d855218e79d5378ab792a24a220c0ea3ef SHA512 b56a2ede0b1b4d2c328f5068779a17442d4fa1ac89a33844ea2000655eb8375bd9227936f55e6956b3e18fccb7b617306966e922b560b4e207f08f459a3bebbf WHIRLPOOL b9aa9fd33ac9bbdd48b838525d673c132670a752ee59d12ffdff83090793a1813a96d9e3e9524863f8eeea665b2912e89ff974d49561ab0136213a2f381626a3
 MISC metadata.xml 335 SHA256 3c49f7ca9d13a17bbe874ce93eb199e7c5d185fc063f34920e056e0d37dfa06d SHA512 e963a4fdc96d86ef48f4a61bc4ba127832d37eea26ad335455be64fa954b8a24b1d0c8ea35d273466c339e03423b4fdb4aa4989909a062efaf12c6336f3b983d WHIRLPOOL ff628441272080415185657a1dfc35a17b9b0a7682da68c8c579142734f33da52afac311d10abcee61f01549a6d63feaf8618a8c870064e69b7b0cbb9ccc9e69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlA2MuoACgkQGwVqY66cHjATjACfXBj3aUk2UwjHOad/MmFWw0rP
+8ekAmwQqoqeXBcJSuHu803b0TI1+F+qP
+=e4y0
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/xsd/files/3.3.0-boost-filesystem-v2-deprecation.patch b/dev-cpp/xsd/files/3.3.0-boost-filesystem-v2-deprecation.patch
new file mode 100644
index 000000000000..0babafa0e685
--- /dev/null
+++ b/dev-cpp/xsd/files/3.3.0-boost-filesystem-v2-deprecation.patch
@@ -0,0 +1,925 @@
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/expat/elements.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/expat/elements.txx
+--- xsd-3.3.0/libxsd/xsd/cxx/parser/expat/elements.txx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/expat/elements.txx	2012-06-03 11:02:09.000000000 +0200
+@@ -594,7 +594,7 @@
+             {
+               try
+               {
+-                start_element (ns, name, 0);
++                this->start_element (ns, name, 0);
+               }
+               catch (const schema_exception<C>& e)
+               {
+@@ -621,7 +621,7 @@
+               {
+                 try
+                 {
+-                  start_element (ns, name, 0);
++                  this->start_element (ns, name, 0);
+                 }
+                 catch (const schema_exception<C>& e)
+                 {
+@@ -693,7 +693,7 @@
+                   }
+ 
+                   ro_string<C> ro_id (id);
+-                  start_element (ns, name, &ro_id);
++                  this->start_element (ns, name, &ro_id);
+                 }
+                 catch (const schema_exception<C>& e)
+                 {
+@@ -713,7 +713,7 @@
+ 
+             try
+             {
+-              attribute (ns, name, value);
++              this->attribute (ns, name, value);
+             }
+             catch (const schema_exception<C>& e)
+             {
+@@ -748,7 +748,7 @@
+ 
+           try
+           {
+-            end_element (ns, name);
++            this->end_element (ns, name);
+           }
+           catch (const schema_exception<C>& e)
+           {
+@@ -777,7 +777,7 @@
+ 
+             try
+             {
+-              characters (str);
++              this->characters (str);
+             }
+             catch (const schema_exception<C>& e)
+             {
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/parser.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx
+--- xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/parser.txx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/parser.txx	2012-06-03 11:02:09.000000000 +0200
+@@ -164,15 +164,15 @@
+           if (ns == xml::bits::xmlns_namespace<C> ())
+             return;
+ 
+-          if (!_attribute_impl (ns, name, value))
+-            _any_attribute (ns, name, value);
++          if (!this->_attribute_impl (ns, name, value))
++            this->_any_attribute (ns, name, value);
+         }
+ 
+         template <typename C>
+         void simple_content<C>::
+         _characters (const ro_string<C>& str)
+         {
+-          _characters_impl (str);
++          this->_characters_impl (str);
+         }
+ 
+ 
+@@ -190,15 +190,15 @@
+           if (s.depth_++ > 0)
+           {
+             if (s.any_)
+-              _start_any_element (ns, name, type);
++              this->_start_any_element (ns, name, type);
+             else if (s.parser_)
+               s.parser_->_start_element (ns, name, type);
+           }
+           else
+           {
+-            if (!_start_element_impl (ns, name, type))
++            if (!this->_start_element_impl (ns, name, type))
+             {
+-              _start_any_element (ns, name, type);
++              this->_start_any_element (ns, name, type);
+               s.any_ = true;
+             }
+             else if (s.parser_ != 0)
+@@ -235,7 +235,7 @@
+ 
+               this->_post_impl ();
+ 
+-              if (!_end_element_impl (ns, name))
++              if (!this->_end_element_impl (ns, name))
+                 assert (false);
+             }
+           }
+@@ -246,7 +246,7 @@
+             if (--s.depth_ > 0)
+             {
+               if (s.any_)
+-                _end_any_element (ns, name);
++                this->_end_any_element (ns, name);
+               else if (s.parser_)
+                 s.parser_->_end_element (ns, name);
+             }
+@@ -255,10 +255,10 @@
+               if (s.parser_ != 0 && !s.any_)
+                 s.parser_->_post_impl ();
+ 
+-              if (!_end_element_impl (ns, name))
++              if (!this->_end_element_impl (ns, name))
+               {
+                 s.any_ = false;
+-                _end_any_element (ns, name);
++                this->_end_any_element (ns, name);
+               }
+             }
+           }
+@@ -292,14 +292,14 @@
+           if (s.depth_ > 0)
+           {
+             if (s.any_)
+-              _any_attribute (ns, name, value);
++              this->_any_attribute (ns, name, value);
+             else if (s.parser_)
+               s.parser_->_attribute (ns, name, value);
+           }
+           else
+           {
+-            if (!_attribute_impl (ns, name, value))
+-              _any_attribute (ns, name, value);
++            if (!this->_attribute_impl (ns, name, value))
++              this->_any_attribute (ns, name, value);
+           }
+         }
+ 
+@@ -312,14 +312,14 @@
+           if (s.depth_ > 0)
+           {
+             if (s.any_)
+-              _any_characters (str);
++              this->_any_characters (str);
+             else if (s.parser_)
+               s.parser_->_characters (str);
+           }
+           else
+           {
+-            if (!_characters_impl (str))
+-              _any_characters (str);
++            if (!this->_characters_impl (str))
++              this->_any_characters (str);
+           }
+         }
+ 
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx
+--- xsd-3.3.0/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx	2012-06-03 11:02:09.000000000 +0200
+@@ -20,7 +20,7 @@
+                              const ro_string<C>& name,
+                              const ro_string<C>* type)
+         {
+-          _start_any_element (ns, name, type);
++          this->_start_any_element (ns, name, type);
+           this->complex_content<C>::context_.top ().any_ = true;
+           return true;
+         }
+@@ -30,7 +30,7 @@
+         _end_element_impl (const ro_string<C>& ns, const ro_string<C>& name)
+         {
+           this->complex_content<C>::context_.top ().any_ = false;
+-          _end_any_element (ns, name);
++          this->_end_any_element (ns, name);
+           return true;
+         }
+ 
+@@ -41,7 +41,7 @@
+                          const ro_string<C>& name,
+                          const ro_string<C>& value)
+         {
+-          _any_attribute (ns, name, value);
++          this->_any_attribute (ns, name, value);
+           return true;
+         }
+ 
+@@ -49,7 +49,7 @@
+         bool any_type_pskel<C>::
+         _characters_impl (const ro_string<C>& s)
+         {
+-          _any_characters (s);
++          this->_any_characters (s);
+           return true;
+         }
+ 
+@@ -60,7 +60,7 @@
+         bool any_simple_type_pskel<C>::
+         _characters_impl (const ro_string<C>& s)
+         {
+-          _any_characters (s);
++          this->_any_characters (s);
+           return true;
+         }
+       }
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/validating/parser.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/parser.txx
+--- xsd-3.3.0/libxsd/xsd/cxx/parser/validating/parser.txx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/parser.txx	2012-06-03 11:02:09.000000000 +0200
+@@ -93,8 +93,8 @@
+                         const ro_string<C>& name,
+                         const ro_string<C>* type)
+         {
+-          if (!_start_element_impl (ns, name, type))
+-            _unexpected_element (ns, name);
++          if (!this->_start_element_impl (ns, name, type))
++            this->_unexpected_element (ns, name);
+         }
+ 
+         template <typename C>
+@@ -102,8 +102,8 @@
+         _end_element (const ro_string<C>& ns,
+                       const ro_string<C>& name)
+         {
+-          if (!_end_element_impl (ns, name))
+-            _unexpected_element (ns, name);
++          if (!this->_end_element_impl (ns, name))
++            this->_unexpected_element (ns, name);
+         }
+ 
+         template <typename C>
+@@ -129,16 +129,16 @@
+           if (ns == xml::bits::xmlns_namespace<C> ())
+             return;
+ 
+-          if (!_attribute_impl (ns, name, value))
+-            _unexpected_attribute (ns, name, value);
++          if (!this->_attribute_impl (ns, name, value))
++            this->_unexpected_attribute (ns, name, value);
+         }
+ 
+         template <typename C>
+         void empty_content<C>::
+         _characters (const ro_string<C>& s)
+         {
+-          if (!_characters_impl (s))
+-            _unexpected_characters (s);
++          if (!this->_characters_impl (s))
++            this->_unexpected_characters (s);
+         }
+ 
+         //
+@@ -218,15 +218,15 @@
+           if (ns == xml::bits::xmlns_namespace<C> ())
+             return;
+ 
+-          if (!_attribute_impl (ns, name, value))
+-            _unexpected_attribute (ns, name, value);
++          if (!this->_attribute_impl (ns, name, value))
++            this->_unexpected_attribute (ns, name, value);
+         }
+ 
+         template <typename C>
+         void simple_content<C>::
+         _characters (const ro_string<C>& str)
+         {
+-          if (!_characters_impl (str))
++          if (!this->_characters_impl (str))
+           {
+             // Mixed content is implemented in the generated code
+             // by overriding _characters_impl and forwarding to
+@@ -245,7 +245,7 @@
+                   c != C (0x0D) && // carriage return
+                   c != C (0x09) && // tab
+                   c != C (0x0A))
+-                _unexpected_characters (str);
++                this->_unexpected_characters (str);
+             }
+           }
+         }
+@@ -322,14 +322,14 @@
+           if (s.depth_++ > 0)
+           {
+             if (s.any_)
+-              _start_any_element (ns, name, type);
++              this->_start_any_element (ns, name, type);
+             else if (s.parser_)
+               s.parser_->_start_element (ns, name, type);
+           }
+           else
+           {
+-            if (!_start_element_impl (ns, name, type))
+-              _unexpected_element (ns, name);
++            if (!this->_start_element_impl (ns, name, type))
++              this->_unexpected_element (ns, name);
+             else if (s.parser_ != 0)
+               s.parser_->_pre_impl ();
+           }
+@@ -364,7 +364,7 @@
+ 
+               this->_post_impl ();
+ 
+-              if (!_end_element_impl (ns, name))
++              if (!this->_end_element_impl (ns, name))
+                 assert (false);
+             }
+           }
+@@ -375,7 +375,7 @@
+             if (--s.depth_ > 0)
+             {
+               if (s.any_)
+-                _end_any_element (ns, name);
++                this->_end_any_element (ns, name);
+               else if (s.parser_)
+                 s.parser_->_end_element (ns, name);
+             }
+@@ -384,8 +384,8 @@
+               if (s.parser_ != 0 && !s.any_)
+                 s.parser_->_post_impl ();
+ 
+-              if (!_end_element_impl (ns, name))
+-                _unexpected_element (ns, name);
++              if (!this->_end_element_impl (ns, name))
++                this->_unexpected_element (ns, name);
+             }
+           }
+         }
+@@ -418,14 +418,14 @@
+           if (s.depth_ > 0)
+           {
+             if (s.any_)
+-              _any_attribute (ns, name, value);
++              this->_any_attribute (ns, name, value);
+             else if (s.parser_)
+               s.parser_->_attribute (ns, name, value);
+           }
+           else
+           {
+-            if (!_attribute_impl (ns, name, value))
+-              _unexpected_attribute (ns, name, value);
++            if (!this->_attribute_impl (ns, name, value))
++              this->_unexpected_attribute (ns, name, value);
+           }
+         }
+ 
+@@ -438,13 +438,13 @@
+           if (s.depth_ > 0)
+           {
+             if (s.any_)
+-              _any_characters (str);
++              this->_any_characters (str);
+             else if (s.parser_)
+               s.parser_->_characters (str);
+           }
+           else
+           {
+-            if (!_characters_impl (str))
++            if (!this->_characters_impl (str))
+             {
+               // Mixed content is implemented in the generated code
+               // by overriding _characters_impl and forwarding to
+@@ -463,7 +463,7 @@
+                     c != C (0x0D) && // carriage return
+                     c != C (0x09) && // tab
+                     c != C (0x0A))
+-                  _unexpected_characters (str);
++                  this->_unexpected_characters (str);
+               }
+             }
+           }
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx
+--- xsd-3.3.0/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx	2012-06-03 11:02:09.000000000 +0200
+@@ -20,7 +20,7 @@
+                              const ro_string<C>& name,
+                              const ro_string<C>* type)
+         {
+-          _start_any_element (ns, name, type);
++          this->_start_any_element (ns, name, type);
+           this->complex_content<C>::context_.top ().any_ = true;
+           return true;
+         }
+@@ -30,7 +30,7 @@
+         _end_element_impl (const ro_string<C>& ns, const ro_string<C>& name)
+         {
+           this->complex_content<C>::context_.top ().any_ = false;
+-          _end_any_element (ns, name);
++          this->_end_any_element (ns, name);
+           return true;
+         }
+ 
+@@ -41,7 +41,7 @@
+                                    const ro_string<C>& name,
+                                    const ro_string<C>& value)
+         {
+-          _any_attribute (ns, name, value);
++          this->_any_attribute (ns, name, value);
+           return true;
+         }
+ 
+@@ -49,7 +49,7 @@
+         bool any_type_pskel<C>::
+         _characters_impl (const ro_string<C>& s)
+         {
+-          _any_characters (s);
++          this->_any_characters (s);
+           return true;
+         }
+ 
+@@ -60,7 +60,7 @@
+         bool any_simple_type_pskel<C>::
+         _characters_impl (const ro_string<C>& s)
+         {
+-          _any_characters (s);
++          this->_any_characters (s);
+           return true;
+         }
+       }
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/tree/parsing.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/parsing.txx
+--- xsd-3.3.0/libxsd/xsd/cxx/tree/parsing.txx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/parsing.txx	2012-06-03 11:02:09.000000000 +0200
+@@ -299,7 +299,7 @@
+ 
+           if (j != basic_string<C>::npos)
+           {
+-            push_back (
++            this->push_back (
+               traits<T, C, ST>::create (
+                 basic_string<C> (data + i, j - i), parent, 0, 0));
+ 
+@@ -309,7 +309,7 @@
+           {
+             // Last element.
+             //
+-            push_back (
++            this->push_back (
+               traits<T, C, ST>::create (
+                 basic_string<C> (data + i, size - i), parent, 0, 0));
+ 
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/tree/stream-extraction.hxx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/stream-extraction.hxx
+--- xsd-3.3.0/libxsd/xsd/cxx/tree/stream-extraction.hxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/tree/stream-extraction.hxx	2012-06-03 11:03:11.000000000 +0200
+@@ -68,7 +68,7 @@
+           while (size--)
+           {
+             std::auto_ptr<T> p (new T (s, f, c));
+-            push_back (p);
++            this->push_back (p);
+           }
+         }
+       }
+@@ -91,7 +91,7 @@
+           {
+             T x;
+             s >> x;
+-            push_back (x);
++            this->push_back (x);
+           }
+         }
+       }
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/libxsd/xsd/cxx/zc-istream.txx xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/zc-istream.txx
+--- xsd-3.3.0/libxsd/xsd/cxx/zc-istream.txx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/libxsd/xsd/cxx/zc-istream.txx	2012-06-03 11:02:09.000000000 +0200
+@@ -32,7 +32,7 @@
+       C* b (const_cast<C*> (str_.data ()));
+       C* e (b + str_.size ());
+ 
+-      setg (b, b, e);
++      this->setg (b, b, e);
+     }
+ 
+     template <typename C>
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/elements.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/elements.cxx
+--- xsd-3.3.0/xsd/cxx/elements.cxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/xsd/cxx/elements.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -326,7 +326,11 @@
+         }
+         catch (SemanticGraph::InvalidPath const&)
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           pair = path.native_file_string ();
++#else
++          pair = path.string ();
++#endif
+         }
+       }
+ 
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/parser/elements.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/elements.cxx
+--- xsd-3.3.0/xsd/cxx/parser/elements.cxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/elements.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -244,7 +244,11 @@
+       }
+       catch (SemanticGraph::InvalidPath const&)
+       {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         path_str = path.native_file_string ();
++#else
++        path_str = path.string ();
++#endif
+       }
+ 
+       String inc_path;
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/parser/generator.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/generator.cxx
+--- xsd-3.3.0/xsd/cxx/parser/generator.cxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/xsd/cxx/parser/generator.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -552,7 +552,11 @@
+     {
+       try
+       {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         Path fs_path (path, boost::filesystem::native);
++#else
++        Path fs_path (path.c_str());
++#endif
+         ifs.open (fs_path, std::ios_base::in | std::ios_base::binary);
+ 
+         if (!ifs.is_open ())
+@@ -638,7 +642,11 @@
+       {
+         if (NarrowString name = ops.value<CLI::extern_xml_schema> ())
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           if (file_path.native_file_string () != name)
++#else
++          if (file_path.string () != name)
++#endif
+             generate_xml_schema = false;
+         }
+       }
+@@ -815,7 +823,11 @@
+ 
+       // Generate code.
+       //
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       NarrowString name (file_path.leaf ());
++#else
++      NarrowString name (file_path.filename().string());
++#endif
+       NarrowString skel_suffix (ops.value <CLI::skel_file_suffix> ());
+       NarrowString impl_suffix (ops.value <CLI::impl_file_suffix> ());
+ 
+@@ -921,9 +933,15 @@
+         cxx_driver_name = cxx_driver_expr.merge (name);
+       }
+ 
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       Path hxx_path (hxx_name, boost::filesystem::native);
+       Path ixx_path (ixx_name, boost::filesystem::native);
+       Path cxx_path (cxx_name, boost::filesystem::native);
++#else
++      Path hxx_path (hxx_name.c_str());
++      Path ixx_path (ixx_name.c_str());
++      Path cxx_path (cxx_name.c_str());
++#endif
+ 
+       Path hxx_impl_path;
+       Path cxx_impl_path;
+@@ -931,9 +949,15 @@
+ 
+       if (impl || driver)
+       {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         hxx_impl_path = Path (hxx_impl_name, boost::filesystem::native);
+         cxx_impl_path = Path (cxx_impl_name, boost::filesystem::native);
+         cxx_driver_path = Path (cxx_driver_name, boost::filesystem::native);
++#else
++        hxx_impl_path = Path (hxx_impl_name.c_str());
++        cxx_impl_path = Path (cxx_impl_name.c_str());
++        cxx_driver_path = Path (cxx_driver_name.c_str());
++#endif
+       }
+ 
+       Path out_dir;
+@@ -942,7 +966,11 @@
+       {
+         try
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           out_dir = Path (dir, boost::filesystem::native);
++#else
++          out_dir = Path (dir.c_str());
++#endif
+         }
+         catch (InvalidPath const&)
+         {
+@@ -1010,7 +1038,11 @@
+         }
+ 
+         unlinks.add (hxx_impl_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         file_list.push_back (hxx_impl_path.native_file_string ());
++#else
++        file_list.push_back (hxx_impl_path.string ());
++#endif
+ 
+         if (!ops.value<CLI::force_overwrite> ())
+         {
+@@ -1036,7 +1068,11 @@
+         }
+ 
+         unlinks.add (cxx_impl_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         file_list.push_back (cxx_impl_path.native_file_string ());
++#else
++        file_list.push_back (cxx_impl_path.string ());
++#endif
+       }
+ 
+       if (driver)
+@@ -1065,7 +1101,11 @@
+         }
+ 
+         unlinks.add (cxx_driver_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         file_list.push_back (cxx_driver_path.native_file_string ());
++#else
++        file_list.push_back (cxx_driver_path.string ());
++#endif
+       }
+ 
+       // Open the skel files.
+@@ -1081,7 +1121,11 @@
+       }
+ 
+       unlinks.add (hxx_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       file_list.push_back (hxx_path.native_file_string ());
++#else
++      file_list.push_back (hxx_path.string ());
++#endif
+ 
+       if (inline_)
+       {
+@@ -1094,7 +1138,11 @@
+         }
+ 
+         unlinks.add (ixx_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         file_list.push_back (ixx_path.native_file_string ());
++#else
++        file_list.push_back (ixx_path.string ());
++#endif
+       }
+ 
+ 
+@@ -1109,7 +1157,11 @@
+         }
+ 
+         unlinks.add (cxx_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         file_list.push_back (cxx_path.native_file_string ());
++#else
++        file_list.push_back (cxx_path.string ());
++#endif
+       }
+ 
+       // Print copyright and license.
+@@ -1168,7 +1220,11 @@
+       NarrowString guard_prefix (ops.value<CLI::guard_prefix> ());
+ 
+       if (!guard_prefix)
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         guard_prefix = file_path.branch_path ().native_directory_string ();
++#else
++        guard_prefix = file_path.branch_path ().string ();
++#endif
+ 
+       if (guard_prefix)
+         guard_prefix += '_';
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/tree/elements.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/elements.cxx
+--- xsd-3.3.0/xsd/cxx/tree/elements.cxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/elements.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -1312,7 +1312,11 @@
+       }
+       catch (SemanticGraph::InvalidPath const&)
+       {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         path_str = path.native_file_string ();
++#else
++        path_str = path.string ();
++#endif
+       }
+ 
+       String inc_path;
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/cxx/tree/generator.cxx xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/generator.cxx
+--- xsd-3.3.0/xsd/cxx/tree/generator.cxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/xsd/cxx/tree/generator.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -773,7 +773,11 @@
+     {
+       try
+       {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         Path fs_path (path, boost::filesystem::native);
++#else
++        Path fs_path (path.c_str());
++#endif
+         ifs.open (fs_path, std::ios_base::in | std::ios_base::binary);
+ 
+         if (!ifs.is_open ())
+@@ -939,7 +943,11 @@
+       {
+         if (NarrowString name = ops.value<CLI::extern_xml_schema> ())
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           if (file_path.native_file_string () != name)
++#else
++          if (file_path.string () != name)
++#endif
+             generate_xml_schema = false;
+         }
+       }
+@@ -954,7 +962,11 @@
+ 
+       // Generate code.
+       //
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       NarrowString name (file_path.leaf ());
++#else
++      NarrowString name (file_path.filename ().string());
++#endif
+ 
+       NarrowString hxx_suffix (ops.value <CLI::hxx_suffix> ());
+       NarrowString ixx_suffix (ops.value <CLI::ixx_suffix> ());
+@@ -1013,9 +1025,15 @@
+       NarrowString ixx_name (inline_ ? ixx_expr.merge (name) : NarrowString ());
+       NarrowString fwd_name (forward ? fwd_expr.merge (name) : NarrowString ());
+ 
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       Path hxx_path (hxx_name, boost::filesystem::native);
+       Path ixx_path (ixx_name, boost::filesystem::native);
+       Path fwd_path (fwd_name, boost::filesystem::native);
++#else
++      Path hxx_path (hxx_name.c_str());
++      Path ixx_path (ixx_name.c_str());
++      Path fwd_path (fwd_name.c_str());
++#endif
+       Paths cxx_paths;
+ 
+       if (source)
+@@ -1041,12 +1059,20 @@
+             }
+ 
+             cxx_paths.push_back (
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+               Path (cxx_expr.merge (part_name), boost::filesystem::native));
++#else
++              Path (cxx_expr.merge (part_name).c_str()));
++#endif
+           }
+         }
+         else
+           cxx_paths.push_back (
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+             Path (cxx_expr.merge (name), boost::filesystem::native));
++#else
++            Path (cxx_expr.merge (name).c_str()));
++#endif
+       }
+ 
+       Path out_dir;
+@@ -1055,7 +1081,11 @@
+       {
+         try
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           out_dir = Path (dir, boost::filesystem::native);
++#else
++          out_dir = Path (dir.c_str());
++#endif
+         }
+         catch (InvalidPath const&)
+         {
+@@ -1108,7 +1138,11 @@
+         }
+ 
+         unlinks.add (fwd_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         file_list.push_back (fwd_path.native_file_string ());
++#else
++        file_list.push_back (fwd_path.string ());
++#endif
+       }
+ 
+ 
+@@ -1121,7 +1155,11 @@
+       }
+ 
+       unlinks.add (hxx_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       file_list.push_back (hxx_path.native_file_string ());
++#else
++      file_list.push_back (hxx_path.string ());
++#endif
+ 
+ 
+       // IXX
+@@ -1137,7 +1175,11 @@
+         }
+ 
+         unlinks.add (ixx_path);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         file_list.push_back (ixx_path.native_file_string ());
++#else
++        file_list.push_back (ixx_path.string ());
++#endif
+       }
+ 
+ 
+@@ -1158,7 +1200,11 @@
+           }
+ 
+           unlinks.add (*i);
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           file_list.push_back (i->native_file_string ());
++#else
++          file_list.push_back (i->string ());
++#endif
+           cxx.push_back (s);
+         }
+       }
+@@ -1230,7 +1276,11 @@
+       NarrowString guard_prefix (ops.value<CLI::guard_prefix> ());
+ 
+       if (!guard_prefix)
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         guard_prefix = file_path.branch_path ().native_directory_string ();
++#else
++        guard_prefix = file_path.branch_path ().string ();
++#endif
+ 
+       if (guard_prefix)
+         guard_prefix += '_';
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/xsd.cxx xsd-3.3.0-2+dep/xsd/xsd/xsd.cxx
+--- xsd-3.3.0/xsd/xsd.cxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/xsd/xsd.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -636,7 +636,11 @@
+ 
+         try
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           tu = SemanticGraph::Path (args[i], boost::filesystem::native);
++#else
++          tu = SemanticGraph::Path (args[i]);
++#endif
+         }
+         catch (SemanticGraph::InvalidPath const&)
+         {
+@@ -675,7 +679,11 @@
+               if (NarrowString name =
+                   tree_ops->value<CXX::Tree::CLI::extern_xml_schema> ())
+               {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+                 if (tu.native_file_string () != name)
++#else
++                if (tu.string () != name)
++#endif
+                   gen_xml_schema = false;
+               }
+             }
+@@ -690,7 +698,11 @@
+               if (NarrowString name =
+                   parser_ops->value<CXX::Parser::CLI::extern_xml_schema> ())
+               {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+                 if (tu.native_file_string () != name)
++#else
++                if (tu.string () != name)
++#endif
+                   gen_xml_schema = false;
+               }
+             }
+@@ -827,8 +839,13 @@
+       {
+         try
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           paths.push_back (
+             SemanticGraph::Path (args[i], boost::filesystem::native));
++#else
++          paths.push_back (
++            SemanticGraph::Path (args[i]));
++#endif
+         }
+         catch (SemanticGraph::InvalidPath const&)
+         {
+@@ -991,9 +1008,17 @@
+       try
+       {
+         OutputFileStream ofs;
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         SemanticGraph::Path path (fl);
++#else
++        SemanticGraph::Path path (fl.c_str());
++#endif
+ 
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         ofs.open (fl, std::ios_base::out);
++#else
++        ofs.open (fl.c_str(), std::ios_base::out);
++#endif
+ 
+         if (!ofs.is_open ())
+         {
+diff -Naurb -I '^//' -I '^# copyright' -x vcproj -x build xsd-3.3.0/xsd/xsd.hxx xsd-3.3.0-2+dep/xsd/xsd/xsd.hxx
+--- xsd-3.3.0/xsd/xsd.hxx	2010-04-28 08:58:09.000000000 +0200
++++ xsd-3.3.0-2+dep/xsd/xsd/xsd.hxx	2012-06-03 11:02:29.000000000 +0200
+@@ -38,7 +38,11 @@
+   {
+     if (!canceled_)
+     {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       std::remove (file_.native_file_string ().c_str ());
++#else
++      std::remove (file_.string ().c_str ());
++#endif
+     }
+   }
+ 
diff --git a/dev-cpp/xsd/xsd-3.3.0.ebuild b/dev-cpp/xsd/xsd-3.3.0.ebuild
index 6a47d8db6d66..e0c5bf78b22b 100644
--- a/dev-cpp/xsd/xsd-3.3.0.ebuild
+++ b/dev-cpp/xsd/xsd-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/xsd/xsd-3.3.0.ebuild,v 1.3 2012/06/01 20:52:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/xsd/xsd-3.3.0.ebuild,v 1.4 2012/08/23 13:40:52 dev-zero Exp $
 
 EAPI="2"
 
@@ -30,7 +30,8 @@ src_prepare() {
 		"${FILESDIR}/${PV}-disable_examples_and_tests.patch" \
 		"${FILESDIR}/${PV}-xsdcxx-rename.patch" \
 		"${FILESDIR}/${PV}-fix_include.patch" \
-		"${FILESDIR}/${PV}-fix_tests.patch"
+		"${FILESDIR}/${PV}-fix_tests.patch" \
+		"${FILESDIR}/${PV}-boost-filesystem-v2-deprecation.patch"
 }
 
 use_yesno() {
@@ -65,7 +66,7 @@ cxx_id       := gnu
 cxx_optimize := n
 cxx_debug    := n
 cxx_rpath    := n
-cxx_pp_extra_options := -DBOOST_FILESYSTEM_VERSION=2
+cxx_pp_extra_options :=
 cxx_extra_options    := ${CXXFLAGS} -I${BOOST_INC}
 cxx_ld_extra_options := ${LDFLAGS}
 cxx_extra_libs       :=