fix dependencies for 1.4.4, thanks to Pavel Sanda <ps@twin.jikos.cz>, should fix bug #169864

Package-Manager: portage-2.1.4

3 files changed, 35 insertions, 30 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 473bd45fd775..5be985b7d836 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,10 @@
 # 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.105 2008/01/16 22:15:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.106 2008/01/17 09:33:19 aballier Exp $
+
+  17 Jan 2008; Alexis Ballier <aballier@gentoo.org> lyx-1.4.4.ebuild:
+  fix dependencies for 1.4.4, thanks to Pavel Sanda <ps@twin.jikos.cz>, should
+  fix bug #169864
 
 *lyx-1.5.3 (16 Jan 2008)
 
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 5ccd3e223b07..423eff98cde5 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -35,10 +35,10 @@ EBUILD lyx-1.4.2.ebuild 4431 RMD160 81d055beb1ff4482d2239aa48af21b95c5de6fa8 SHA
 MD5 abf504f952e485fbf0a60ea934619995 lyx-1.4.2.ebuild 4431
 RMD160 81d055beb1ff4482d2239aa48af21b95c5de6fa8 lyx-1.4.2.ebuild 4431
 SHA256 84003565c62d5ac1d12ebcdb2d376fd4c2a3474bc551d103a92de777f03d3d5d lyx-1.4.2.ebuild 4431
-EBUILD lyx-1.4.4.ebuild 4440 RMD160 0f27b1d988bcfbd6b40e243b0ec784d80f1a8ff9 SHA1 100e3911d16b1137f2d155232a0a42e850082a6b SHA256 ae3cebdc3b10aa3e7ffbddd135c68530cf26a74ae7a628b173d853c5772eb3b3
-MD5 5c44085497ba3e891d8efd3585f0fde2 lyx-1.4.4.ebuild 4440
-RMD160 0f27b1d988bcfbd6b40e243b0ec784d80f1a8ff9 lyx-1.4.4.ebuild 4440
-SHA256 ae3cebdc3b10aa3e7ffbddd135c68530cf26a74ae7a628b173d853c5772eb3b3 lyx-1.4.4.ebuild 4440
+EBUILD lyx-1.4.4.ebuild 4434 RMD160 17d7e6e26b5fb7b5e7dfadb1f23249f8e8148f52 SHA1 99967d47e1c16be9b52b800cbf183bac91a8be2e SHA256 d5f2efe1c73e23a9a5c3348b08c1d6b043f5cac3aa65201327194b3ba3c3aa9f
+MD5 e07e25f1c6278a747fe56498dfc6d6ff lyx-1.4.4.ebuild 4434
+RMD160 17d7e6e26b5fb7b5e7dfadb1f23249f8e8148f52 lyx-1.4.4.ebuild 4434
+SHA256 d5f2efe1c73e23a9a5c3348b08c1d6b043f5cac3aa65201327194b3ba3c3aa9f lyx-1.4.4.ebuild 4434
 EBUILD lyx-1.5.0.ebuild 2941 RMD160 b3ca7ae26bcf54c1c84f18b5a2d36f8269604baf SHA1 b5528b28f7dc4628d47462c51b334c0230eaf34e SHA256 c8399032154797c5c376dbf50053b74e5fd3c1c819841985e08c0e8712524a05
 MD5 6aa6257f4731d9d5ffa4683665fbfe0f lyx-1.5.0.ebuild 2941
 RMD160 b3ca7ae26bcf54c1c84f18b5a2d36f8269604baf lyx-1.5.0.ebuild 2941
@@ -51,10 +51,10 @@ EBUILD lyx-1.5.3.ebuild 3365 RMD160 615bc7ed5177bb42e2d3ecf127a7225688056cd8 SHA
 MD5 b36bb09128196261e9970fe25f790db5 lyx-1.5.3.ebuild 3365
 RMD160 615bc7ed5177bb42e2d3ecf127a7225688056cd8 lyx-1.5.3.ebuild 3365
 SHA256 436eb8481a9323be5b64bfb571bca82fdea1d474bc31a24cdb6f1e1847d7cdcd lyx-1.5.3.ebuild 3365
