drop 2.0.5; fix deps, tex4ht[java] bug #486182, graphicsmagick[png] bug #314223; drop USE=xetex,luatex

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

6 files changed, 30 insertions, 384 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 0b99e4ca717e..0fd0f9d362f2 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/lyx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.304 2014/02/16 22:45:11 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.305 2014/02/17 15:46:47 dlan Exp $
+
+*lyx-2.0.7.1-r2 (17 Feb 2014)
+
+  17 Feb 2014; Yixun Lan <dlan@gentoo.org> -lyx-2.0.5.1.ebuild,
+  -lyx-2.0.5.1-r1.ebuild, -lyx-2.0.7.1-r1.ebuild, +lyx-2.0.7.1-r2.ebuild:
+  drop 2.0.5 per maintainer request; fix deps, tex4ht[java] bug #486182,
+  graphicsmagick[png] bug #314223; drop un-used USE=xetex,luatex
 
 *lyx-2.0.7.1-r1 (16 Feb 2014)
 
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index b49848cc8f3e..69fd2df82fb3 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -5,30 +5,27 @@ AUX 1.6.10-gcc.patch 3854 SHA256 4d6b90463207787e7d50a3672222e29ed6738772e6e9fe3
 AUX 1.6.7-python.patch 906 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b744e956ce9bdf5e5651d SHA512 60d66a25788102da05e25e69297ba572ff62a5532c36a3c666e7f1d24c023e27e7b9056888b74f6e9ba4581198dcb51cba12f549c374fc7f0a520c39360d2886 WHIRLPOOL d573cb6b4804a65616b8595a9dae7b1f76a807e04335a318e22a1d8cfc7419d7eb04c5fc7cec647bb64b5a3fd4c1c154e2b0d6f4e044ccba756bd18bbbb37791
 AUX 2.0-python.patch 1036 SHA256 954f96dab553024fb128924c7ba3d70a91946f6909d203ee0902d6ec8740ded8 SHA512 81bf78b837d9a4621a230d3d1d4e45c306598b4047227b88e83054268571a496a71babdfe5152b47370a3dbf91767aed366984555225c3900bf6d55dc0e43d31 WHIRLPOOL e47a40db707b68c923bce136c72742242a974fe17c8a167fa0ca6f428bf2937feba3122737417e0902f320c0a8df1d4da72702eea4e4d4fe699b5176bbe5ed19
 DIST lyx-1.6.10.tar.bz2 12559454 SHA256 dcfb6fc0f6880e706d45ea16459ed2206265179f3882b4685e4955c18adaf569 SHA512 c6d3f18f555e45ef86e22f42f7c8727ad0e1ad2cc4cbf87557f3ef235d894d46c5a87fc5923e2c02a5d9ba342389bf213af156a12c17e3b5f2308b9602b182dc WHIRLPOOL 0543590df1cc353fee939fee83db55aa146418c36c9422faa07cf9a1723002b83deb92f7ff89d49abb4144fe62d0fcf917257c07aaeb0d6e016b39393a8ab542
-DIST lyx-2.0.5.1.tar.xz 10312232 SHA256 36e527765daf8425fef83240a6ccb82472b2d9e6283de666c5d46c40fec269a2 SHA512 1fbabe7e5c9d752a510cb11e23df2be4a3ada21dc73820fa885693fbc7aa7623f694a37fbfccc82b550b32257ed455f05201fc0d57682af9dc70b5d60b4d1c4c WHIRLPOOL e22641888ae0267f88b112dfb702498e6f882adada5b386258e5fbb892b1de13dd839e4a1bab7a9e4d271aa6015424895d56e19fd9d8ffda08f1a54614e6dc17
 DIST lyx-2.0.6.tar.xz 10390452 SHA256 a5cb2bedee6e154b50881acd2316cf9d79162d6754e3aa159a6d579f5a828ad2 SHA512 644b69ad591a244ca7ebf4107c2a8dfd58757f7acc942b11e3f9ce253a775f5a713f47f5e430612d3a9e91cb202ad6da17aafbca012d66bdf9bdbb875a26de35 WHIRLPOOL 2ac79a6ec7b9a460ffd84644e6ae3da014028677555678b23c8925b8faccf39166e62ee52907212ee0082dad03c358804290b10b4092a276a0dd7fe30509aaa0
 DIST lyx-2.0.7.1.tar.xz 10449732 SHA256 ad77914a96692b4dbbf7bebaddd5f5cea0f1b729458b7475ce55965eb09e4777 SHA512 0314400c13d0a6b02d57521a9ceecfdd7aa0d8d89c527d8b48d36dcc807c6142fb225f4ba2c03ddd83a34b41ecf6ed185a8425b58e9e143973a639044e33f520 WHIRLPOOL dcdc98004120dfb37e68729027d2c8a21fcf9579e5254f1e56447afc43369e2efc8d7a1b769a4c6e9b9938e78e0fe4f1e66a761206c2f21f83cb4a76e6903bbf
 EBUILD lyx-1.6.10.ebuild 4120 SHA256 445c2becd493409edac0a36d3d9d55a6e82cb2cd3a68fe426f19960cfe3ed94c SHA512 b644de0190a2c85dc139ed08bbd47da8428821eee2c4997741301b8a2380927d9eda01d998245b5598db4685c168d9083e45de0adf9f94a285b627035c84ce92 WHIRLPOOL 4c37840e9ba6d643c9271b0148f63f25d1aacf7fb3d5d76c4ca20aa9abb46f10cb6072306c51b213907732e864d5bcef6f74e91a96e344678bf0727b6755de90
