diff --git a/dev-db/sqlmap/Manifest b/dev-db/sqlmap/Manifest
index 0158367ef..cc65a9c60 100644
--- a/dev-db/sqlmap/Manifest
+++ b/dev-db/sqlmap/Manifest
@@ -1,5 +1,2 @@
-DIST sqlmap-0.9.tar.gz 6216924 SHA256 9c76666d0555620329d949aca87571825adb8fcda9cd564e6410e1d2b6228c55 SHA512 dd942bac5bbd8f979c431de63ce91155fb789b4a3cab0c3c86f16417e9aeff757c5dd57f98b4a4a0622e344351d57563f8e159ce1b51d763ea230f9301ff0a3d WHIRLPOOL 44822d35e0113d6caba8838c00d84a5879c500cc286f2e025198b66f9ad1ada195dfccf09630213e1b500acda9fe71d194baf5ab2d4f97ecd6a68c6e2454dacd
-EBUILD sqlmap-0.9-r3.ebuild 1714 SHA256 40306836a6b274aa68d0e1cb6eb3649ce7ff9649b77c806fe2b737c9a97507de SHA512 5b45a7f1f5185c3ecd6c0cae64a2c64d9bb8005a614ed6c598513d0dd401343f535a10244ed3d710fbd51913e257b1682ad53af4bb0b2ec592f7a0f5e8883f8c WHIRLPOOL 11adf3f1ab410c4e45c4320841e8c0e45bd924d253cd4bb3f4e981520d896b8cb03c49b029addff0ff73f231dd46d1e2e374a16217502fa9ec85dde1eecad667
-EBUILD sqlmap-0.9_p20131028.ebuild 1597 SHA256 e2cae3d7661d16702b8c240e8d507753e4fb6747081f497eecfa9a50c9c638d7 SHA512 d977cf48f7a2dbfda5e3d5095e93a69c3b3eaf24ebca7bef161334b4398c38607dc0b9c09446a32b31894e5d6ff03df16634e716d98f9dd8646efe0bd6453170 WHIRLPOOL af8265ce5724841ce1ea47b3bb11f0fe8dd8d82ccf438720229fb77db9a153afa119879107c2bd84d9c2cd5206948f8059ee79aa9fc8ddb405047d481ee5e027
-EBUILD sqlmap-0.9_p20140210.ebuild 1597 SHA256 d055558d44258598c9424ff9069bf006e066dfb74e86dcd8d423b9624502bc50 SHA512 f467e1f281e1b9a83051bc354e225a330c300611a4305a2d5dcb35411a58cb07a3dc3f57f53faa90bfc5c483fb9f424619356d3704da718d771476a664d1e5ce WHIRLPOOL 08579dcc15455a7803daf0c62e6ba539c0c6c069d7425c7cb6f77a85213760d0b7d4e796a3e28de473d3f3ba36a0e41f3247ffeef317985868ee4bb413d7e86f
-EBUILD sqlmap-9999.ebuild 1531 SHA256 bc12a960acb68d984c2cc2dd2e04c6ceedcbff34ad6bdd0fb536561f9f124ede SHA512 44ea879982a2a264e9b6513eee1db5fd84cfbf9f4a8276277a3a0579b553cec465ecd8c9711d16620e7f4405e0407f204713fb9671d4bc269d6d331e43f4bbcd WHIRLPOOL f76c03be3bc2017dc8aed73aebee30f291cc24407b2a3ab460b998d8c31a4ab8c96aa15ae6064f0bc2057e713bea68e827510bd312f3a518685d70bac31dcc2b
+EBUILD sqlmap-0.9_p20140210.ebuild 1681 SHA256 ade092dd515e4d05ae7f84eedd93b904867b03934326784892c0b4728517b3cc SHA512 a04fbc7b344d246c335f3ca68a76bd3300071986d18f9007343e69d2268b87692e911e9d7713c85ebcd31f51bf0a1891b354f513e58a521fcd23308ae55530e3 WHIRLPOOL 7ac62ab4ba341d62c6c09e9565e765ee71bafd31278f7f90e08239ebe95a8f814e977c6b68cdd300e5afbfb31642a9a83827647aade279dee85e85204659082a
+EBUILD sqlmap-9999.ebuild 1615 SHA256 67bb45f6b047f2fd6a9ddacb5cadb6b6f47c623608c893f90315c09f8f4442b5 SHA512 eaa60c7832075095983f52d82b9bc76ad13ddb4608dff702ccd64577c14bb9db1d1897e05c5afc8b9315923820ec5a1e40ce8d5ce5f03c2daf00c70d02f46c13 WHIRLPOOL d75783b125701a658b252fb9f553e2f9fbb29dd71851265a93fe8bfb77b3358547661051317230e327a7a10244cc03c702ffde7902b4b31abb44201022980c86
diff --git a/dev-db/sqlmap/sqlmap-0.9-r3.ebuild b/dev-db/sqlmap/sqlmap-0.9-r3.ebuild
deleted file mode 100644
index bbb48ab3e..000000000
--- a/dev-db/sqlmap/sqlmap-0.9-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-inherit python-r1
-
-DESCRIPTION="A tool that automates the process of detecting and exploiting SQL injection flaws"
-HOMEPAGE="http://sqlmap.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-arch/upx-ucl"
-
-QA_PREBUILT="
-	usr/share/${PN}/udf/mysql/linux/32/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/mysql/linux/64/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so"
-
-S="${WORKDIR}"/$PN
-
-src_install () {
-	# fix broken tarball
-	find . -name .svn |xargs rm -r
-	# Don't forget to disable the revision check since we removed the SVN files
-	sed -i -e 's/= getRevisionNumber()/= "Unknown revision"/' lib/core/settings.py
-
-	dodoc doc/* || die "failed to add docs"
-	rm -rf doc
-	dodir /usr/share/"${PN}"/
-
-	# Handle the upx binary
-	rm -rf lib/contrib
-	dodir /usr/share/"${PN}"/lib/contrib/upx/linux
-	dosym /usr/bin/upx /usr/share/"${PN}"/lib/contrib/upx/linux/upx
-
-	cp -R * "${D}"/usr/share/"${PN}"/
-	dosym /usr/share/"${PN}"/sqlmap.py /usr/sbin/${PN}
-}
diff --git a/dev-db/sqlmap/sqlmap-0.9_p20131028.ebuild b/dev-db/sqlmap/sqlmap-0.9_p20131028.ebuild
deleted file mode 100644
index 5a6d33b98..000000000
--- a/dev-db/sqlmap/sqlmap-0.9_p20131028.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_{6,7} )
-inherit python-r1 git-2
-
-DESCRIPTION="A tool that automates the process of detecting and exploiting SQL injection flaws"
-HOMEPAGE="http://sqlmap.org"
-EGIT_REPO_URI="https://github.com/sqlmapproject/sqlmap.git"
-EGIT_COMMIT="48bd2e75e94f1dea2cba7c57a5d66c721cfea7ab"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-QA_PREBUILT="
-	usr/share/${PN}/udf/mysql/linux/32/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/mysql/linux/64/lib_mysqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
-	usr/share/${PN}/udf/postgresql/linux/64/9.0/lib_postgresqludf_sys.so"
-
-src_install () {
-	# fix broken tarball
-	find ./ -name .git | xargs rm -rf
-	# Don't forget to disable the revision check since we removed the SVN files
-	sed -i -e 's/= getRevisionNumber()/= "Unknown revision"/' lib/core/settings.py
-
-	dodoc doc/* || die "failed to add docs"
-	rm -rf doc/
-	dodir /usr/share/"${PN}"/
-
-	cp -R * "${D}"/usr/share/"${PN}"/
-	dosym /usr/share/"${PN}"/sqlmap.py /usr/sbin/${PN}
-}
diff --git a/dev-db/sqlmap/sqlmap-0.9_p20140210.ebuild b/dev-db/sqlmap/sqlmap-0.9_p20140210.ebuild
index 8a2118b79..be103ffbf 100644
--- a/dev-db/sqlmap/sqlmap-0.9_p20140210.ebuild
+++ b/dev-db/sqlmap/sqlmap-0.9_p20140210.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{6,7} )
-inherit python-r1 git-2
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 git-2
 
 DESCRIPTION="A tool that automates the process of detecting and exploiting SQL injection flaws"
 HOMEPAGE="http://sqlmap.org"
@@ -27,6 +27,7 @@ QA_PREBUILT="
 	usr/share/${PN}/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/32/9.1/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
@@ -38,10 +39,11 @@ src_install () {
 	# Don't forget to disable the revision check since we removed the SVN files
 	sed -i -e 's/= getRevisionNumber()/= "Unknown revision"/' lib/core/settings.py
 
-	dodoc doc/* || die "failed to add docs"
+	dodoc doc/*
 	rm -rf doc/
-	dodir /usr/share/"${PN}"/
+	dodir /usr/share/${PN}/
 
-	cp -R * "${D}"/usr/share/"${PN}"/
-	dosym /usr/share/"${PN}"/sqlmap.py /usr/sbin/${PN}
+	cp -R * "${ED}"/usr/share/${PN}/
+	python_fix_shebang "${ED}"/usr/share/${PN}
+	dosym /usr/share/${PN}/sqlmap.py /usr/sbin/${PN}
 }
diff --git a/dev-db/sqlmap/sqlmap-9999.ebuild b/dev-db/sqlmap/sqlmap-9999.ebuild
index 649f766ff..c184ba4ab 100644
--- a/dev-db/sqlmap/sqlmap-9999.ebuild
+++ b/dev-db/sqlmap/sqlmap-9999.ebuild
@@ -4,8 +4,8 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_{6,7} )
-inherit python-r1 git-2
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 git-2
 
 DESCRIPTION="A tool that automates the process of detecting and exploiting SQL injection flaws"
 HOMEPAGE="http://sqlmap.org"
@@ -26,6 +26,7 @@ QA_PREBUILT="
 	usr/share/${PN}/udf/postgresql/linux/32/8.3/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/32/8.4/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/32/9.0/lib_postgresqludf_sys.so
+	usr/share/${PN}/udf/postgresql/linux/32/9.1/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/64/8.2/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/64/8.3/lib_postgresqludf_sys.so
 	usr/share/${PN}/udf/postgresql/linux/64/8.4/lib_postgresqludf_sys.so
@@ -37,10 +38,11 @@ src_install () {
 	# Don't forget to disable the revision check since we removed the SVN files
 	sed -i -e 's/= getRevisionNumber()/= "Unknown revision"/' lib/core/settings.py
 
-	dodoc doc/* || die "failed to add docs"
+	dodoc doc/*
 	rm -rf doc/
-	dodir /usr/share/"${PN}"/
+	dodir /usr/share/${PN}/
 
-	cp -R * "${D}"/usr/share/"${PN}"/
-	dosym /usr/share/"${PN}"/sqlmap.py /usr/sbin/${PN}
+	cp -R * "${ED}"/usr/share/${PN}/
+	python_fix_shebang "${ED}"/usr/share/${PN}
+	dosym /usr/share/${PN}/sqlmap.py /usr/sbin/${PN}
 }