From ef2f247f96f6c43eb79bb6e6e33a75020511bd4b Mon Sep 17 00:00:00 2001 From: Mamoru Komachi Date: Mon, 28 Mar 2005 15:54:53 +0000 Subject: Added cjk USE flag back; bug #85343. Package-Manager: portage-2.0.51.19 --- app-text/acroread/ChangeLog | 6 +++++- app-text/acroread/Manifest | 14 +++++++------- app-text/acroread/acroread-5.10.ebuild | 6 +++--- app-text/acroread/acroread-7.0.ebuild | 9 +++------ 4 files changed, 18 insertions(+), 17 deletions(-) (limited to 'app-text') diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 31636448b5b5..e59b297ef43f 100644 --- a/app-text/acroread/ChangeLog +++ b/app-text/acroread/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/acroread # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.49 2005/03/25 17:13:26 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.50 2005/03/28 15:54:53 usata Exp $ + + 28 Mar 2005; Mamoru KOMACHI acroread-5.10.ebuild, + acroread-7.0.ebuild: + Added cjk USE flag back; bug #85343. 25 Mar 2005; Danny van Dyk acroread-5.10.ebuild, acroread-7.0.ebuild: diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest index e71e4dbe7879..6a9282306651 100644 --- a/app-text/acroread/Manifest +++ b/app-text/acroread/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 9e05ffd990a0641c5a3d00c6c7e6996c ChangeLog 8463 -MD5 3692882a042ad2ac2f9cc2d6def7f506 acroread-5.10.ebuild 2479 +MD5 33972bbf193965121b3b9f45f0da614d ChangeLog 8593 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 -MD5 e9c2256f6e80bb4397f0ca4284df497d acroread-7.0.ebuild 2426 +MD5 5b5f9119fe3b2a9644cd0730e9ed9ded acroread-5.10.ebuild 2488 +MD5 941cef678a8716928d50825cc5ebcbf4 acroread-7.0.ebuild 2242 MD5 d0981fc5a58874b78a6f2a2b73d3e43d files/digest-acroread-5.10 63 MD5 c54a04836864a99a8792ef5817a968c1 files/digest-acroread-7.0 73 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.1 (GNU/Linux) -iD8DBQFCREgk5mJXAu5GbtIRAmfBAJ9K7gpIOFldeKZjq5I+EgHRfg9HQQCffnBr -Xy0cD29T61df52hVthKhcXs= -=MdPe +iD8DBQFCSCZ5VWNWqTUmv+0RAhIqAJ4hU2a/zNdWP3kDNiXyweJrYzdTNACeJ65A +Wve5Ew2NO6P/0epYmhE9FuI= +=k59L -----END PGP SIGNATURE----- diff --git a/app-text/acroread/acroread-5.10.ebuild b/app-text/acroread/acroread-5.10.ebuild index fccfec997b62..e1d20e4bf6f7 100644 --- a/app-text/acroread/acroread-5.10.ebuild +++ b/app-text/acroread/acroread-5.10.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-text/acroread/acroread-5.10.ebuild,v 1.6 2005/03/25 17:13:26 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.10.ebuild,v 1.7 2005/03/28 15:54:53 usata Exp $ inherit nsplugins eutils @@ -17,8 +17,8 @@ RESTRICT="nostrip" DEPEND="virtual/libc >=sys-apps/sed-4" -RDEPEND="cjk? ( media-fonts/acroread-asianfonts ) - amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2-r1 )" +RDEPEND="amd64? ( >=app-emulation/emul-linux-x86-xlibs-1.2-r1 )" +PDEPEND="cjk? ( =media-fonts/acroread-asianfonts-5* )" PROVIDE="virtual/pdfviewer" INSTALLDIR=/opt/Acrobat5 diff --git a/app-text/acroread/acroread-7.0.ebuild b/app-text/acroread/acroread-7.0.ebuild index 1c6d5485a306..79b0d5f62dec 100644 --- a/app-text/acroread/acroread-7.0.ebuild +++ b/app-text/acroread/acroread-7.0.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-text/acroread/acroread-7.0.ebuild,v 1.6 2005/03/25 17:13:26 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.ebuild,v 1.7 2005/03/28 15:54:53 usata Exp $ inherit nsplugins eutils @@ -11,12 +11,13 @@ SRC_URI="ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/${PV}/enu/AdbeRdr${PV/.}_l LICENSE="Adobe" SLOT="0" KEYWORDS="-* ~x86 ~amd64" -IUSE="noplugin ldap" +IUSE="noplugin ldap cjk" RESTRICT="nostrip" RDEPEND="virtual/libc !amd64? ( ldap? ( net-nds/openldap )) amd64? ( >=app-emulation/emul-linux-x86-gtklibs-1.2-r1 )" +PDEPEND="cjk? ( =media-fonts/acroread-asianfonts-${PV}* )" PROVIDE="virtual/pdfviewer" INSTALLDIR=/opt/Acrobat7 @@ -78,10 +79,6 @@ pkg_postinst () { # fix wrong directory permissions (bug #25931) find ${INSTALLDIR} -type d | xargs chmod 755 || die - einfo "Asianfonts are not available separately for version 7 (yet)" - einfo "The workaround for the time being is to copy the 'Resource' directory from" - einfo "a windows machine with acrobat reader 7 and asian font support installed." - einfo einfo "The Acrobat(TM) Security Plugin will be enabled with USE=ldap, it" einfo "does not work with amd64 because there is no x86 ldap-emulation" einfo "package available in portage." -- cgit v1.2.3-65-gdbad