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

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

5 files changed, 292 insertions, 12 deletions

diff --git a/dev-cpp/libxsd-frontend/ChangeLog b/dev-cpp/libxsd-frontend/ChangeLog
index d7e8b8c5c904..36bf5175e86c 100644
--- a/dev-cpp/libxsd-frontend/ChangeLog
+++ b/dev-cpp/libxsd-frontend/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/libxsd-frontend
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxsd-frontend/ChangeLog,v 1.3 2012/06/01 20:50:58 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxsd-frontend/ChangeLog,v 1.4 2012/08/23 13:19:38 dev-zero Exp $
+
+  23 Aug 2012; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.17.0-boost-filesystem-v2-deprecation.patch,
+  libxsd-frontend-1.17.0.ebuild, libxsd-frontend-1.18.0.ebuild:
+  Fix compatibility with boost >=1.49.0 (filesystem v2 gone), bug #424761.
 
 *libxsd-frontend-1.18.0 (01 Jun 2012)
 
@@ -19,4 +24,3 @@
   +libxsd-frontend-1.17.0.ebuild, +metadata.xml:
   Initial commit (ebuild written by me), needed for xsd and the required
   libraries.
-
diff --git a/dev-cpp/libxsd-frontend/Manifest b/dev-cpp/libxsd-frontend/Manifest
index a03ab8358fa3..509ed29a8a71 100644
--- a/dev-cpp/libxsd-frontend/Manifest
+++ b/dev-cpp/libxsd-frontend/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.17.0-boost-filesystem-v2-deprecation.patch 8926 SHA256 91ef71f823276c84339d5a224c07709acc05208a708ac2b80826a6251e1893e2 SHA512 e14f0d9f14fc0f562e69c22125c23ddc2e51dbdcb49c9d28360dc3d82e1c20e817d673f362f9ce2d431fda05c2eb5f77f37b4c0d6d7e12299c597eb98ee23255 WHIRLPOOL 8f268b931411a32099a2d5f05d5f474ead0dcc64b5d3ce28581d442b371c78665acc74481e2fe1108818177f56729d123c057ea967b32d48851d65ae33d7e8ce
 DIST libxsd-frontend-1.17.0.tar.bz2 66441 SHA256 a4ba879e1cca5d67226c9e004db7cfd305f8fcc1b8cea7f969b30d016b54a9b8 SHA512 49c07365306f05535aeec9ae3268e4fff435f274af34ca57f855136f8ac144521f17f7c3e4f066ea830c46809b0da71ed8b010093f2019deb8790be4419122d2 WHIRLPOOL 170f4134edb38132c9aa99f9fa451413480f4713b4342cc4dae9cbb24b5962186295c727249b217e98365b0b6c46c50aa805146ad55714a8a991e7934a37f146
 DIST libxsd-frontend-1.18.0.tar.bz2 66937 SHA256 78382d44ae0575fec04eb2e2e70c2bb751b49eb995aad725d3c2e9ee8ac98590 SHA512 fdff24659037d99ca37a15c2bc33a91e9864d2df20210c13230ab64c3c5ecd7aebefe5c7b3b316812d8f844ca38c297931d74d19a278bf986de80e2f0c54d223 WHIRLPOOL 94f092087f17b0694821ab1f7864fa80639c7daf73e6926d665365d624f46d69d1f74e0de4af901a399593bf52020311614c000d94160505a429728f0d3e2818
