Fixed xforms dependency when cjk is enabled. Bug #88140. Moved back to unstable (I mistakenly committed the ebuild as stable. sorry)

Package-Manager: portage-2.0.51.19

3 files changed, 29 insertions, 12 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/Manifest b/app-office/lyx/Manifest
index dec62c68d5ef..ca9e1d8abbb8 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4b3fc58956f07c65b59b0964ab9408f6 ChangeLog 9709
+MD5 5077cf22d4ab44f2ac043bade962fede lyx-1.3.5.ebuild 3354
+MD5 9be08e73ff1a88e7a558442f4d969424 lyx-1.3.5-r1.ebuild 4267
 MD5 a43370bbb57cb967dbffe1a084475550 metadata.xml 181
 MD5 a9bb0709bc1751805c02f2d858c2e337 lyx-1.3.4.ebuild 3108
-MD5 5077cf22d4ab44f2ac043bade962fede lyx-1.3.5.ebuild 3354
-MD5 2d277bda7059bf1fce9e6cf6b7b40a26 ChangeLog 9501
-MD5 bc82b89d2ea7a4089d779f10113ccc26 lyx-1.3.5-r1.ebuild 4145
-MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
+MD5 5ccd191a3dc796feeda9dcee291d2863 files/digest-lyx-1.3.5 239
 MD5 296163b72f99143379e73e616ce4e728 files/digest-lyx-1.3.4 239
-MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
 MD5 388b0f4710d31754bd238c8bf53ae0fd files/digest-lyx-1.3.5-r1 381
-MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
-MD5 5ccd191a3dc796feeda9dcee291d2863 files/digest-lyx-1.3.5 239
 MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589
+MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449
 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953
+MD5 962a15cb903b1048986422c10e21f058 files/lyx.desktop 188
+MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCU8n2VWNWqTUmv+0RAtj3AKCohc+I/TLFPEI4rx9UkCgu7CQUcACgmCXP
+F3KScSfQZqKE5DCCBYCWRmc=
+=2ELF
+-----END PGP SIGNATURE-----
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
 }