--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- subversion-1.14.0.ebuild
+++ subversion-1.14.0-r1.ebuild
@@ -98,6 +98,8 @@ 
 
 want_apache
 
+PATCHES=( "${FILESDIR}"/${P}-py3c-1.1.patch )
+
 pkg_setup() {
 	if use berkdb ; then
 		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
@@ -160,7 +162,7 @@ 
 	rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
 
 	eapply "${WORKDIR}/patches"
-	eapply_user
+	default
 
 	chmod +x build/transform_libtool_scripts.sh || die
 
@@ -212,7 +214,10 @@ 
 	)
 
 	if use python || use perl || use ruby; then
-		myconf+=( --with-swig )
+		myconf+=(
+			--with-py3c=${S}/py3c
+			--with-swig
+		)
 	else
 		myconf+=( --without-swig )
 	fi
@@ -269,10 +274,11 @@ 
 	# https://bugs.gentoo.org/721300
 	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
 
+	python_get_includedir
 	# allow overriding Python include directory
 	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
 	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	ac_cv_python_includes="-I${PYTHON_INCLUDEDIR}" \
 	econf "${myconf[@]}"
 }
 
@@ -294,7 +300,7 @@ 
 			rm -f ${p} || die
 			ln -s "${BUILD_DIR}" ${p} || die
 
-			python_export PYTHON_INCLUDEDIR
+			python_get_includedir
 			emake swig-py \
 				swig_pydir="$(python_get_sitedir)/libsvn" \
 				swig_pydir_extra="$(python_get_sitedir)/svn"
@@ -385,6 +391,7 @@ 
 
 		BUILD_DIR=python \
 		python_foreach_impl swig_py_install
+		python_foreach_impl python_optimize
 	fi
 
 	if use perl ; then