-MISC ChangeLog 16656 RMD160 7f6a3cb605541185f2658933e9769c8560b5dc0a SHA1 f3623c585395ad90247517944116a8e5f47eff3e SHA256 e0f01fa55a8cb7882854fc662b3240a61e0adae462f408c67ae669bd4251d062
-MD5 c61a4b234d7d35e4a99541d6d606a451 ChangeLog 16656
-RMD160 7f6a3cb605541185f2658933e9769c8560b5dc0a ChangeLog 16656
-SHA256 e0f01fa55a8cb7882854fc662b3240a61e0adae462f408c67ae669bd4251d062 ChangeLog 16656
+MISC ChangeLog 16824 RMD160 f0401fb109a05338f1de43a83190c179a5b0c983 SHA1 7f7e8013ebe3fa85630be75402f7e114dcb31189 SHA256 2f2eda2c3dce8bd4b03b14f6684f08d4b1890a8695e2c037b24e5d7b8a4f588e
+MD5 34c7a36b21093bdfbc7701a2b243266b ChangeLog 16824
+RMD160 f0401fb109a05338f1de43a83190c179a5b0c983 ChangeLog 16824
+SHA256 2f2eda2c3dce8bd4b03b14f6684f08d4b1890a8695e2c037b24e5d7b8a4f588e ChangeLog 16824
 MISC metadata.xml 173 RMD160 2a5c18ac36394027f647f337410df755f5d37369 SHA1 98f3803fec9ccaf2574571b904292027095f5273 SHA256 f489b81a91c6b9b653122719caac14c4f1cfd63d26d4b100abf1a995db71d9c8
 MD5 cd383624b0ad49f4db815891a9777994 metadata.xml 173
 RMD160 2a5c18ac36394027f647f337410df755f5d37369 metadata.xml 173
@@ -77,7 +77,7 @@ SHA256 48e9cf5fcaa2838ddb98c8df2e245f68f14b9590fc04f370d1fdfa50bd721b6b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHjoJ9vFcC4BYPU0oRArEoAJ9OMXt6rnMHO+nttlt8XVebdBx8JQCeNQvr
-zdr6wuCfnRVMMZ9QabGRUcc=
-=SFbC
+iD8DBQFHjyFjvFcC4BYPU0oRAui2AKDNyEqKBPlYa/mPAQQbSGLJs5AloQCdFisZ
+olIptzXfvu1E7FEbPvukElA=
+=7yto
 -----END PGP SIGNATURE-----
diff --git a/app-office/lyx/lyx-1.4.4.ebuild b/app-office/lyx/lyx-1.4.4.ebuild
index af838d15e2d6..cee894dd09e6 100644
--- a/app-office/lyx/lyx-1.4.4.ebuild
+++ b/app-office/lyx/lyx-1.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4.4.ebuild,v 1.3 2007/02/25 16:27:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.4.ebuild,v 1.4 2008/01/17 09:33:19 aballier Exp $
 
 inherit kde-functions fdo-mime eutils libtool flag-o-matic font
 
@@ -23,41 +23,42 @@ IUSE="cjk cups debug gtk nls qt3 gnome"
 RDEPEND="x11-libs/libXi
 	x11-libs/libXrandr
 	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXpm
 	x11-libs/libXft
 	virtual/ghostscript
 	virtual/aspell-dict
+	app-text/aiksaurus
 	dev-tex/latex2html
 	dev-tex/dvipost
 	media-gfx/imagemagick
 	cups? ( virtual/lpr )
 	app-text/sgmltools-lite
 	app-text/noweb
-	dev-tex/chktex"
+	dev-tex/chktex
+	qt3? ( =x11-libs/qt-3* )
+	!qt3? (
+		gtk? (
+			>=dev-cpp/gtkmm-2.4
+			>=dev-cpp/libglademm-2.4
+		)
+		!gtk? (
+			=x11-libs/xforms-1*
+		)
+	)"
 
 # these dependencies need looking at.
 # does lyx only need qt to compile but not run ?
 # I'll look into it <obz@gentoo.org>
 DEPEND="${RDEPEND}
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXpm
 	x11-proto/xproto
 	virtual/tetex
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
-	app-text/aiksaurus
 	>=dev-lang/python-2.2
 	>=sys-devel/autoconf-2.58
-	qt3? ( =x11-libs/qt-3* )
-	!qt3? (
-		gtk? (
-			>=dev-cpp/gtkmm-2.4
-			>=dev-cpp/libglademm-2.4
-		)
-		!gtk? (
-			=x11-libs/xforms-1*
-		)
-	)"
+	"
 
 src_unpack() {
 	unpack ${P}.tar.bz2 || die "unpacking lyx failed"
@@ -114,7 +115,7 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	dodoc README* UPGRADING ChangeLog NEWS ANNOUNCE ABOUT-NLS "${DISTDIR}"/preferences
+	dodoc README* UPGRADING ChangeLog NEWS ANNOUNCE "${DISTDIR}"/preferences
 
 	insinto /usr/share/lyx/bind
 	doins "${DISTDIR}"/hebrew.bind