-EBUILD lyx-2.0.5.1-r1.ebuild 4386 SHA256 c3867c623b87d4172f569c98bfd911700d135a86ae0d7e9ada1142181289c06a SHA512 2c5db5cf0b1216c5d01a184e37e3e01873fe3d1cf2477369ebefcb9fd68a45ccd8f977750798617144a15907fed0fa807da16158cc92a99f92bda45d19c08b22 WHIRLPOOL 197566484a4200fd518f20ad540d0106c6801a3a80595469d3cb633717d31919313a2608973fd5e3044d3376ea95ef3369d3a4e4a926746f35a10e0ca026a8c9
-EBUILD lyx-2.0.5.1.ebuild 4471 SHA256 3d53dc29abe6fb7e96e84a465575ac72203e9b3dc996c6aafb8678ad44f1a134 SHA512 847c6b74eb10cb3fa03aeed33ec9abad7cf60b93edc00a01088240167da6294453b90dd1a8cb8fe83bd3e6a3a2fd809ab8d50f6371f7f9a4e4ce7e5c1eccd1d3 WHIRLPOOL e6adc73392acaa87a18e478dcefe9eb7d003fbdfac20a5256ea30288f9c0baf6aec78739b9f5d137afe0a07d7eef47e88fecad40721441ad7983689974def2c9
 EBUILD lyx-2.0.6.ebuild 4453 SHA256 bfff68cf081d1e2a7b47f6074cd30fe8fbd5b3c9d15b87c139e74f1cf50a8c60 SHA512 75d5c6886265dd6463186ca2a1a407c0e5994ea38cb6b7734c34d686f6cf41c26b109e308eaa0d4a16c3256546a259c8ee38fecd332bf377dff33a5d12cc2892 WHIRLPOOL c75712601b5d15c8a5e7be86247790de9a22d01eab68ecde8ff0c4e2ba7d2fc7b91fa69895b40d954676afd76a37bcfe8b4fac3e3455c7f38801c3a967a8fb7f
