4 files changed, 24 insertions, 18 deletions
diff --git a/Library/Formula/libpst.rb b/Library/Formula/libpst.rb
index d68a0e3b7..9d47903ff 100644
--- a/Library/Formula/libpst.rb
+++ b/Library/Formula/libpst.rb
@@ -4,6 +4,7 @@ class Libpst < Formula
   homepage 'http://www.five-ten-sg.com/libpst/'
   url 'http://www.five-ten-sg.com/libpst/packages/libpst-0.6.55.tar.gz'
   sha1 'c81df95509494c99222b0b603f7500dd9caceff1'
+  revision 1
 
   bottle do
     cellar :any
@@ -17,12 +18,8 @@ class Libpst < Formula
 
   depends_on :python => :optional
   depends_on 'gd' if build.include? 'pst2dii'
-
-  if build.with? "python"
-    depends_on "boost" => "with-python"
-  else
-    depends_on "boost"
-  end
+  depends_on "boost"
+  depends_on "boost-python" if build.with? "python"
 
   def install
     args = %W[
diff --git a/Library/Formula/libtorrent-rasterbar.rb b/Library/Formula/libtorrent-rasterbar.rb
index 1483d9874..6e356a9e1 100644
--- a/Library/Formula/libtorrent-rasterbar.rb
+++ b/Library/Formula/libtorrent-rasterbar.rb
@@ -4,6 +4,7 @@ class LibtorrentRasterbar < Formula
   homepage "http://www.rasterbar.com/products/libtorrent/"
   url "https://downloads.sourceforge.net/project/libtorrent/libtorrent/libtorrent-rasterbar-1.0.2.tar.gz"
   sha1 "bfb161825306abbd5c03775e75f5e094ee757a9a"
+  revision 1
 
   head do
     url "https://libtorrent.googlecode.com/svn/trunk"
@@ -23,12 +24,8 @@ class LibtorrentRasterbar < Formula
   depends_on "openssl"
   depends_on :python => :optional
   depends_on "geoip" => :optional
-
-  if build.with? "python"
-    depends_on "boost" => "with-python"
-  else
-    depends_on "boost"
-  end
+  depends_on "boost"
+  depends_on "boost-python" if build.with? "python"
 
   def install
     boost = Formula["boost"]
diff --git a/Library/Formula/mapnik.rb b/Library/Formula/mapnik.rb
index 57260e9e1..db33f4fa4 100644
--- a/Library/Formula/mapnik.rb
+++ b/Library/Formula/mapnik.rb
@@ -5,7 +5,7 @@ class Mapnik < Formula
   head "https://github.com/mapnik/mapnik.git"
   url "http://mapnik.s3.amazonaws.com/dist/v2.2.0/mapnik-v2.2.0.tar.bz2"
   sha1 "e493ad87ca83471374a3b080f760df4b25f7060d"
-  revision 2
+  revision 3
 
   bottle do
     sha1 "dc73959a75ce5dd11e7b03e50b5215179650b768" => :mavericks
@@ -13,9 +13,18 @@ class Mapnik < Formula
     sha1 "882cce36e29cea17f3cdb40805e9c7245a747f98" => :lion
   end
 
-  # can be removed at Mapnik > 2.2.0
-  # https://github.com/mapnik/mapnik/issues/1973
-  patch :DATA
+  stable do
+    # can be removed at Mapnik > 2.2.0
+    # https://github.com/mapnik/mapnik/issues/1973
+    patch :DATA
+
+    # boost 1.56 compatibility
+    # concatenated from https://github.com/mapnik/mapnik/issues/2428
+    patch do
+      url "https://gist.githubusercontent.com/tdsmith/22aeb0bfb9691de91463/raw/3064c193466a041d82e011dc5601312ccadc9e15/mapnik-boost-megadiff.diff"
+      sha1 "63939ad5e197c83f7fe09e321484248dfd96d0f3"
+    end
+  end
 
   depends_on "pkg-config" => :build
   depends_on "freetype"
@@ -24,7 +33,8 @@ class Mapnik < Formula
   depends_on "proj"
   depends_on "icu4c"
   depends_on "jpeg"
-  depends_on "boost" => "with-python"
+  depends_on "boost"
+  depends_on "boost-python"
   depends_on "gdal" => :optional
   depends_on "postgresql" => :optional
   depends_on "cairo" => :optional
diff --git a/Library/Formula/pyexiv2.rb b/Library/Formula/pyexiv2.rb
index 4d9426f7c..ff63a74c8 100644
--- a/Library/Formula/pyexiv2.rb
+++ b/Library/Formula/pyexiv2.rb
@@ -4,10 +4,12 @@ class Pyexiv2 < Formula
   homepage "http://tilloy.net/dev/pyexiv2/"
   url "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/pyexiv2-0.3.2.tar.bz2"
   sha1 "ad20ea6925571d58637830569076aba327ff56d9"
+  revision 1
 
   depends_on "scons" => :build
   depends_on "exiv2"
-  depends_on "boost" => "with-python"
+  depends_on "boost"
+  depends_on "boost-python"
 
   # Patch to use Framework Python
   patch :DATA