From be4358eed8eee4c828fd514db2e12d43457e56a3 Mon Sep 17 00:00:00 2001
From: Leonardo Valeri Manera <lvalerimanera@gmail.com>
Date: Mon, 12 May 2008 00:05:11 +0200
Subject: [PATCH] app-office/lyx: rebase release to 1.5.5

---
 app-office/lyx/Manifest                            |  4 ++--
 .../lyx/{lyx-1.5.4.ebuild => lyx-1.5.5.ebuild}     | 23 +++++++++++++++-------
 2 files changed, 18 insertions(+), 9 deletions(-)
 rename app-office/lyx/{lyx-1.5.4.ebuild => lyx-1.5.5.ebuild} (87%)

diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 2af4534..ab53f91 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -2,7 +2,7 @@ AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0
 AUX lyx.desktop 215 RMD160 13192f0f4e84e870565a3daff7d46c56954ed0fe SHA1 f72f3ff17a3a1b84cbb0aaf12c9e75387879a420 SHA256 b0ffd201e0a2e0cb39a52aadb9921e86fbb31c8d3cac04526371d6606246898c
 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.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 preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA1 3567ad4d4a2a041c295e40fef76ca53de6cb260d SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43
-EBUILD lyx-1.5.4.ebuild 3272 RMD160 497a198e52670f4f1b5719cbe07a48e6847b5ffc SHA1 2de74b35a4717b82326cfbbb8b70a8ba3412870d SHA256 9b153373678f6647d1c3982ad11e9ef9fa65131e9acbb0ac1b9eef24b03e59d5
+EBUILD lyx-1.5.5.ebuild 3516 RMD160 ccf1754bf96e38c2d20f42ac374d3bd097033064 SHA1 6af20eee11b52f4b3de6f7f78247c0eba9cbde00 SHA256 4cffcf2db738b3f64023da6c4c9737e739d82d926acebfc97beedf301c9b201f
 EBUILD lyx-9999.ebuild 4361 RMD160 67231a597699fc6a55220f934ead0744693e6c30 SHA1 5aa376db23a964d112d6b92c46828680dbc0f267 SHA256 52cf0fc732fefc1e1b6f3f8ea8aa3915920e89aa03d53149e0dc450fab314594
diff --git a/app-office/lyx/lyx-1.5.4.ebuild b/app-office/lyx/lyx-1.5.5.ebuild
similarity index 87%
rename from app-office/lyx/lyx-1.5.4.ebuild
rename to app-office/lyx/lyx-1.5.5.ebuild
index ddc4aa3..a8dc23f 100644
--- a/app-office/lyx/lyx-1.5.4.ebuild
+++ b/app-office/lyx/lyx-1.5.5.ebuild
@@ -21,13 +21,16 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" # dev-tex/ivritex
 IUSE="cups debug nls linguas_he latex"
 RESTRICT="test"
 
 RDEPEND="|| (
-			  =x11-libs/qt-4.2*
-			  =x11-libs/qt-4.3*
+			  (
+				x11-libs/qt-gui
+				x11-libs/qt-core
+			  )
+			  >=x11-libs/qt-4.1.1:4
 			)
 		 x11-libs/libXrandr
 		 x11-libs/libXcursor
@@ -40,15 +43,15 @@ RDEPEND="|| (
 		 x11-libs/libXau
 		 x11-libs/libXdmcp
 		 media-gfx/imagemagick
-		 media-libs/libpng
+		 media-libs/libpng:1.2
 		 media-libs/fontconfig
-		 media-libs/freetype
-		 dev-libs/libxml2
+		 media-libs/freetype:2
+		 dev-libs/libxml2:2
 		 dev-libs/boost
 		 app-text/aiksaurus
 		 app-text/sgmltools-lite
 		 virtual/aspell-dict
-		 virtual/python
+		 >=dev-lang/python-2.3.4
 		 cups? ( virtual/lpr )
 		 latex? (
 				  virtual/latex-base
@@ -72,6 +75,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	# bug #125309
 	epatch "${FILESDIR}"/${PN}-1.5.0-gentoo.patch || die
 }
 
@@ -108,11 +112,15 @@ src_install() {
 
 	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
 
+	# fix for bug 91108
 	if use latex ; then
 		dosym ../../../lyx/tex /usr/share/texmf/tex/latex/lyx
 	fi
@@ -121,6 +129,7 @@ src_install() {
 pkg_postinst() {
 	font_pkg_postinst
 
+	# fix for bug 91108
 	if use latex ; then
 		texhash
 	fi
-- 
2.11.4.GIT