-EBUILD lyx-2.0.7.1-r1.ebuild 4601 SHA256 ae1de034d09b0715c8afc66188f6a69aae639dac8947f35943a0e425ba187f91 SHA512 fb525b57fa6f406c8da25ff13e0f72b14873231e19c1c1a1ec10748dda6725f805b5436bff008989638039bf7bb52e500479727fa6f257a817e9f54bad09740c WHIRLPOOL 7fb1fd2431dd4def6c53a3fa645d2689475edef682ab58e2df51c8ba9b72c05c88788d7bf944339e4dcf3e206122886a520bc5fd9294fca53a43becc295fa86b
-MISC ChangeLog 40785 SHA256 537d358662b51bcf744f75897f4724c776e96ac0613d947f761bb691083ff09a SHA512 2282bd2bf86cb7887955439e0eac692268776d9744e9262f246ee4fc80c4908486aea4cd936916781f54fbeede81347844e9c4f1030dc176c308c1baec75e03b WHIRLPOOL 81651d9d72f0cdd499dd04a348b47d050a3c8dc3ad6ea0ff57b4d83fe11b51a9e3d589fcdb7ad5b4cfbe13fe25bc99130212fd4a015ca37ee655da47051f04f2
-MISC metadata.xml 1603 SHA256 7dbbadab2a3c848fa945131763e9827be59df650a0e959e0da5334277d57affe SHA512 770f392893880e0ff8fd296d4ab4956832251e50302412fc07757cf4fa9b344e36670bc6ee8feba8ea367c8821c317e3cf68143335d92e7d0a6f90c55ae66bbd WHIRLPOOL 38df97b32e3b99aaf02fc043402428931f6d54a03f264b158b0fdf16d3cc5993384f72b4d2df6078b2ecd81e75da6cbb1616116114e8063098e601c9f19bfbc3
+EBUILD lyx-2.0.7.1-r2.ebuild 4428 SHA256 346cd713b8d9d04b32343aa34a149a6ff3067f25af302807c4e6b670a525e2ae SHA512 af832137785e7ddae4580bee369bb7935219058a0b38d14ea6f5110bc92dc1a7ad7ae9fe945a0c19a7dde6e9a374e56611f85db4990a53124b6e2899193d5978 WHIRLPOOL c87fd17a7fc5662a1f70ef8e6e2b2ca6c836c8c0caf63e28ec74e0a256555c190e1666dcf647dd4d77bb6d6f5767d999b68fd0f143a5ecb7f3907f1a399bad08
+MISC ChangeLog 41093 SHA256 12b900058d4b7f66384b5221e700912a2f3ea2e5cf63dc807f4edbbf0fb50878 SHA512 3d95c301e480176f76a5646ad92579472c40bf63d4debcbf938dd8edef4694227a92fadc9c76bc63b230ef5d2432087d925272ac3755242d2e8125be4f06924d WHIRLPOOL 183fc7044e8b05da9683b93248d4a13ed47cc2ffc42c7e0951afc6836cf2cb2d26d2ed11b70a14a13aa54f0f8bba19c83dd1aa4080661690c29c294210d96cbe
+MISC metadata.xml 1477 SHA256 bdc2f9517751ac417920f04a9268714ef8777f24425bf3f8855da7e822744731 SHA512 210089f669a0d7d7ef370c6b08527184d3c9e204bd6a775564da65a9758efb96962b927c0748f6e9e3db4383ad18e64f96640d560e9fa5c57eb3ca8bacf34f91 WHIRLPOOL f266bbda3af6dc365df63add80cd8ad5ed01b259e8ff945ac0421274ec00ef423fbe488b186efa17ca367dbf745f6b08e56b785787e171c2520cef13a4476491
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTAT+GAAoJEJIMDbyqvv1VhxcQAM6n5H7waqCJkoAM1F/vOzaU
-U9b0mof5RzBIMP2Fw/3oiDlzp2ecT8WCq7ZW9G44woJYUcvvTF6NUrT7WGpUrBsj
-YsKuslhWn8Me5Dl4HjAd+hA4oEapjAY+cybj6Y25BHGAEqAd99soFYXdkkYOk2X6
-fyV4sQRzBhwgLMKjWCMImd8QVz/eAYNovI6TTwdssTTJrvkBbU/gusxtnDckL4oB
-6ehxEWWdN5i/pZ/pxRYFcaQGTYJcj2R9iP+HMh/CaHCQ+ysuLH14ZEeVBOHNUV+n
-yxoSZlxRIBAe/CNtuCwBweFXF1OpFT6Kg3Nzp35pMuAPvO3SVkH9bf2SBVIo7l7z
-IXvHXZEXLQJiTY9m9sMpQISKnqSm6nIANJ1BGVGib/k9ALf3a9lEvdc6sQ/BL0fr
-WCo6Y2YK7WEQseG2yr2J2qkvs67bNoGiVZ53hWS0yDdTuZpG+9jxZOFZKvVV5xe4
-cIdxvXulmfnHQB7Ka/8a+srEJI68PSveqypMHee+gjckojmw9sX4tYcvS0L90FdZ
-298WksQcwOflR4p//uRXqp8tMiV1ks4GmfaPFU1h1T01WdM/CRrcBRETGrtqlIuL
-nbN5PrcEhT/XjQjlUt8pUtLt5MXJ/dmiXJ7Bx86rS7C1jXOMw5IiH/UYpg4XdZT1
-lawzWlZU9w2yY+c2S11j
-=+gXL
+iQIcBAEBCAAGBQJTAi73AAoJEJIMDbyqvv1V2qkP/2sszOWmwHV+wdFV/4vQKbDK
+xfzcG+r2XtXQmnujMczaFxopkeFZVcLn9ahULLM9/+Y8jj/JY4lAKZuqzcobMIbT
+mihRgfE/ASIeaMDaYjuxo6rgG2ApXybdqhHqc09FGzPexaLyEhxgi3hpJn60mqek
+2uRZkFz2KfaWxcCZoHkAwb+PKGpxNIxP82FNk60NBhOzY5cPSzUGoCcDvj4yxLXU
+M6FNOs/dF2SyxhXTImkinTSkOFp0FebAZzWtJNwXRixMkwR3IgcE5YpPnk5syoeC
+u+e4DUQRBe6F32PH1IRRPBWWelbjxZJ2/hl0GsN696LDsTLMZeJnDHrumcIeITHC
+Wo9Ezy3xAxTN3HQrCNpLyr7SXcJ/6R59yjBxCtiB/I5TflSuSUKvclsJKtz9/I/B
+th99l6aMCijoPDuWCa5TBYY88BW/P2kqJIFwr+2HwWfr/UwFs998zcmBrTt46ZK2
+DkXvceCg5x/eirB1v6TuivaTgbVKowqiZEWi3OOatiEzqC+9h2vG+GQWWWtSmerb
+cCLhjy6ZaafqW7RBYEaO4WC4PNei3YSwVa9KLyIKyXtvNZ0OCV0QVgVq6GG5xlZx
+B9hJntwTRUaEYF6Xly6KCwOFPfRsNGs3XM7AJDyDl7KbTkfVZyi/ZQjhVDy9b1OR
+137DOi3H2Bds7NJZOsKh
+=F3qd
 -----END PGP SIGNATURE-----
