summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-07-14 14:40:10 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-07-14 14:40:10 +0000
commit432d8e2069473a664cadeba7decc640e1bb96484 (patch)
treede3a6f1cee67c4b5f8cff28ccb32266968ec79d1 /app-office
parentversion bump as suggested and tested by Matthias Sch. <matthias@dsx.at> in bu... (diff)
downloadgentoo-2-432d8e2069473a664cadeba7decc640e1bb96484.tar.gz
gentoo-2-432d8e2069473a664cadeba7decc640e1bb96484.tar.bz2
gentoo-2-432d8e2069473a664cadeba7decc640e1bb96484.zip
bump to beta4 and remove old 1.5 version, thanks Pavel.
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/lyx/ChangeLog8
-rw-r--r--app-office/lyx/lyx-1.6.0_beta4.ebuild (renamed from app-office/lyx/lyx-1.5.4.ebuild)102
2 files changed, 62 insertions, 48 deletions
diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index af1e85b7409b..d507eb2dfb67 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.138 2008/06/15 09:36:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.139 2008/07/14 14:40:10 aballier Exp $
+
+*lyx-1.6.0_beta4 (14 Jul 2008)
+
+ 14 Jul 2008; Alexis Ballier <aballier@gentoo.org> -lyx-1.5.4.ebuild,
+ +lyx-1.6.0_beta4.ebuild:
+ bump to beta4 and remove old 1.5 version, thanks Pavel.
15 Jun 2008; Raúl Porcel <armin76@gentoo.org> lyx-1.5.5.ebuild:
alpha/ia64/sparc stable wrt #225875
diff --git a/app-office/lyx/lyx-1.5.4.ebuild b/app-office/lyx/lyx-1.6.0_beta4.ebuild
index 2b29eea24f51..9572d9f8dc29 100644
--- a/app-office/lyx/lyx-1.5.4.ebuild
+++ b/app-office/lyx/lyx-1.6.0_beta4.ebuild
@@ -1,17 +1,22 @@
# 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.5.4.ebuild,v 1.9 2008/03/27 18:43:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.0_beta4.ebuild,v 1.1 2008/07/14 14:40:10 aballier Exp $
+
+EAPI=1
inherit qt4 eutils flag-o-matic font toolchain-funcs
-MY_P="${P/_}"
+#MY_P="${P/_}"
+MY_P="lyx-1.6.0beta4"
+
S="${WORKDIR}/${MY_P}"
-FONT_P="latex-xft-fonts-0.1"
-FONT_S="${WORKDIR}/${FONT_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
- ftp://ftp.lyx.org/pub/lyx/contrib/${FONT_P}.tar.gz
+#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
@@ -19,12 +24,16 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-#KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" # dev-tex/ivritex
-IUSE="cups debug nls linguas_he latex"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cups debug nls latex monolithic-build html rtf dot docbook"
RESTRICT="test"
-RDEPEND="$(qt4_min_version 4.1.1)
+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.2.0:4 )
x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXrender
@@ -35,15 +44,15 @@ RDEPEND="$(qt4_min_version 4.1.1)
x11-libs/libX11
x11-libs/libXau
x11-libs/libXdmcp
- media-gfx/imagemagick
- media-libs/libpng
- media-libs/fontconfig
- media-libs/freetype
dev-libs/libxml2
app-text/aiksaurus
- app-text/sgmltools-lite
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
@@ -58,41 +67,45 @@ RDEPEND="$(qt4_min_version 4.1.1)
dev-tex/tex4ht
)
)
- linguas_he? ( dev-tex/ivritex )"
+ 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="${RDEPEND}
+DEPEND="${COMMONDEPEND}
x11-proto/xproto
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- # bug #125309
- epatch "${FILESDIR}"/${PN}-1.5.0-gentoo.patch || die
-}
+ nls? ( sys-devel/gettext )
+ >=dev-libs/boost-1.34"
src_compile() {
- append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)"
- replace-flags "-Os" "-O2"
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
- unset LINGUAS
econf \
$(use_enable nls) \
$(use_enable debug) \
- --with-aspell || die "econf failed"
+ $MONOLITHIC \
+ --with-aspell --without-included-boost --disable-stdlib-debug
emake || die "emake failed"
}
src_install() {
- local mylinguas="${LINGUAS}"
-
- unset LINGUAS
emake DESTDIR="${D}" install || die "emake install failed"
- LINGUAS="${mylinguas}"
-
- dodoc ANNOUNCE ChangeLog NEWS README RELEASE-NOTES UPGRADING
+ dodoc ANNOUNCE NEWS README RELEASE-NOTES UPGRADING "${FONT_S}"/*.txt
if use linguas_he ; then
insinto /usr/share/lyx/bind
@@ -100,20 +113,16 @@ src_install() {
dodoc "${DISTDIR}"/preferences
fi
- domenu "${FILESDIR}"/lyx.desktop
-
- # install the latex-xft fonts, which should fix
- # the problems outlined in bug #15629
- # <obz@gentoo.org>
- cd "${WORKDIR}"/${FONT_P}
- emake DESTDIR="${D}" install || die "Font installation failed"
-
- font_src_install
+ 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() {
@@ -134,9 +143,8 @@ pkg_postinst() {
fi
elog
- elog "There are known issues in the case of 1.4->1.5 config files transition."
- elog "In case your File->Export list is incomplete try reconfiguring or even"
- elog "remove the old configuration files in ~/.lyx ."
+ elog "This is not stable version of LyX. Expect bugs, crashes and further"
+ elog "fileformat changes. Do not use it for production work."
elog
}