diff options
| author |   Alexandre Buisse <nattfodd@gentoo.org> | 2006-01-22 11:16:08 +0000 |
|---|---|---|
| committer | Alexandre Buisse <nattfodd@gentoo.org> | 2006-01-22 11:16:08 +0000 |
| commit | 5b7b49512feb915cd864496f8fc0d26882252bf2 (patch) | |
| tree | fa54861f2e6541b67ad58156a83d9584d18ac178 /app-office | |
| parent | Added www-client/elinks:bittorrent. (diff) | |
| download | gentoo-2-5b7b49512feb915cd864496f8fc0d26882252bf2.tar.gz gentoo-2-5b7b49512feb915cd864496f8fc0d26882252bf2.tar.bz2 gentoo-2-5b7b49512feb915cd864496f8fc0d26882252bf2.zip | |
Modular X porting.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/lyx/ChangeLog | 7 | ||||
| -rw-r--r-- | app-office/lyx/lyx-1.3.6.ebuild | 47 |
2 files changed, 36 insertions, 18 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/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 |