diff --git a/app-office/lyx/lyx-2.0.5.1-r1.ebuild b/app-office/lyx/lyx-2.0.5.1-r1.ebuild
deleted file mode 100644
index b0680dffab14..000000000000
--- a/app-office/lyx/lyx-2.0.5.1-r1.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.5.1-r1.ebuild,v 1.2 2013/03/02 19:36:01 hwoarang Exp $
-
-EAPI=3
-
-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/2.0.x/${P}.tar.xz"
-#SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/rc3/${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
-
-COMMONDEPEND="dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	>=dev-libs/boost-1.34"
-
-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
-		)
-	)
-	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}
-	sys-devel/bc
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.0-python.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) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-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 "${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
-
-	# 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.5.1.ebuild b/app-office/lyx/lyx-2.0.5.1.ebuild
deleted file mode 100644
index 4f0b9e7cfbf9..000000000000
--- a/app-office/lyx/lyx-2.0.5.1.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.5.1.ebuild,v 1.10 2013/03/11 17:49:04 ago Exp $
-
-EAPI=3
-
-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/2.0.x/${P}.tar.xz"
-#SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/rc3/${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 xetex luatex 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
-
-COMMONDEPEND="dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	>=dev-libs/boost-1.34"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
-	cups? ( net-print/cups )
-	latex? (
-		virtual/latex-base
-		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
-		)
-	)
-	xetex? ( dev-texlive/texlive-xetex )
-	luatex? ( >=dev-texlive/texlive-luatex-2010 )
-	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}
-	sys-devel/bc
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.0-python.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) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-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 "${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
-
-	# 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.7.1-r1.ebuild b/app-office/lyx/lyx-2.0.7.1-r2.ebuild
index 9b68a2709083..256739c99cbb 100644
--- a/app-office/lyx/lyx-2.0.7.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.0.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2014/02/16 22:45:11 dlan Exp $
+# $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
 
@@ -14,8 +14,7 @@ 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/${P}.tar.xz"
-#SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/rc3/${MY_P}.tar.xz"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -30,6 +29,8 @@ 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
@@ -56,7 +57,7 @@ RDEPEND="${COMMONDEPEND}
 			dev-tex/latex2html
 			dev-tex/tth
 			dev-tex/hevea
-			dev-tex/tex4ht
+			dev-tex/tex4ht[java]
 		)
 	)
 	html? ( dev-tex/html2latex )
@@ -90,7 +91,6 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/2.0-python.patch
-	echo "#!/bin/sh" > config/py-compile
 	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
 }
 
@@ -112,9 +112,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt || die
+	default
 
 	if use linguas_he ; then
 		echo "\bind_file cua" > "${T}"/hebrew.bind
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index b19822560b56..c7e171a57df9 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/metadata.xml
@@ -23,8 +23,6 @@
   <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='xetex'>Add support for XeTeX typesetting</flag>
-  <flag name='luatex'>Add support for LuaTeX typesetting</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