diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index 080dce9db3a8d..47c0b3f30029c 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<maintainer>
-<email>ikelos@gentoo.org</email>
-<name>Mike Auty</name>
-</maintainer>
-<longdescription lang="en">
+	<herd>netmon</herd>
+	<maintainer>
+		<email>ikelos@gentoo.org</email>
+		<name>Mike Auty</name>
+	</maintainer>
+	<longdescription lang="en">
 Scapy is a powerful interactive packet manipulation program.
 </longdescription>
-<use>
-<flag name='pyx'>Enable <pkg>dev-python/pyx</pkg> support for psdump/pdfdump commands</flag>
-<flag name='visual'>Enable <pkg>dev-python/visual</pkg> support for 3d graphs</flag>
-<flag name='tcpreplay'>Enable <pkg>net-analyzer/tcpreply</pkg> support for fast packet replay</flag>
-</use>
+	<use>
+		<flag name="pyx">Enable <pkg>dev-python/pyx</pkg> support for psdump/pdfdump commands</flag>
+		<flag name="visual">Enable <pkg>dev-python/visual</pkg> support for 3d graphs</flag>
+		<flag name="tcpreplay">Enable <pkg>net-analyzer/tcpreply</pkg> support for fast packet replay</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild b/net-analyzer/scapy/scapy-2.2.0-r2.ebuild
index 36156a63cfc0c..88074250ba0f1 100644
--- a/net-analyzer/scapy/scapy-2.2.0-r2.ebuild
+++ b/net-analyzer/scapy/scapy-2.2.0-r2.ebuild
@@ -5,7 +5,6 @@
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=true
 
 inherit eutils distutils-r1
 
diff --git a/net-analyzer/scapy/scapy-2.3.0.ebuild b/net-analyzer/scapy/scapy-2.3.0.ebuild
index 8230665fdc718..d9bc94f6704ba 100644
--- a/net-analyzer/scapy/scapy-2.3.0.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=true
 
 inherit eutils distutils-r1
 
diff --git a/net-analyzer/scapy/scapy-2.3.1.ebuild b/net-analyzer/scapy/scapy-2.3.1.ebuild
index 8230665fdc718..d9bc94f6704ba 100644
--- a/net-analyzer/scapy/scapy-2.3.1.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=true
 
 inherit eutils distutils-r1