diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2005-04-06 11:47:44 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2005-04-06 11:47:44 +0000 |
| commit | d0add77ed7d5cdd2e0e53b050a260bf78210d887 (patch) | |
| tree | 34638d5eecf38f5227c845b8d8cc7e84c486af5d /app-office/lyx | |
| parent | mips stable (diff) | |
| download | gentoo-2-d0add77ed7d5cdd2e0e53b050a260bf78210d887.tar.gz gentoo-2-d0add77ed7d5cdd2e0e53b050a260bf78210d887.tar.bz2 gentoo-2-d0add77ed7d5cdd2e0e53b050a260bf78210d887.zip | |
Fixed xforms dependency when cjk is enabled. Bug #88140. Moved back to unstable (I mistakenly committed the ebuild as stable. sorry)
(Portage version: 2.0.51.19)
Diffstat (limited to 'app-office/lyx')
| -rw-r--r-- | app-office/lyx/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/lyx/lyx-1.3.5-r1.ebuild | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog index c8b4d45489ba..301b934705f5 100644 --- a/app-office/lyx/ChangeLog +++ b/app-office/lyx/ChangeLog @@ -1,6 +1,10 @@ # 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.58 2005/04/03 05:05:35 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.59 2005/04/06 11:47:44 usata Exp $ + + 06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> lyx-1.3.5-r1.ebuild: + Fixed xforms dependency when cjk is enabled. Bug #88140. Moved back + to unstable (I mistakenly committed the ebuild as stable. sorry) *lyx-1.3.5-r1 (03 Apr 2005) diff --git a/app-office/lyx/lyx-1.3.5-r1.ebuild b/app-office/lyx/lyx-1.3.5-r1.ebuild index 17e209c95993..820017c48c23 100644 --- a/app-office/lyx/lyx-1.3.5-r1.ebuild +++ b/app-office/lyx/lyx-1.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r1.ebuild,v 1.1 2005/04/03 05:05:35 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5-r1.ebuild,v 1.2 2005/04/06 11:47:44 usata Exp $ inherit kde-functions eutils libtool @@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ppc sparc amd64" +KEYWORDS="~x86 ~ppc ~sparc ~amd64" IUSE="cjk nls cups qt debug gnome" # these dependencies need looking at. @@ -26,7 +26,9 @@ DEPEND="virtual/x11 >=dev-lang/perl-5 nls? ( sys-devel/gettext ) app-text/aiksaurus - qt? ( >=x11-libs/qt-3 ) !qt? ( =x11-libs/xforms-1* )" + qt? ( >=x11-libs/qt-3 ) + !qt? ( cjk? ( =x11-libs/xforms-1.0-r1 ) + !cjk? ( =x11-libs/xforms-1* ) )" RDEPEND="${DEPEND} virtual/ghostscript @@ -53,7 +55,7 @@ src_unpack() { epatch ${FILESDIR}/${P}-boost.patch if use cjk && use qt ; then epatch ${DISTDIR}/CJK-LyX-qt-${PV}-1.patch - elif use cjk && built_with_use 'x11-libs/xforms' cjk ; then + elif use cjk && built_with_use '=x11-libs/xforms-1.0-r1' cjk ; then epatch ${DISTDIR}/CJK-LyX-xforms-${PV}-1.patch elif use cjk ; then eerror @@ -65,6 +67,7 @@ src_unpack() { eerror 'or' eerror '3) USE="-cjk" emerge lyx (normal LyX will be built)' eerror + die "Please remerge xforms-1.0-r1 with cjk USE flag enabled." fi elibtoolize || die } |