--- /usr/portage/x11-libs/vte/vte-0.28.2-r206.ebuild	2014-04-19 19:45:40.000000000 +0200
+++ vte-0.28.2-r206.ebuild	2014-11-03 18:05:07.323000000 +0100
@@ -38,8 +38,8 @@
 	sys-devel/gettext"
 
 src_prepare() {
-	# Do not disable gnome-pty-helper, bug #401389
 	G2CONF="${G2CONF}
+		--disable-gnome-pty-helper
 		--disable-deprecation
 		--disable-static
 		$(use_enable debug)
@@ -65,6 +65,9 @@
 	# Fix CVE-2012-2738, upstream bug #676090
 	epatch "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
 
+	# Use gnome-pty-helper even if we are not building it here. Fixes bug #401389
+	epatch "${FILESDIR}"/${PN}-0.28.2-enable-external-pty-helper.patch
+
 	prepare_python() {
 		mkdir -p "${BUILD_DIR}" || die
 	}
@@ -115,5 +118,4 @@
 		python_foreach_impl run_in_build_dir install_python
 	fi
 
-	rm -v "${ED}usr/libexec/gnome-pty-helper" || die
 }