-EBUILD libxsd-frontend-1.17.0.ebuild 2588 SHA256 ec7b1e55d4730005252e8aa620a5ee47e97ceaa0ce3fe86c84579ace737cd992 SHA512 5f63d4bf02b7b77a105c159fbbe32acbb5ad0cdb17a4245e3419ad39d00e49f7133050d9fcf1aac9a0702cff04f94aee6315b610e43b4954dc6fa0db657808c8 WHIRLPOOL 6ff6d1908f06cf1307de7894d5c60538423686cf03fd82b640ca9b2da3267f121c2352d60593c584c17404a0c894f43fb333240b5ff5cdd0e0aef39d10c62d8e
-EBUILD libxsd-frontend-1.18.0.ebuild 2545 SHA256 22d3b1545cb0aa4f80c14df4b7d43a55a02077ed59c6ef972789fb264083e4fe SHA512 95d16c906081650330eea45b508fc2e1aaef55ddb80b01f650ddf2b32df2d2baaea95a45234482663388acfcaa13b6f09142b56d8c3594166385d00ebe1a49ce WHIRLPOOL f7304a86d833593413d3de7f6491f93b09ecb03201c5e62cd9492e3e4c104a783e35a70acde2236c822a1c06a5f6126efa7272372dd68d3f19e968c25cde9966
-MISC ChangeLog 847 SHA256 071cbd13e75b9b9ccb5e2cd7ebdda4da246206fe1c912f23bd702dc3c5ea976c SHA512 0f0a01a7fe0bf87048c96b13f3bc7eb1bee8b850ae7721ed476c33ead12f7b561ec8f511b1e478f9281641eb3dc9a13d4b16aea47e175639cb786aa75b49d5c7 WHIRLPOOL 3f7a55b88ab94532f32acdcea4f46117e9d1afed921425b1f2dd2ca098a9837c0abc6ced8761c7030b94743ac3849dd66d89a1a6678b901f6bee111e32de93ce
+EBUILD libxsd-frontend-1.17.0.ebuild 2605 SHA256 9b4b909f99f7d087ef5c1725d0dfa91fcfbc73262cf1b10c503eb26791a7aedb SHA512 979b49cb5345e74d3ec681717ea435ac76d7ad0cfab35ada355501dd45e30df4eaa7f1b84c581f28de09ee3f3db10807a001a2622906750af576b3bf121ae13d WHIRLPOOL ec78be6d548c0f082b3817da867452446109a92260d57b7f775b0391ea1eb8d303ffe1c1b21a9235b2b22ec9696536e6f4d199e6ab6300cbb3aa8c630dafb1a0
+EBUILD libxsd-frontend-1.18.0.ebuild 2609 SHA256 0bae9d39f3c76c903d1267a8218e90d9e96e4f8a0e1cf922819e287832424f88 SHA512 04e561b0865fefdf3236dd74cfd33b6eea693df28c3d7bfe7750757b58bf1dcdd284dbd3048804f76dc46787e0e2bf3d913d86ccb15ce804ac8d6cb44f2ed14a WHIRLPOOL 80734c9b6dbae7f02bd68c46f0c4f346e01f0b489a1302d6a8ddf23a89270347206177e0028e93393feac36c025e2df8eb04224ddf53f38cfef9f9b8fd0b31bd
+MISC ChangeLog 1094 SHA256 8f6e34dea7d35c9724fd54f7528e14d32c50c129d5532b9fcdeaca411cb1ca96 SHA512 df12bc6b61a45e5fb85549e2925c9714aa6f85083650f9d3ae2210687c17d35ed02c91c4d9491feeb5886080cd9ae2e277251638604a0651491151f092f4a19a WHIRLPOOL 7ea6c63054b193b899b40bafaaee0e5fa0c830bf7fda32a63131ab8969e3695fd3f257c31a7a238a98c0c721a2cf20ed37338ce5da40826207d4399b222a7439
 MISC metadata.xml 242 SHA256 94e76679af5ab7f70d6e580c503ecf19d9955e64e073c0b8cd5c08a8a18930a7 SHA512 f7c65e5ca66432e009b369e2b41ba92f9a972647997e59a8c66e298befe9a117234fb520b1de6897b86ca91693682e73f3e0128bf99cba7cbf9c47ad599b1e48 WHIRLPOOL 919de9e8264f8a10d1375e1d23ed787f05d09664df4aef52b934623bf7ce71ac0eaa69e841fcf38b90cd18cb0d3f91502e5878d304641598dab0ad633b2b7c02
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlA2LfMACgkQGwVqY66cHjDZFQCfedJDIgF3biXWU7QdSlunbjaj
+o0EAnRR0VQRONEMbXz0KXhx0LhnSnp92
+=MQU8
+-----END PGP SIGNATURE-----
diff --git a/dev-cpp/libxsd-frontend/files/1.17.0-boost-filesystem-v2-deprecation.patch b/dev-cpp/libxsd-frontend/files/1.17.0-boost-filesystem-v2-deprecation.patch
new file mode 100644
index 000000000000..cd575a6ccdca
--- /dev/null
+++ b/dev-cpp/libxsd-frontend/files/1.17.0-boost-filesystem-v2-deprecation.patch
@@ -0,0 +1,261 @@
+diff -Naurb -I '^//' -I '^# copyright' -x build libxsd-frontend-1.17.0/tests/dump/driver.cxx xsd-3.3.0-2+dep/libxsd-frontend/tests/dump/driver.cxx
+--- libxsd-frontend-1.17.0/tests/dump/driver.cxx	2010-04-27 21:31:24.000000000 +0200
++++ xsd-3.3.0-2+dep/libxsd-frontend/tests/dump/driver.cxx	2012-08-23 11:30:16.074750804 +0200
+@@ -586,7 +586,11 @@
+ 
+     // Parse schema.
+     //
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+     SemanticGraph::Path path (argv[i], boost::filesystem::native);
++#else
++    SemanticGraph::Path path (argv[i]);
++#endif
+ 
+     Parser parser (true, false, true);
+     Evptr<SemanticGraph::Schema> tu (parser.parse (path));
+diff -Naurb -I '^//' -I '^# copyright' -x build libxsd-frontend-1.17.0/xsd-frontend/parser.cxx xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/parser.cxx
+--- libxsd-frontend-1.17.0/xsd-frontend/parser.cxx	2010-04-27 21:31:24.000000000 +0200
++++ xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/parser.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -1274,7 +1274,11 @@
+     operator () (SemanticGraph::Path const& x,
+                  SemanticGraph::Path const& y) const
+     {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         return x.native_file_string () < y.native_file_string ();
++#else
++        return x.string () < y.string ();
++#endif
+     }
+   };
+ 
+@@ -1627,9 +1631,15 @@
+       friend Boolean
+       operator< (SchemaId const& x, SchemaId const& y)
+       {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         return x.path_.native_file_string () < y.path_.native_file_string ()
+           || (x.path_.native_file_string () == y.path_.native_file_string ()
+               && x.ns_ < y.ns_);
++#else
++        return x.path_.string () < y.path_.string ()
++          || (x.path_.string () == y.path_.string ()
++              && x.ns_ < y.ns_);
++#endif
+       }
+ 
+     private:
+@@ -2376,6 +2386,7 @@
+     Path path, rel_path, abs_path;
+     try
+     {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       try
+       {
+         path = Path (loc);
+@@ -2386,6 +2397,10 @@
+         //
+         path = Path (loc, boost::filesystem::native);
+       }
++#else
++      // The new ABI does not have a fallback native representation
++      path = Path (loc.c_str());
++#endif
+ 
+       if (path.is_complete ())
+       {
+@@ -2479,6 +2494,7 @@
+     Path path, rel_path, abs_path;
+     try
+     {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       try
+       {
+         path = Path (loc);
+@@ -2489,6 +2505,10 @@
+         //
+         path = Path (loc, boost::filesystem::native);
+       }
++#else
++      // The new API does not have a fallback native representation.
++      path = Path (loc.c_str());
++#endif
+ 
+       if (path.is_complete ())
+       {
+@@ -4674,9 +4694,14 @@
+         return true;
+ 
+ 
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       XSDFrontend::SemanticGraph::Path abs_path (
+         XML::transcode_to_narrow (e.getLocation ()->getURI ()),
+         boost::filesystem::native);
++#else
++      XSDFrontend::SemanticGraph::Path abs_path (
++        XML::transcode_to_narrow (e.getLocation ()->getURI ()).c_str());
++#endif
+ 
+       XSDFrontend::SemanticGraph::Path rel_path (ctx_.file (abs_path));
+ 
+@@ -4729,8 +4754,12 @@
+           base_ (base),
+           ctx_ (ctx)
+     {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       setSystemId (XML::XMLChString (
+                      String (abs_.native_file_string ())).c_str ());
++#else
++      setSystemId (XML::XMLChString (String (abs_.string ())).c_str ());
++#endif
+     }
+ 
+     virtual Xerces::BinInputStream*
+@@ -4803,8 +4832,12 @@
+ 
+       // base_uri should be a valid path by now.
+       //
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+       Path base (XML::transcode_to_narrow (base_uri),
+                  boost::filesystem::native);
++#else
++      Path base (XML::transcode_to_narrow (base_uri).c_str());
++#endif
+ 
+       if (prv_id == 0)
+       {
+@@ -4830,6 +4863,7 @@
+       {
+         Path path;
+ 
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         try
+         {
+           path = Path (path_str);
+@@ -4840,6 +4874,10 @@
+           //
+           path = Path (path_str, boost::filesystem::native);
+         }
++#else
++      // The new ABI does not have a fallback native representation
++      path = Path (path_str.c_str());
++#endif
+ 
+         Path base_dir (base.branch_path ());
+ 
+diff -Naurb -I '^//' -I '^# copyright' -x build libxsd-frontend-1.17.0/xsd-frontend/semantic-graph/elements.cxx xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx
+--- libxsd-frontend-1.17.0/xsd-frontend/semantic-graph/elements.cxx	2010-04-27 21:31:24.000000000 +0200
++++ xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -342,5 +342,9 @@
+ std::wostream&
+ operator<< (std::wostream& os, XSDFrontend::SemanticGraph::Path const& path)
+ {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+   return os << path.native_file_string ().c_str ();
++#else
++  return os << path.string ().c_str ();
++#endif
+ }
+diff -Naurb -I '^//' -I '^# copyright' -x build libxsd-frontend-1.17.0/xsd-frontend/transformations/anonymous.cxx xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/transformations/anonymous.cxx
+--- libxsd-frontend-1.17.0/xsd-frontend/transformations/anonymous.cxx	2010-04-27 21:31:24.000000000 +0200
++++ xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/transformations/anonymous.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -275,7 +275,11 @@
+             }
+             catch (SemanticGraph::InvalidPath const&)
+             {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+               file_str = file.native_file_string ();
++#else
++              file_str = file.string ();
++#endif
+             }
+ 
+             String name (
+@@ -358,7 +362,11 @@
+                 }
+                 catch (SemanticGraph::InvalidPath const&)
+                 {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+                   file_str = file.native_file_string ();
++#else
++                  file_str = file.string ();
++#endif
+                 }
+               }
+ 
+@@ -441,7 +449,11 @@
+             }
+             catch (SemanticGraph::InvalidPath const&)
+             {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+               file_str = file.native_file_string ();
++#else
++              file_str = file.string ();
++#endif
+             }
+ 
+             String name (
+@@ -639,7 +651,11 @@
+         }
+         catch (SemanticGraph::InvalidPath const&)
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           file_str = file.native_file_string ();
++#else
++          file_str = file.string ();
++#endif
+         }
+ 
+         String name (
+diff -Naurb -I '^//' -I '^# copyright' -x build libxsd-frontend-1.17.0/xsd-frontend/transformations/schema-per-type.cxx xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/transformations/schema-per-type.cxx
+--- libxsd-frontend-1.17.0/xsd-frontend/transformations/schema-per-type.cxx	2010-04-27 21:31:24.000000000 +0200
++++ xsd-3.3.0-2+dep/libxsd-frontend/xsd-frontend/transformations/schema-per-type.cxx	2012-06-03 11:02:29.000000000 +0200
+@@ -167,7 +167,11 @@
+ 
+             try
+             {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+               path = Path (file_name);
++#else
++              path = Path (file_name.c_str());
++#endif
+             }
+             catch (InvalidPath const&)
+             {
+@@ -349,6 +353,7 @@
+         //
+         NarrowString abs_path;
+ 
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         // Try to use the portable representation of the path. If that
+         // fails, fall back to the native representation.
+         //
+@@ -360,9 +365,17 @@
+         {
+           abs_path = path.native_file_string ();
+         }
++#else
++        // The new ABI does not have a fallback native representation
++        abs_path = path.string ();
++#endif
+ 
+         NarrowString tf (trans_.translate_schema (abs_path));
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+         NarrowString file (tf ? tf : path.leaf ());
++#else
++        NarrowString file (tf ? tf : path.filename ().string());
++#endif
+ 
+         Size p (file.rfind ('.'));
+         NarrowString ext (
+@@ -389,7 +402,11 @@
+ 
+         try
+         {
++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
+           (*i)->context ().set ("renamed", SemanticGraph::Path (new_name));
++#else
++          (*i)->context ().set ("renamed", SemanticGraph::Path (new_name.c_str()));
++#endif
+         }
+         catch (SemanticGraph::InvalidPath const&)
+         {
diff --git a/dev-cpp/libxsd-frontend/libxsd-frontend-1.17.0.ebuild b/dev-cpp/libxsd-frontend/libxsd-frontend-1.17.0.ebuild
index dd59114a77f1..981b956f0f56 100644
--- a/dev-cpp/libxsd-frontend/libxsd-frontend-1.17.0.ebuild
+++ b/dev-cpp/libxsd-frontend/libxsd-frontend-1.17.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxsd-frontend/libxsd-frontend-1.17.0.ebuild,v 1.2 2011/08/04 10:25:18 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxsd-frontend/libxsd-frontend-1.17.0.ebuild,v 1.3 2012/08/23 13:19:38 dev-zero Exp $
 
 EAPI="2"
 
-inherit flag-o-matic toolchain-funcs versionator
+inherit eutils toolchain-funcs versionator
 
 DESCRIPTION="A compiler frontend for the W3C XML Schema definition language."
 HOMEPAGE="http://www.codesynthesis.com/projects/libxsd-frontend/"
@@ -22,7 +22,7 @@ DEPEND="${RDEPEND}
 	dev-util/build:0.3"
 
 src_prepare() {
-	append-flags -DBOOST_FILESYSTEM_VERSION=2
+	epatch "${FILESDIR}/${PV}-boost-filesystem-v2-deprecation.patch"
 }
 
 src_configure() {
diff --git a/dev-cpp/libxsd-frontend/libxsd-frontend-1.18.0.ebuild b/dev-cpp/libxsd-frontend/libxsd-frontend-1.18.0.ebuild
index bdb3c0209083..41e7965fa714 100644
--- a/dev-cpp/libxsd-frontend/libxsd-frontend-1.18.0.ebuild
+++ b/dev-cpp/libxsd-frontend/libxsd-frontend-1.18.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxsd-frontend/libxsd-frontend-1.18.0.ebuild,v 1.1 2012/06/01 20:50:58 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libxsd-frontend/libxsd-frontend-1.18.0.ebuild,v 1.2 2012/08/23 13:19:38 dev-zero Exp $
 
 EAPI="4"
 
-inherit toolchain-funcs versionator
+inherit eutils toolchain-funcs versionator
 
 DESCRIPTION="A compiler frontend for the W3C XML Schema definition language."
 HOMEPAGE="http://www.codesynthesis.com/projects/libxsd-frontend/"
@@ -21,6 +21,10 @@ RDEPEND=">=dev-libs/xerces-c-3
 DEPEND="${RDEPEND}
 	dev-util/build:0.3"
 
+src_prepare() {
+	epatch "${FILESDIR}/1.17.0-boost-filesystem-v2-deprecation.patch"
+}
+
 src_configure() {
 	BOOST_PKG="$(best_version ">=dev-libs/boost-1.35.0-r5")"
 	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
@@ -36,7 +40,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       :=