--- dev-libs/boost/boost-1.35.0-r1.ebuild	2008-08-15 19:28:57.000000000 +0200
+++ dev-libs/boost/boost-1.36.0.ebuild	2008-08-19 12:54:10.000000000 +0200
@@ -7,12 +7,10 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-2"
 
 DESCRIPTION="Boost Libraries for C++"
 HOMEPAGE="http://www.boost.org/"
-SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2
-	mirror://gentoo/boost-patches-${PATCHSET_VERSION}.tbz2"
+SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
 LICENSE="freedist Boost-1.0"
 SLOT="0"
 IUSE="debug doc expat icu mpi tools"
@@ -23,7 +21,7 @@
 	sys-libs/zlib
 	virtual/python"
 DEPEND="${RDEPEND}
-	>=dev-util/boost-build-${PV}-r1"
+	>=dev-util/boost-build-${PV}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -53,9 +51,9 @@
 
 	cd "${S}"
 
-	EPATCH_SOURCE="${WORKDIR}/patches"
-	EPATCH_SUFFIX="patch"
-	epatch
+	epatch "${FILESDIR}/${PF}-fix_mpi_installation.patch"
+	epatch "${FILESDIR}/${PF}-tools-build-fix.patch"
+	epatch "${FILESDIR}/${PF}-restore-deprecated-basic_directory_entry-names.patch"
 
 	# This enables building the boost.random library with /dev/urandom support
 	if ! use userland_Darwin ; then