New ebuild for lyx 2.0

4 files changed, 30 insertions, 359 deletions

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index faaab15..d5352bf 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,9 +2,5 @@ AUX 1.6.7-python.patch 906 RMD160 74a2f14445d6b011fe04d06f3bd6710d36ab6351 SHA1
 AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 SHA1 16c3e6f846c55c3eb5fd9d7da1247a3429efa7a4 SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2
 AUX lyx.desktop 215 RMD160 13192f0f4e84e870565a3daff7d46c56954ed0fe SHA1 f72f3ff17a3a1b84cbb0aaf12c9e75387879a420 SHA256 b0ffd201e0a2e0cb39a52aadb9921e86fbb31c8d3cac04526371d6606246898c
 DIST lyx-2.0.0.tar.xz 10011408 RMD160 9d2974ae03a986effcd0bccac04a6c877f976f33 SHA1 27bf0ee623aae0e59780d9f627cdf5cb788a2516 SHA256 a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61
-DIST lyx-2.0.0rc2.tar.xz 10154432 RMD160 b1f2961f78f46a6f3f949ec67385698d490f9620 SHA1 f7c3e7de5cac5dc6905d0e1dc319b6614bee8c39 SHA256 3aa03b333664c9c93648a5187ce478224b6c97c1205179bd2ce65beb86c31e2c
-DIST lyx-2.0.0rc3.tar.xz 10221760 RMD160 97bc163fd3874072623ce7f5c002db0a4cc7a7d6 SHA1 2f66d899ac8e3f1c18424a88944238229c21ba81 SHA256 bcf6ce0ec7135aa23a8148a196d413149d8a6eabd38588efe01fbf2dbb6e3bd7
 EBUILD lyx-1.6.9999.ebuild 4194 RMD160 9358460f4d20b53abb9282e209ada592546e7f1d SHA1 9df6b29ef48455295e9dda81818b6ef675595352 SHA256 2a1db7e7a8a0408c0455fea37d1bb9630e3d077d8b0306b50c67d15f5dec06e9
-EBUILD lyx-2.0.0.ebuild 4180 RMD160 4ebe661b378d9b45cf3268c057f268e52d2affb0 SHA1 a6b02c2b4e665c2dad1c5cd047b1817d9de11560 SHA256 2dac66d8f0dc26ee8d1dd10c07f47d01f6654c8b1bb86e69f45b46ab1d17f6f5
-EBUILD lyx-2.0.0_rc2.ebuild 4180 RMD160 4ebe661b378d9b45cf3268c057f268e52d2affb0 SHA1 a6b02c2b4e665c2dad1c5cd047b1817d9de11560 SHA256 2dac66d8f0dc26ee8d1dd10c07f47d01f6654c8b1bb86e69f45b46ab1d17f6f5
-EBUILD lyx-2.0.0_rc3.ebuild 4180 RMD160 4ebe661b378d9b45cf3268c057f268e52d2affb0 SHA1 a6b02c2b4e665c2dad1c5cd047b1817d9de11560 SHA256 2dac66d8f0dc26ee8d1dd10c07f47d01f6654c8b1bb86e69f45b46ab1d17f6f5
+EBUILD lyx-2.0.0.ebuild 4649 RMD160 40755f0eb5bdf082a974328b5b0bd928fdd027be SHA1 9f4e1b5c489dd184c018998efbb44d890f72c644 SHA256 b89188e39c1b2df6ff1a86e0cf78b9109c98de7fb8da3dadbee1d623e398c927
diff --git a/app-office/lyx/lyx-2.0.0.ebuild b/app-office/lyx/lyx-2.0.0.ebuild
index 0f55836..22114aa 100644
--- a/app-office/lyx/lyx-2.0.0.ebuild
+++ b/app-office/lyx/lyx-2.0.0.ebuild
@@ -1,32 +1,31 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.7-r1.ebuild,v 1.2 2010/08/08 21:33:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.9.ebuild,v 1.2 2011/04/14 14:20:32 aballier Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="2"
 
-inherit qt4 eutils flag-o-matic font python toolchain-funcs
+inherit qt4-r2 eutils flag-o-matic font python toolchain-funcs
 
 MY_P="${P/_}"
-DIR=${MY_P/lyx-2.0.0}
 
 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"
 #SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/stable/${P}.tar.bz2"
-#SRC_URI="http://www.lyx.org/~jamatos/lyx-1.6/${MY_P}.tar.bz2 #for betas
-#SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${DIR}/${MY_P}.tar.xz"
 
 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"
+IUSE="cups debug nls latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg lilypond 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"
 
-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
@@ -44,8 +43,6 @@ COMMONDEPEND="x11-libs/qt-gui:4
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	dev-libs/libxml2
-	app-text/aiksaurus
-	virtual/aspell-dict
 	media-libs/fontconfig
 	media-libs/freetype
 	>=dev-libs/boost-1.34"
@@ -58,12 +55,15 @@ RDEPEND="${COMMONDEPEND}
 		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
@@ -71,6 +71,8 @@ RDEPEND="${COMMONDEPEND}
 			dev-tex/tex4ht
 		)
 	)
