proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

11 files changed, 1003 insertions, 0 deletions

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
new file mode 100644
index 000000000000..91b4662f9130
--- /dev/null
+++ b/app-office/lyx/Manifest
@@ -0,0 +1,4 @@
+DIST lyx-1.6.10.tar.bz2 12559454 SHA256 dcfb6fc0f6880e706d45ea16459ed2206265179f3882b4685e4955c18adaf569 SHA512 c6d3f18f555e45ef86e22f42f7c8727ad0e1ad2cc4cbf87557f3ef235d894d46c5a87fc5923e2c02a5d9ba342389bf213af156a12c17e3b5f2308b9602b182dc WHIRLPOOL 0543590df1cc353fee939fee83db55aa146418c36c9422faa07cf9a1723002b83deb92f7ff89d49abb4144fe62d0fcf917257c07aaeb0d6e016b39393a8ab542
+DIST lyx-2.0.8.1.tar.xz 10481988 SHA256 fa0a9c6070554e0d12d24e9b3c4a1e5fc2ee853b3fbe83e2a415635cdc973c59 SHA512 17e313d3118dfe439f5251384f2fffdb45ffef5ec515953b7af0762d35c8e156a9338de698cea91cf8b3cedca1fc08364d8f3c50c9345f304d57004af695f901 WHIRLPOOL 6a9ef2df39861d373e1c6288f5443f910632a09ed4d84e409efe06459f2f39d3c30462b3a26aafe37c5216b765882e7ab5189e7d164b71def97f50877784754c
+DIST lyx-2.1.3.tar.xz 10778624 SHA256 2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682 SHA512 c2930d0ff1dfb7dc23e07be7141cd50c4fa023f32fc3653745b4f5031460c6fe5acfc955c0af5b3bf9505d7958b0d1e301eefd0a894bd02bb4c3f966f54332db WHIRLPOOL 818bba837ed7e63609c1067e94f3281a9d9ef2049ba1792a010372cb544e6ead8bab0ec1906f083e8fa27f8ae8145c1cf7a4772cf3952caccf5bbd2a2c1026be
+DIST lyx-2.1.4.tar.xz 10928716 SHA256 d13548cf183f2fc241df8121420933702491a7460c78a0ef6dba0e9e438ef32a SHA512 7547950e3c11e88f0ccf2cacb56709f9722d4cd03a5ee751af4489f6d343e13ee6b4e0ff7b830532572975c6cc9506686ade2afa5093f765d21b4d1b9ee7339d WHIRLPOOL a5d8533902fd5dd5a696645941c532bfe35eeaf76f411798a0aafcd01674e678dd65d2c0a58af09a6739adaf80f821a2676c340a349fca61929edfc5a9389938
diff --git a/app-office/lyx/files/1.6.10-gcc.patch b/app-office/lyx/files/1.6.10-gcc.patch
new file mode 100644
index 000000000000..44e0fc94627b
--- /dev/null
+++ b/app-office/lyx/files/1.6.10-gcc.patch
@@ -0,0 +1,142 @@
+diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
+index 68cf1d2..16a3c94 100644
+--- a/src/insets/InsetInclude.cpp
++++ b/src/insets/InsetInclude.cpp
+@@ -806,7 +806,7 @@ support::FileNameList const &
+ 		tmp->setParent(&buffer);
+ 		return cache;
+ 	}
+-	static support::FileNameList const empty;
++	static support::FileNameList const empty = support::FileNameList();
+ 	return empty;
+ }
+ 
+diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
+index 4a267e9..7a165e2 100644
+--- a/src/insets/InsetTabular.cpp
++++ b/src/insets/InsetTabular.cpp
+@@ -188,62 +188,6 @@ TabularFeature tabularFeature[] =
+ };
+ 
+ 
+-template <class T>
+-string const write_attribute(string const & name, T const & t)
+-{
+-	string const s = tostr(t);
+-	return s.empty() ? s : " " + name + "=\"" + s + "\"";
+-}
+-
+-template <>
+-string const write_attribute(string const & name, string const & t)
+-{
+-	return t.empty() ? t : " " + name + "=\"" + t + "\"";
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, docstring const & t)
+-{
+-	return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, bool const & b)
+-{
+-	// we write only true attribute values so we remove a bit of the
+-	// file format bloat for tabulars.
+-	return b ? write_attribute(name, convert<string>(b)) : string();
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, int const & i)
+-{
+-	// we write only true attribute values so we remove a bit of the
+-	// file format bloat for tabulars.
+-	return i ? write_attribute(name, convert<string>(i)) : string();
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, Tabular::idx_type const & i)
+-{
+-	// we write only true attribute values so we remove a bit of the
+-	// file format bloat for tabulars.
+-	return i ? write_attribute(name, convert<string>(i)) : string();
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, Length const & value)
+-{
+-	// we write only the value if we really have one same reson as above.
+-	return value.zero() ? string() : write_attribute(name, value.asString());
+-}
+-
+-
+ string const tostr(LyXAlignment const & num)
+ {
+ 	switch (num) {
+@@ -503,6 +447,61 @@ void l_getline(istream & is, string & str)
+ 	}
+ }
+ 
++template <class T>
++string const write_attribute(string const & name, T const & t)
++{
++	string const s = tostr(t);
++	return s.empty() ? s : " " + name + "=\"" + s + "\"";
++}
++
++template <>
++string const write_attribute(string const & name, string const & t)
++{
++	return t.empty() ? t : " " + name + "=\"" + t + "\"";
++}
++
++
++template <>
++string const write_attribute(string const & name, docstring const & t)
++{
++	return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
++}
++
++
++template <>
++string const write_attribute(string const & name, bool const & b)
++{
++	// we write only true attribute values so we remove a bit of the
++	// file format bloat for tabulars.
++	return b ? write_attribute(name, convert<string>(b)) : string();
++}
++
++
++template <>
++string const write_attribute(string const & name, int const & i)
++{
++	// we write only true attribute values so we remove a bit of the
++	// file format bloat for tabulars.
++	return i ? write_attribute(name, convert<string>(i)) : string();
++}
++
++
++template <>
++string const write_attribute(string const & name, Tabular::idx_type const & i)
++{
++	// we write only true attribute values so we remove a bit of the
++	// file format bloat for tabulars.
++	return i ? write_attribute(name, convert<string>(i)) : string();
++}
++
++
++template <>
++string const write_attribute(string const & name, Length const & value)
++{
++	// we write only the value if we really have one same reson as above.
++	return value.zero() ? string() : write_attribute(name, value.asString());
++}
++
+ } // namespace
+ 
+ 
diff --git a/app-office/lyx/files/1.6.7-python.patch b/app-office/lyx/files/1.6.7-python.patch
new file mode 100644
index 000000000000..3717cc80185e
--- /dev/null
+++ b/app-office/lyx/files/1.6.7-python.patch
@@ -0,0 +1,26 @@
+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 6984d2c..e6f17ff 100644
+--- a/src/support/os.cpp
++++ b/src/support/os.cpp
+@@ -26,7 +26,7 @@ string const python()
+ {
+ 	// Use the -tt switch so that mixed tab/whitespace indentation is
+ 	// an error
+-	static string const command("python -tt");
++	static string const command("python2 -tt");
+ 	return command;
+ }
+ 
diff --git a/app-office/lyx/files/2.0-python.patch b/app-office/lyx/files/2.0-python.patch
new file mode 100644
index 000000000000..e12f66a6970e
--- /dev/null
+++ b/app-office/lyx/files/2.0-python.patch
@@ -0,0 +1,26 @@
+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 f36331c..02f5a93 100644
+--- a/src/support/os.cpp
++++ b/src/support/os.cpp
+@@ -57,7 +57,7 @@ static string const python2(string const & binary, bool verbose = false)
+ string const python()
+ {
+ 	// Check whether the first python in PATH is the right one.
+-	static string command = python2("python -tt");
++	static string command = python2("python2 -tt");
+ 
+ 	if (command.empty()) {
+ 		// It was not, so check whether we can find it elsewhere in 
diff --git a/app-office/lyx/files/2.0.8-python.patch b/app-office/lyx/files/2.0.8-python.patch
new file mode 100644
index 000000000000..5fb21655a695
--- /dev/null
+++ b/app-office/lyx/files/2.0.8-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/files/2.1-python.patch b/app-office/lyx/files/2.1-python.patch
new file mode 100644
index 000000000000..5fb21655a695
--- /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-1.6.10.ebuild b/app-office/lyx/lyx-1.6.10.ebuild
new file mode 100644
index 000000000000..9cdf27f611a6
--- /dev/null
+++ b/app-office/lyx/lyx-1.6.10.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+PYTHON_DEPEND="2"
+
+inherit gnome2-utils qt4-r2 eutils flag-o-matic font python 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/1.6.x/${P}.tar.bz2"
+#SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+IUSE="cups debug nls latex monolithic-build html rtf dot docbook dia subversion rcs svg"
+
+LANGS="ar ca cs de el en es eu fi fr gl he hu id it ja nb nn pl pt ro ru sk tr uk zh_CN zh_TW"
+for X in ${LANGS}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+COMMONDEPEND="dev-qt/qtgui:4
+	dev-qt/qtcore:4
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXrender
+	x11-libs/libXfixes
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	dev-libs/libxml2
+	app-text/aiksaurus
+	app-text/aspell
+	media-libs/fontconfig
+	media-libs/freetype
+	>=dev-libs/boost-1.34"
+
+RDEPEND="${COMMONDEPEND}
+	dev-texlive/texlive-fontsextra
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
+	cups? ( net-print/cups )
+	latex? (
+		virtual/latex-base
+		app-text/ghostscript-gpl
+		app-text/noweb
+		dev-tex/dvipost
+		dev-tex/chktex
+		app-text/ps2eps
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-science
+		|| (
+			dev-tex/latex2html
+			dev-tex/tth
+			dev-tex/hevea
+			dev-tex/tex4ht
+		)
+	)
+	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? ( || ( gnome-base/librsvg media-gfx/inkscape ) )"
+
+DEPEND="${COMMONDEPEND}
+	x11-proto/xproto
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	python_set_active_version 2
+	font_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/1.6.7-python.patch
+	epatch "${FILESDIR}"/1.6.10-gcc.patch
+	echo "#!/bin/sh" > config/py-compile
+	sed "s:python -tt:$(PYTHON) -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) \
+		--with-aspell --without-included-boost --disable-stdlib-debug
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt || die
+
+	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
+	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/tex/latex/lyx || die
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_convert_shebangs -r 2 "${D}"/usr/share/${PN}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	gnome2_icon_cache_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
+
+	if use latex ; then
+		texhash
+	fi
+}
diff --git a/app-office/lyx/lyx-2.0.8.1.ebuild b/app-office/lyx/lyx-2.0.8.1.ebuild
new file mode 100644
index 000000000000..9c546f6ce3ff
--- /dev/null
+++ b/app-office/lyx/lyx-2.0.8.1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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
+	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${PV}/${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.8-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
+}
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 000000000000..b053cad60f93
--- /dev/null
+++ b/app-office/lyx/lyx-2.1.3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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"
+
+	# 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
+}
diff --git a/app-office/lyx/lyx-2.1.4.ebuild b/app-office/lyx/lyx-2.1.4.ebuild
new file mode 100644
index 000000000000..75f94cc2b544
--- /dev/null
+++ b/app-office/lyx/lyx-2.1.4.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_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"
+
+	# 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
+}
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
new file mode 100644
index 000000000000..5fb0e29f6f2a
--- /dev/null
+++ b/app-office/lyx/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tex</herd>
+<herd>proxy-maintainers</herd>
+<herd>cjk</herd>
+<maintainer>
+  <email>ps@twin.jikos.cz</email>
+  <name>Pavel Sanda</name>
+  <description>Primary Maintainer, Assign bugs</description>
+</maintainer>
+<maintainer>
+  <email>aballier@gentoo.org</email>
+  <name>Alexis Ballier</name>
+  <description>Proxy Maintainer, CC bugs</description>
+</maintainer>
+<use>
+  <flag name='docbook'>Add support for docbook export</flag>
+  <flag name='dia'>Add support for diagrams (<pkg>app-office/dia</pkg>)</flag>
+  <flag name='dot'>Add support for DOT import (<pkg>media-gfx/graphviz</pkg>)
+    </flag>
+  <flag name='html'>Add support for HTML import</flag>
+  <flag name='monolithic-build'>This should speed up compilation significantly
+    when you have enough RAM (&gt; 600 MB)</flag>
+  <flag name='rcs'>Add support for revision control via <pkg>dev-vcs/rcs</pkg>
+    </flag>
+  <flag name='rtf'>Add support for RTF import/export packages</flag>
+  <flag name='gnumeric'>Add support for importing Gnumeric/OpenOffice/MS Excel
+    spreadsheets into LyX.</flag>
+  <flag name='hunspell'>Add support for spellchecking based on hunspell and
+    reuse system-wide OpenOffice dictionaries. This also enable thesaurus
+	dictionaries not accessible via aspell.</flag>
+  <flag name='aspell'>Add support for aspell spellchecking</flag>
+  <flag name='enchant'>Add support for enchant spellchecking wrapper
+    (both aspell and hunspell can be used by LyX).</flag>
+</use>
+</pkgmetadata>