diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
new file mode 100644
index 00000000..0c52aaeb
--- /dev/null
+++ b/app-office/lyx/Manifest
@@ -0,0 +1 @@
+DIST lyx-2.1.3.tar.xz 10778624 SHA256 2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682 SHA512 c2930d0ff1dfb7dc23e07be7141cd50c4fa023f32fc3653745b4f5031460c6fe5acfc955c0af5b3bf9505d7958b0d1e301eefd0a894bd02bb4c3f966f54332db WHIRLPOOL 818bba837ed7e63609c1067e94f3281a9d9ef2049ba1792a010372cb544e6ead8bab0ec1906f083e8fa27f8ae8145c1cf7a4772cf3952caccf5bbd2a2c1026be
diff --git a/app-office/lyx/files/2.1-python.patch b/app-office/lyx/files/2.1-python.patch
new file mode 100644
index 00000000..5fb21655
--- /dev/null
+++ b/app-office/lyx/files/2.1-python.patch
@@ -0,0 +1,29 @@
+diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
+index 97c4f68..8f05e62 100644
+--- a/src/graphics/GraphicsConverter.cpp
++++ b/src/graphics/GraphicsConverter.cpp
+@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file,
+ 	LYXERR(Debug::GRAPHICS, "build_script ... ");
+ 	typedef Graph::EdgePath EdgePath;
+ 
+-	script << "#!/usr/bin/env python\n"
++	script << "#!/usr/bin/env python2\n"
+ 		  "# -*- coding: utf-8 -*-\n"
+ 		  "import os, shutil, sys\n\n"
+ 		  "def unlinkNoThrow(file):\n"
+diff --git a/src/support/os.cpp b/src/support/os.cpp
+index 8f60c68..2f1cb91 100644
+--- a/src/support/os.cpp
++++ b/src/support/os.cpp
+@@ -63,9 +63,9 @@ int timeout_min()
+ string const python(bool reset)
+ {
+ 	// Check whether the first python in PATH is the right one.
+-	static string command = python2("python -tt");
++	static string command = python2("python2 -tt");
+ 	if (reset) {
+-		command = python2("python -tt");
++		command = python2("python2 -tt");
+ 	}
+ 
+ 	if (command.empty()) {
diff --git a/app-office/lyx/lyx-2.1.3.ebuild b/app-office/lyx/lyx-2.1.3.ebuild
new file mode 100644
index 00000000..b4011bc6
--- /dev/null
+++ b/app-office/lyx/lyx-2.1.3.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.1.3.ebuild,v 1.9 2014/12/06 16:38:26 ago Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
+
+MY_P="${P/_}"
+
+S="${WORKDIR}/${MY_P}"
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
+HOMEPAGE="http://www.lyx.org/"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/${MY_P}.tar.xz
+	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.1/${MY_P}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
+IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"
+
+LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+COMMONDEPEND="dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	>=dev-libs/boost-1.34
+	${PYTHON_DEPS}"
+
+RDEPEND="${COMMONDEPEND}
+	dev-texlive/texlive-fontsextra
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+	cups? ( net-print/cups )
+	latex? (
+		app-text/texlive
+		app-text/ghostscript-gpl
+		app-text/noweb
+		app-text/dvipng
+		dev-tex/dvipost
+		dev-tex/chktex
+		app-text/ps2eps
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-science
+		dev-texlive/texlive-genericextra
+		dev-texlive/texlive-fontsrecommended
+		|| (
+			dev-tex/latex2html
+			dev-tex/tth
+			dev-tex/hevea
+			dev-tex/tex4ht[java]
+		)
+	)
+	html? ( dev-tex/html2latex )
+	rtf? (
+			dev-tex/latex2rtf
+			app-text/unrtf
+			dev-tex/html2latex
+		)
+	linguas_he? ( dev-tex/culmus-latex )
+	docbook? ( app-text/sgmltools-lite )
+	dot? ( media-gfx/graphviz )
+	dia? ( app-office/dia )
+	subversion? ( dev-vcs/subversion )
+	rcs? ( dev-vcs/rcs )
+	svg? (  || ( media-gfx/imagemagick[svg] media-gfx/graphicsmagick[svg] )
+			|| ( gnome-base/librsvg media-gfx/inkscape )
+		)
+	gnumeric? ( app-office/gnumeric )
+	hunspell? ( app-text/hunspell )
+	aspell? ( app-text/aspell )
+	enchant? ( app-text/enchant )"
+
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/2.1-python.patch
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+}
+
+src_configure() {
+	tc-export CXX
+	#bug 221921
+	export VARTEXFONTS=${T}/fonts
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_enable monolithic-build) \
+		$(use_with hunspell) \
+		$(use_with aspell) \
+		$(use_with enchant) \
+		--without-included-boost \
+		--disable-stdlib-debug \
+		--with-packaging=posix
+}
+
+src_install() {
+	default
+
+	if use linguas_he ; then
+		echo "\bind_file cua" > "${T}"/hebrew.bind
+		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
+
+		insinto /usr/share/lyx/bind
+		doins "${T}"/hebrew.bind || die
+	fi
+
+	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "${S}/lib/images/lyx.png"
+	doicon -s scalable "${S}/lib/images/lyx.svg"
+	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
+
+	# fix for bug 91108
+	if use latex ; then
+		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell ; then
+		dosym /usr/share/myspell /usr/share/lyx/dicts
+		dosym /usr/share/myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash
+	fi
+
+	# instructions for RTL support. See also bug 168331.
+	if use linguas_he || use linguas_ar; then
+		elog
+		elog "Enabling RTL support in LyX:"
+		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
+		elog "You must enable RTL support in LyX. To do so start LyX and go to"
+		elog "Tools->Preferences->Language settings->Language"
+		elog "and make sure the \"Right-to-left language support\" is checked"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+
+	if use latex ; then
+		texhash
+	fi
+}