diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index a7cf6b7b..57fb5778 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,2 +1,3 @@
+DIST lyx-2.0.7.1.tar.xz 10449732 SHA256 ad77914a96692b4dbbf7bebaddd5f5cea0f1b729458b7475ce55965eb09e4777 SHA512 0314400c13d0a6b02d57521a9ceecfdd7aa0d8d89c527d8b48d36dcc807c6142fb225f4ba2c03ddd83a34b41ecf6ed185a8425b58e9e143973a639044e33f520 WHIRLPOOL dcdc98004120dfb37e68729027d2c8a21fcf9579e5254f1e56447afc43369e2efc8d7a1b769a4c6e9b9938e78e0fe4f1e66a761206c2f21f83cb4a76e6903bbf
 DIST lyx-2.0.7.tar.xz 10449908 SHA256 0597bda734d476f59dd440c45a801e1c581ab30bf4c9ab23242b3a452beee862 SHA512 34e3e5cdde3f355c17e05b0b2f3fefffd915ed68ae34689c9c92a08f48e1df3ea2d8795bbbaa1d0277e4b8df91b2dd38c1ecf0614b51583898aa7badfe540e10 WHIRLPOOL 6996e6612b25edde9f1a5b04e45426a8d861ada7f722fe936fd2a9e8a872009b04e34a33bcb9177c6a362410a70a592189947c8a5ddc546283fe2e1addfe7cc3
 DIST lyx-2.1.0beta2.tar.xz 10335516 SHA256 a5a8ee45b6e5c58848dd887fd2c9b6a04273ae4b8a79c7c301472bd0c0eab1b1 SHA512 1697505ea1f4112076b041a488d347a86e53b97e205c2c39afa02bc7bf533a31b944ff1270dc53e240beb815ea74c3460bfc0f2baf3bc396025fcc39e200e0a5 WHIRLPOOL ecea0c9371b41addefe702d77c5c2c49a8f230d0e284b52b0ae30b6b7fbdc6d27acb8b276f2c032a08453643392e20940ae9622f37c3bc089ab7c22e8d92bc20
diff --git a/app-office/lyx/lyx-2.0.7.1-r2.ebuild b/app-office/lyx/lyx-2.0.7.1-r2.ebuild
new file mode 100644
index 00000000..256739c9
--- /dev/null
+++ b/app-office/lyx/lyx-2.0.7.1-r2.ebuild
@@ -0,0 +1,179 @@
+# 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.0.7.1-r2.ebuild,v 1.1 2014/02/17 15:46:47 dlan 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.0.x/${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-1.7.0 )
+	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.0-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
+}