diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
new file mode 100644
index 0000000..4d6e159
--- /dev/null
+++ b/dev-python/autopep8/Manifest
@@ -0,0 +1 @@
+DIST autopep8-1.0.1.tar.gz 121030 SHA256 50a30344ddbfeaa72577fd329e8b6411d41e34dba98724147d5240e1c62a4fc2 SHA512 def474a45f067d440ca769e033ac839818e55a2799ebcdef1aff27c441ca7d81b7d634400313b0f08afa06253bcabbdc35360afd641ffe3ebf98eac000972b4e WHIRLPOOL 92f39791680e55af2797cab5089997f5ecf73c66d955e0dff844c930de6154394aa0f81b3091895e4b5f29131d8346d4e2c670013147c41dc52812c4028bdf4c
diff --git a/dev-python/autopep8/autopep8-1.0.1.ebuild b/dev-python/autopep8/autopep8-1.0.1.ebuild
new file mode 100644
index 0000000..55fe450
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/autopep8/autopep8-1.0.1.ebuild,v 1.2 2014/05/04 08:47:35 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8"
+SRC_URI="https://github.com/hhatto/${PN}/tarball/ver${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE=""
+
+DEPEND=">=dev-python/pep8-1.5.6[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pep8-1.5.6[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	ewarn "Since this version of autopep depends on >=dev-python/pep8-1.3"
+	ewarn "it is affected by https://github.com/jcrocholl/pep8/issues/45"
+	ewarn "(indentation checks inside triple-quotes)."
+	ewarn "If you do not want to be affected by this, then add the"
+	ewarn "following lines to your local package.mask:"
+	ewarn "  >=dev-python/pep8-1.3"
+	ewarn "  >=dev-python/autopep8-0.6"
+}
diff --git a/dev-python/autopep8/files/autopep8-0.5.2-issue-10.patch b/dev-python/autopep8/files/autopep8-0.5.2-issue-10.patch
new file mode 100644
index 0000000..5bd6c95
--- /dev/null
+++ b/dev-python/autopep8/files/autopep8-0.5.2-issue-10.patch
@@ -0,0 +1,28 @@
+From bec4e89cb339beb824541b0b88dda4ea1742835f Mon Sep 17 00:00:00 2001
+From: myint <myint@macbookpro.local>
+Date: Fri, 4 May 2012 06:09:22 -0700
+Subject: [PATCH] Correct fix_e224() to not modify indentation
+
+---
+ autopep8.py |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/autopep8.py b/autopep8.py
+index c795cf3..c7ca42c 100755
+--- a/autopep8.py
++++ b/autopep8.py
+@@ -230,7 +230,10 @@ class FixPEP8(object):
+ 
+     def fix_e224(self, result):
+         target = self.source[result['line'] - 1]
+-        fixed = re.sub(r'\t+', ' ', target, 1)
++        offset = result['column']
++        prefix = target[:offset - 1]
++        suffix = target[offset - 1:].replace('\t', ' ')
++        fixed = prefix + " " + suffix
+         self.source[result['line'] - 1] = fixed
+ 
+     def fix_e225(self, result):
+-- 
+1.7.8.5
+
diff --git a/dev-python/autopep8/metadata.xml b/dev-python/autopep8/metadata.xml
new file mode 100644
index 0000000..f676f33
--- /dev/null
+++ b/dev-python/autopep8/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<longdescription>autopep8 formats Python code based on the output of the pep8 utility</longdescription>
+	<upstream>
+		<remote-id type="pypi">autopep8</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
new file mode 100644
index 0000000..e2721e3
--- /dev/null
+++ b/dev-python/pep8/Manifest
@@ -0,0 +1 @@
+DIST pep8-1.5.6.tar.gz 66944 SHA256 1a8be992f8daac6144af0f3972f40159f46d81cb36dde4adeea01576e4bf041a SHA512 9de60df0f56eeb28be835b3f11d060150e08c19403552b769abe0794a1aca65e3a17fd8b45f35b34b11593f527c2f4521ab72823aa1475963b1281c044c71ec1 WHIRLPOOL 97f90d9b4ae69d87cf5eb014998f74d8fc97640a31a457a2b39db495eeb9bc0634d5a56a6bf7636d44dbef70179a3c0c0098e7963a5d63e7d3cfccd0b250675b
diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
new file mode 100644
index 0000000..53bcf56
--- /dev/null
+++ b/dev-python/pep8/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>python</herd>
+	<upstream>
+		<remote-id type="pypi">pep8</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pep8/pep8-1.5.6.ebuild b/dev-python/pep8/pep8-1.5.6.ebuild
new file mode 100644
index 0000000..934c776
--- /dev/null
+++ b/dev-python/pep8/pep8-1.5.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pep8/pep8-1.5.6.ebuild,v 1.2 2014/05/04 08:08:36 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="*"
+IUSE="doc"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py -v --testsuite=testsuite || die
+	PYTHONPATH="${S}" "${PYTHON}" pep8.py --doctest -v || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/metadata/md5-cache/dev-python/autopep8-1.0.1 b/metadata/md5-cache/dev-python/autopep8-1.0.1
new file mode 100644
index 0000000..30ea452
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autopep8-1.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=>=dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
+EAPI=5
+HOMEPAGE=https://github.com/hhatto/autopep8 http://pypi.python.org/pypi/autopep8
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=dev-python/pep8-1.5.6[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=https://github.com/hhatto/autopep8/tarball/ver1.0.1 -> autopep8-1.0.1.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	a108f00cccac414097bcbbbb5de01762	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python-r1	cd956d5a4bac2209a64d0f4851cc115d	python-utils-r1	3eaef07c45447158fad343dac1667938	toolchain-funcs	48b38a216afb92db6314d6c3187abea3	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=b2d9e181b3efab2d78f4b61293f27cbd
diff --git a/metadata/md5-cache/dev-python/pep8-1.5.6 b/metadata/md5-cache/dev-python/pep8-1.5.6
new file mode 100644
index 0000000..31053ef
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pep8-1.5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+DESCRIPTION=Python style guide checker
+EAPI=5
+HOMEPAGE=http://github.com/jcrocholl/pep8 http://pypi.python.org/pypi/pep8
+IUSE=doc python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) python_targets_python3_2? ( >=dev-lang/python-3.2.5-r2:3.2 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_pypy(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
+SLOT=0
+SRC_URI=mirror://pypi/p/pep8/pep8-1.5.6.tar.gz
+_eclasses_=distutils-r1	364122897f9dc771167ee5ff362e54e1	eutils	a108f00cccac414097bcbbbb5de01762	multibuild	c2f33b0eedd7bcfd5bc226baa8da7837	multilib	fac675dcccf94392371a6abee62d909f	multiprocessing	1512bdfe7004902b8cd2c466fc3df772	python-r1	cd956d5a4bac2209a64d0f4851cc115d	python-utils-r1	3eaef07c45447158fad343dac1667938	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=8f3ebd3b80312faf1e8a4801be336587