bump to beta4 and remove old 1.5 version, thanks Pavel.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

3 files changed, 75 insertions, 51 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/Manifest b/app-office/lyx/Manifest
index a388362d54cf..5a6b5664fedc 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnome-mime-application-x-lyx.png 3302 RMD160 6b59808311d032c201961c0b085e13e2aae86bef SHA1 ccc71e9f98cfd6f6efbf550572eec89506d08349 SHA256 d0d16c7a835cbb8f15ea79efd27128a9c633ac56cdc06365449f389b21a0abce
 AUX lyx-1.4.4-gentoo.patch 1989 RMD160 4e52996232d9eda92df145f719b7ba891803b80b SHA1 2e6757f7d50f779d7ac65e0419073d7370508232 SHA256 4fbcaca88c2965821deaa70f61e75ff752ad34e50744d4e908f94bc29b85c553
 AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 SHA1 16c3e6f846c55c3eb5fd9d7da1247a3429efa7a4 SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2
@@ -6,13 +9,20 @@ DIST CJK-LyX-qt-1.4.4-1.patch 688282 RMD160 22676ca69c1eaef170dfb0b8d3ff67914327
 DIST hebrew.bind 45 RMD160 1621bd311aa053798815fd6c795406a505761531 SHA1 85c39df7cd0a3a4f95fe6101a23d44abb7641b2c SHA256 fc3b1e19560f7a22af1c6bca13c0c0d7786d6453e292201645abff54fd0b67dd
 DIST latex-xft-fonts-0.1.tar.gz 91730 RMD160 0a516eeba71ddc474e97f315e45e41028efa2e4d SHA1 50edf35ff08354bdf08517add33e16ee37f769e9 SHA256 78bceea8a055bc43bd0d246ae8e69f81d2f161ae4d8f1aaaa2dfff9e293ae964
 DIST lyx-1.4.4.tar.bz2 7859197 RMD160 31f709db8e4785cb378f261355a7b2551dd38253 SHA1 896240ab947fb4995dab04c8ca40d3952c90e1f2 SHA256 5f48996c4217093d5cfaa9566cc4349cbfeb65ac12cd1b996ac6a5b5e4480307
-DIST lyx-1.5.4.tar.bz2 9045016 RMD160 fca3cb9c9c9437e879c8abea820fbd28a5d1d72d SHA1 75c2be653b64eedeb443caf2b0401fb74a15e908 SHA256 6c8b9aafc287ee683b68ebb08166e660e27af9942a30291f14c18de39aca8f2b
 DIST lyx-1.5.5.tar.bz2 9082787 RMD160 d02147398bafc2ba4641d3206ef863f89655cae6 SHA1 a1467e5c1d9114a4b806e1858563fd9d03fcaab3 SHA256 051e952d206a9b0ca7a4584821ecaa88b6ed5f88a241767d97370932258c7539
 DIST lyx-1.6.0beta3.tar.bz2 9253373 RMD160 9fe10abc7faaa50b507519636978eab93d731c81 SHA1 f739a2748e1489e4851bec98bc1bfae271e44001 SHA256 0224aa6f085b029f70fc5b0b3de997a6a0029958fd578eb8af41f010ede35c2d
+DIST lyx-1.6.0beta4.tar.bz2 9394133 RMD160 76ea3df93cfe740a60fc27bb36b3f999148ee66b SHA1 7c36e61f520051ee159dc8e629e2deb9650f5297 SHA256 b1cd844ae30887abe04fe70aaa2d6393d1f9bc4b06e6598c96eaca9e57b31a59
 DIST preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA1 3567ad4d4a2a041c295e40fef76ca53de6cb260d SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43
 EBUILD lyx-1.4.4.ebuild 4428 RMD160 19a45b6e822339c90cb5799dcd9a6569e6d8e933 SHA1 99aca45a018c324c4edca73a674328901fb57c0f SHA256 989544c16e0732e01689f320eb2b951c96be0cc8dcd34d8a64b0c9756ae283e5
-EBUILD lyx-1.5.4.ebuild 3383 RMD160 b5f88a40a510fd2a94aa7e884e48c0498af5ad6e SHA1 4b6ec358a67c98d28b746dd48c9e25260a48f16f SHA256 902c7219517ed525e6fcb57d5c680802db96b3913dd550b690dc024245748d7c
 EBUILD lyx-1.5.5.ebuild 3433 RMD160 33689d7866c84fad5c9ac354769e56a85ede7c5b SHA1 09849ee2bf02501ca58333815ce0ed5c579a16aa SHA256 4d83b026aad8a4f1a71bcdd2ea915334d0854f2d9ce4a677c3b93583b16b2210
 EBUILD lyx-1.6.0_beta3.ebuild 3804 RMD160 406bf3b93449d8e2bb8e7bafa32e97da37ff79a1 SHA1 60a655891a3db5059685058073bb00c3ea6db54d SHA256 653f625740c706b9aca5abbb50af628870cd1dc025f63445e278734d8ca06974
-MISC ChangeLog 20380 RMD160 20c5c86c051e61553a5aa87b51d25a3f77c0c21a SHA1 3713b899d24c29208de1b3fb296b79fdbb34aee3 SHA256 ac3d307d724656edd1ee1647cf57653230a605b5ad266876d13d4e4c40e73cbf
+EBUILD lyx-1.6.0_beta4.ebuild 3804 RMD160 04c3231b435626f0e6ea2948263f97ace8665ea3 SHA1 06b8659197694c73e96bbe70aad0c88acf640481 SHA256 8855dbbbb7fcc3c569696e9bd40c6501ab18520e0eb4e4b92fd1701115068566
+MISC ChangeLog 20570 RMD160 3738546865330db2f0f25c04ff1496a5fbbb9218 SHA1 137e748b82917b989413c5c7fdbb69b9e5b82dc9 SHA256 307302ba1528d0fbabef5ebd61fdbe2aeb5370f5219cd0fdefbede3695235f4a
 MISC metadata.xml 359 RMD160 5f4556f94b5dce653bbfcbcfa7bce1f0c3f1c119 SHA1 07b78da45f62622b401453910f4d8ce001e02018 SHA256 c9ae8aea55261b3b5c4ebe50ea03becd70042cef4319cd9dabdfcb5525da0f20
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh7ZVQACgkQvFcC4BYPU0p5RACeIoqhFM2ThJp39nxnC+rw1I7z
+D3AAn2Zru/dxvCpU3W4cFRASmPNVFTXV
+=SGoQ
+-----END PGP SIGNATURE-----
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
 }