--- matplotlib-1.2.1.ebuild	2013-06-16 19:53:39.898260926 +0800
+++ matplotlib-1.3.0.ebuild	2013-08-17 22:11:37.470178775 +0800
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-1.2.1.ebuild,v 1.4 2013/06/09 17:47:12 floppym Exp $
+# $Header: $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='tk?'
 
 inherit distutils-r1 eutils flag-o-matic
@@ -28,12 +28,12 @@
 PY32_USEDEP=$(python_gen_usedep python{3_2,3_3})
 COMMON_DEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	media-fonts/stix-fonts
 	media-libs/freetype:2
-	media-libs/libpng
+	>=media-libs/libpng-1.2
 	gtk? ( dev-python/pygtk[${PY2_USEDEP}] )
 	wxwidgets? ( dev-python/wxpython:2.8[${PY2_USEDEP}] )"
 
@@ -46,6 +46,7 @@
 		app-text/dvipng
 		virtual/python-imaging[${PY2_USEDEP},${PY32_USEDEP}]
 		dev-python/ipython
+		dev-python/numpydoc[${PY2_USEDEP}]
 		dev-python/xlwt[${PY2_USEDEP}]
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
@@ -96,18 +97,10 @@
 }
 
 python_prepare_all() {
-	# remove internal copies of pyparsing
-	rm lib/matplotlib/pyparsing{_py2,_py3}.py || die
-
 	sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' \
 		lib/matplotlib/{mathtext,fontconfig_pattern}.py \
 		|| die "sed pyparsing failed"
 
-	local PATCHES=(
-		# avoid checks needing a X display
-		"${FILESDIR}"/${PN}-1.2.0-setup.patch
-	)
-
 	distutils-r1_python_prepare_all
 }
 
@@ -164,6 +157,7 @@
 }
 
 python_compile_all() {
+	# doc build reqs py2
 	if use doc; then
 		cd doc || die
 
@@ -172,7 +166,7 @@
 
 		unset DISPLAY # bug #278524
 		VARTEXFONTS="${T}"/fonts \
-		"${PYTHON}" ./make.py --small html || die
+		/usr/bin/python2.7 ./make.py --small html || die
 	fi
 }
 
@@ -180,10 +174,8 @@
 	wrap_setup distutils_install_for_testing
 
 	cd "${TMPDIR}" || die
-	"${PYTHON}" -c "
-import sys, matplotlib as m
-sys.exit(0 if m.test(verbosity=2) else 1)
-" || die "Tests fail with ${EPYTHON}"
+	"${PYTHON}" -c "import sys, matplotlib as m;sys.exit(0 if m.test(verbosity=2) else 1)" \
+		|| die "Tests fail with ${EPYTHON}"
 }
 
 python_install() {