Modular X porting.

Package-Manager: portage-2.1_pre3-r1

3 files changed, 49 insertions, 41 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 3c3d4f60cd12..1cb7a08bc2e8 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/lyx
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.71 2005/08/28 01:28:00 cryos Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.72 2006/01/22 11:16:08 nattfodd Exp $
+
+  22 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org> lyx-1.3.6.ebuild:
+  Ported to modular X, thanks to Rohan McGovern (bug #117522).
 
   28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> lyx-1.3.5-r2.ebuild:
   Stable on amd64.
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 58e16a4f7947..50f956b0e93b 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 895daf39c7f268ca69242ab4d5e6b185 lyx-1.3.4.ebuild 3103
-MD5 9257cf14df16f1d22e3cd6d65f2dbccf lyx-1.3.6.ebuild 4273
-MD5 85c91dd1e7126db67b96932bb898dcf6 lyx-1.3.5-r2.ebuild 4365
-MD5 9b0aac9341f4a2e88d5cf99274878a5e ChangeLog 10973
-MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
-MD5 cbf7e117745080595fa57af4f76c112b lyx-1.3.5-r1.ebuild 4219
-MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
-MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
-MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
-MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
-MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
-MD5 7fd22c8db1af17ba2d9abcb3548320ef files/lyx-1.3.6-gentoo.diff 1108
+MD5 8e92851f6ab731ec069a9fad1bfbfd8f ChangeLog 11112
 MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
-MD5 59ef4c27ebcfafc671cfb41e266b0967 files/digest-lyx-1.3.6 381
 MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r1 381
 MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r2 381
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDERMuntT9W3vfTuoRAvf2AJ9GEoNCjxwVDIk9S1LDlu5pTidqogCfTT2B
-rOZaKPWbDwmGTpOL5F7FYEo=
-=cidh
------END PGP SIGNATURE-----
+MD5 59ef4c27ebcfafc671cfb41e266b0967 files/digest-lyx-1.3.6 381
+MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
+MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
+MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
+MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
+MD5 7fd22c8db1af17ba2d9abcb3548320ef files/lyx-1.3.6-gentoo.diff 1108
+MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
+MD5 895daf39c7f268ca69242ab4d5e6b185 lyx-1.3.4.ebuild 3103
+MD5 cbf7e117745080595fa57af4f76c112b lyx-1.3.5-r1.ebuild 4219
+MD5 85c91dd1e7126db67b96932bb898dcf6 lyx-1.3.5-r2.ebuild 4365
+MD5 a1a7eceb681417c93ffb9b6745fef448 lyx-1.3.6.ebuild 4464
+MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
diff --git a/app-office/lyx/lyx-1.3.6.ebuild b/app-office/lyx/lyx-1.3.6.ebuild
index abc15b07e26b..826e3855e51e 100644
--- a/app-office/lyx/lyx-1.3.6.ebuild
+++ b/app-office/lyx/lyx-1.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.6.ebuild,v 1.1 2005/07/31 10:23:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.6.ebuild,v 1.2 2006/01/22 11:16:08 nattfodd Exp $
 
 inherit kde-functions eutils libtool flag-o-matic
 
@@ -18,19 +18,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="cjk cups debug nls qt"
 
-# these dependencies need looking at.
-# does lyx only need qt to compile but not run ?
-# I'll look into it <obz@gentoo.org>
-DEPEND="virtual/x11
-	virtual/tetex
-	>=dev-lang/perl-5
-	nls? ( sys-devel/gettext )
-	app-text/aiksaurus
-	qt? ( =x11-libs/qt-3* )
-	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
-		!cjk? ( =x11-libs/xforms-1* ) )"
-
-RDEPEND="${DEPEND}
+RDEPEND="|| ( (
+			x11-libs/libXi
+			x11-libs/libXrandr
+			x11-libs/libXcursor
+			x11-libs/libXft
+		)
+		virtual/x11
+	)
 	virtual/ghostscript
 	virtual/pdfviewer
 	virtual/psviewer
@@ -42,7 +37,27 @@ RDEPEND="${DEPEND}
 	app-text/noweb
 	dev-tex/chktex"
 
-DEPEND="$DEPEND >=sys-devel/autoconf-2.58"
+# 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/x11
+	)
+	virtual/tetex
+	>=dev-lang/perl-5
+	nls? ( sys-devel/gettext )
+	app-text/aiksaurus
+	qt? ( =x11-libs/qt-3* )
+	!qt? ( cjk? ( =x11-libs/xforms-1.0-r1 )
+		!cjk? ( =x11-libs/xforms-1* ) )
+	>=sys-devel/autoconf-2.58"
+
 
 src_unpack() {
 	unpack ${P}.tar.bz2