bump to rc2, remove old betas, thanks Pavel.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26.3 x86_64)

3 files changed, 12 insertions, 161 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 3df4738955c3..6eef2bfa0416 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.143 2008/08/05 16:45:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.144 2008/08/29 17:01:41 aballier Exp $
+
+*lyx-1.6.0_rc2 (29 Aug 2008)
+
+  29 Aug 2008; Alexis Ballier <aballier@gentoo.org> -lyx-1.6.0_beta3.ebuild,
+  -lyx-1.6.0_beta4.ebuild, +lyx-1.6.0_rc2.ebuild:
+  bump to rc2, remove old betas, thanks Pavel.
 
 *lyx-1.6.0_rc1 (05 Aug 2008)
 
diff --git a/app-office/lyx/lyx-1.6.0_beta4.ebuild b/app-office/lyx/lyx-1.6.0_beta4.ebuild
deleted file mode 100644
index dd41c1790a91..000000000000
--- a/app-office/lyx/lyx-1.6.0_beta4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.0_beta4.ebuild,v 1.2 2008/07/27 00:59:56 carlo Exp $
-
-EAPI=1
-
-inherit qt4 eutils flag-o-matic font toolchain-funcs
-
-#MY_P="${P/_}"
-MY_P="lyx-1.6.0beta4"
-
-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/${P}.tar.bz2 #for stable release
-#SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/pre/${MY_P}.tar.bz2 #for preleases
-SRC_URI="http://www.lyx.org/~jamatos/lyx-1.6/${MY_P}.tar.bz2
-	linguas_he? (
-		http://cs.haifa.ac.il/~dekelts/lyx/files/hebrew.bind
-		http://cs.haifa.ac.il/~dekelts/lyx/files/preferences
-	)"
-
-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"
-RESTRICT="test"
-
-LANGS="ca cs de es eu fi fr gl he hu it ja ko nb nn pl pt ro ru tr zh_CN zh_TW"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-COMMONDEPEND="|| ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*: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
-	>=dev-lang/python-2.3.4
-	media-libs/fontconfig
-	media-libs/freetype"
-
-RDEPEND="${COMMONDEPEND}
-	media-gfx/imagemagick
-	cups? ( virtual/lpr )
-	latex? (
-		virtual/latex-base
-		virtual/ghostscript
-		app-text/noweb
-		dev-tex/dvipost
-		dev-tex/chktex
-		|| (
-			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/ivritex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )"
-
-DEPEND="${COMMONDEPEND}
-	x11-proto/xproto
-	nls? ( sys-devel/gettext )
-	>=dev-libs/boost-1.34"
-
-src_compile() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-
-	if use monolithic-build ; then
-		MONOLITHIC=" --enable-monolithic-boost --enable-monolithic-client \
-			--enable-monolithic-insets 	--enable-monolithic-mathed \
-			--enable-monolithic-core --enable-monolithic-tex2lyx \
-			--enable-monolithic-frontend-qt4 "
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$MONOLITHIC  \
-		--with-aspell --without-included-boost --disable-stdlib-debug
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt
-
-	if use linguas_he ; then
-		insinto /usr/share/lyx/bind
-		doins "${DISTDIR}"/hebrew.bind
-		dodoc "${DISTDIR}"/preferences
-	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
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	if use linguas_he ; then
-		elog
-		elog "How to use Hebrew in LyX:"
-		elog "bunzip2 /usr/share/doc/${PF}/preferences.bz2 into ~/.lyx/preferences"
-		elog "or, read http://cs.haifa.ac.il/~dekelts/lyx/instructions2.html"
-		elog "for instructions on using lyx's own preferences dialog to equal effect."
-		elog
-	fi
-
-	elog
-	elog "This is not stable version of LyX. Expect bugs, crashes and further"
-	elog "fileformat changes. Do not use it for production work."
-	elog
-}
-
-pkg_postrm() {
-	if use latex ; then
-		texhash
-	fi
-}
diff --git a/app-office/lyx/lyx-1.6.0_beta3.ebuild b/app-office/lyx/lyx-1.6.0_rc2.ebuild
index aee01f9fd0d0..050aa5de9a9c 100644
--- a/app-office/lyx/lyx-1.6.0_beta3.ebuild
+++ b/app-office/lyx/lyx-1.6.0_rc2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.0_beta3.ebuild,v 1.2 2008/07/27 00:59:56 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.0_rc2.ebuild,v 1.1 2008/08/29 17:01:41 aballier Exp $
 
 EAPI=1
 
 inherit qt4 eutils flag-o-matic font toolchain-funcs
 
 #MY_P="${P/_}"
-MY_P="lyx-1.6.0beta3"
+MY_P="lyx-1.6.0rc2"
 
 S="${WORKDIR}/${MY_P}"
 FONT_S="${S}/lib/fonts"
@@ -15,8 +15,8 @@ FONT_SUFFIX="ttf"
 DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
 HOMEPAGE="http://www.lyx.org/"
 #SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2 #for stable release
-#SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/pre/${MY_P}.tar.bz2 #for preleases
-SRC_URI="http://www.lyx.org/~jamatos/lyx-1.6/${MY_P}.tar.bz2
+#SRC_URI="http://www.lyx.org/~jamatos/lyx-1.6/${MY_P}.tar.bz2 #for betas
+SRC_URI="ftp://ftp.devel.lyx.org/pub/lyx/pre/${MY_P}.tar.bz2
 	linguas_he? (
 		http://cs.haifa.ac.il/~dekelts/lyx/files/hebrew.bind
 		http://cs.haifa.ac.il/~dekelts/lyx/files/preferences
@@ -28,7 +28,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cups debug nls latex monolithic-build html rtf dot docbook"
 RESTRICT="test"
 
-LANGS="ca cs de es eu fi fr gl he hu it ja ko nb nn pl pt ro ru tr zh_CN zh_TW"
+LANGS="ar ca cs de en es eu fi fr gl he hu it ja ko nb nn pl pt ro ru tr uk zh_CN zh_TW"
 for X in ${LANGS}; do
 	IUSE="${IUSE} linguas_${X}"
 done