--- boost-1.39.0.ebuild
+++ boost-1.40.0.ebuild
@@ -9,13 +9,11 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 MY_P=${PN}_$(replace_all_version_separators _)
-PATCHSET_VERSION="${PV}-1"
 
 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
-	http://www.gentoo.org/~dev-zero/distfiles/boost-patches-${PATCHSET_VERSION}.tbz2"
+SRC_URI="mirror://sourceforge/boost/${MY_P}.tar.bz2"
+
 LICENSE="freedist Boost-1.0"
 SLOT="$(get_version_component_range 1-2)"
 IUSE="debug doc +eselect expat icu mpi python tools"
@@ -78,12 +76,8 @@
 }
 
 src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/patches"
-	EPATCH_SUFFIX="patch"
-	epatch
-
 	epatch \
-		"${FILESDIR}/remove_toolset_from_targetname.patch"
+		"${FILESDIR}/${PN}-1.40.0-remove_toolset_from_targetname.patch"
 
 	# This enables building the boost.random library with /dev/urandom support
 	if [[ -e /dev/urandom ]] ; then
@@ -112,7 +106,7 @@
 	fi
 
 	# Huge number of strict-aliasing warnings cause a build failure w/ >= GCC 4.4 bug #252287
-	[[ $(gcc-version) > 4.3 ]] && append-flags -Wno-strict-aliasing
+	[[ $(gcc-version) > 4.3 ]] && append-flags -fno-strict-aliasing
 
 	use mpi && mpi="using mpi ;"
 
--- files/boost-1.40.0-remove_toolset_from_targetname.patch
+++ files/boost-1.40.0-remove_toolset_from_targetname.patch
@@ -0,0 +1,11 @@
+--- Jamroot
++++ Jamroot
+@@ -352,7 +352,7 @@
+         if $(layout) = versioned
+         {
+             result = [ common.format-name
+-                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
++                <base> <threading> <runtime> -$(BOOST_VERSION_TAG)
+                 -$(BUILD_ID)
+                 : $(name) : $(type) : $(property-set) ] ;
+         }