+	xetex? ( dev-texlive/texlive-xetex )
+	luatex? ( >=dev-texlive/texlive-luatex-2010 )
 	html? ( dev-tex/html2latex )
 	rtf? (
 			dev-tex/latex2rtf
@@ -83,12 +85,16 @@ RDEPEND="${COMMONDEPEND}
 	dia? ( app-office/dia )
 	subversion? ( dev-vcs/subversion )
 	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )"
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+	lilypond? ( >=media-sound/lilypond-2.14 )
+	gnumeric? ( app-office/gnumeric )
+	hunspell? ( app-text/hunspell )
+	aspell? ( app-text/aspell ) 
+	enchant? ( app-text/enchant )"
 
 DEPEND="${COMMONDEPEND}
 	x11-proto/xproto
 	dev-util/pkgconfig
-	app-arch/xz-utils
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
@@ -97,7 +103,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	unpack ${A}
 	epatch "${FILESDIR}"/1.6.7-python.patch
 	echo "#!/bin/sh" > config/py-compile
 	sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die
@@ -112,7 +117,10 @@ src_configure() {
 		$(use_enable nls) \
 		$(use_enable debug) \
 		$(use_enable monolithic-build) \
-		--with-aspell --without-included-boost --disable-stdlib-debug
+		$(use_enable hunspell) \
+		$(use_enable aspell) \
+		$(use_enable enchant) \
+		--without-included-boost --disable-stdlib-debug
 }
 
 src_install() {
@@ -129,7 +137,7 @@ src_install() {
 	fi
 
 	doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png"
-	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office"
+	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office" "MimeType=application/x-lyx;"
 
 	# fix for bug 91108
 	if use latex ; then
@@ -140,6 +148,11 @@ src_install() {
 	font_src_install
 
 	python_convert_shebangs -r 2 "${D}"/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_postinst() {
diff --git a/app-office/lyx/lyx-2.0.0_rc2.ebuild b/app-office/lyx/lyx-2.0.0_rc2.ebuild
deleted file mode 100644
index 0f55836..0000000
--- a/app-office/lyx/lyx-2.0.0_rc2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.7-r1.ebuild,v 1.2 2010/08/08 21:33:30 mr_bones_ Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit qt4 eutils flag-o-matic font python toolchain-funcs
-
-MY_P="${P/_}"
-DIR=${MY_P/lyx-2.0.0}
-
-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.devel.lyx.org/pub/lyx/stable/${P}.tar.bz2"
-#SRC_URI="http://www.lyx.org/~jamatos/lyx-1.6/${MY_P}.tar.bz2 #for betas
-#SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${DIR}/${MY_P}.tar.xz"
-
-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="x11-libs/qt-gui:4
-	x11-libs/qt-core: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
-	virtual/aspell-dict
-	media-libs/fontconfig
-	media-libs/freetype
-	>=dev-libs/boost-1.34"
-
-RDEPEND="${COMMONDEPEND}
-	|| ( dev-texlive/texlive-fontsextra app-text/ptex )
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-	cups? ( virtual/lpr )
-	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 )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )"
-
-DEPEND="${COMMONDEPEND}
-	x11-proto/xproto
-	dev-util/pkgconfig
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	font_pkg_setup
-}
-
-src_prepare() {
-	unpack ${A}
-	epatch "${FILESDIR}"/1.6.7-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) \
-		--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
-
-	doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png"
-	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office"
-
-	# 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_postinst() {
-	font_pkg_postinst
-
-	# 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() {
-	if use latex ; then
-		texhash
-	fi
-}
diff --git a/app-office/lyx/lyx-2.0.0_rc3.ebuild b/app-office/lyx/lyx-2.0.0_rc3.ebuild
deleted file mode 100644
index 0f55836..0000000
--- a/app-office/lyx/lyx-2.0.0_rc3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.7-r1.ebuild,v 1.2 2010/08/08 21:33:30 mr_bones_ Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="2"
-
-inherit qt4 eutils flag-o-matic font python toolchain-funcs
-
-MY_P="${P/_}"
-DIR=${MY_P/lyx-2.0.0}
-
-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.devel.lyx.org/pub/lyx/stable/${P}.tar.bz2"
-#SRC_URI="http://www.lyx.org/~jamatos/lyx-1.6/${MY_P}.tar.bz2 #for betas
-#SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${DIR}/${MY_P}.tar.xz"
-
-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="x11-libs/qt-gui:4
-	x11-libs/qt-core: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
-	virtual/aspell-dict
-	media-libs/fontconfig
-	media-libs/freetype
-	>=dev-libs/boost-1.34"
-
-RDEPEND="${COMMONDEPEND}
-	|| ( dev-texlive/texlive-fontsextra app-text/ptex )
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick )
-	cups? ( virtual/lpr )
-	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 )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )"
-
-DEPEND="${COMMONDEPEND}
-	x11-proto/xproto
-	dev-util/pkgconfig
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	font_pkg_setup
-}
-
-src_prepare() {
-	unpack ${A}
-	epatch "${FILESDIR}"/1.6.7-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) \
-		--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
-
-	doicon ${PN} "$S/development/Win32/packaging/icons/lyx_32x32.png"
-	make_desktop_entry ${PN} "LyX" "/usr/share/pixmaps/lyx_32x32.png" "Office"
-
-	# 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_postinst() {
-	font_pkg_postinst
-
-	# 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() {
-	if use latex ; then
-		texhash
-	fi
-}