Ebuild cleanup, version 0.7 bug 85226, adding ldap use-flag for bug 85297 thanks to Lee Trager <nukem@users.xeroprj.org> and devinkinder@comcast.net, removing asainfonts DEPEND, thanks to Chin Yee <polar88bear@hotmail.com> in bug 85343. Thanks to Herbie Hopkins and others.

Package-Manager: portage-1.585-cvs

3 files changed, 33 insertions, 12 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index fd1c48f09175..aef1ffcde3c6 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,12 @@
 # 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.45 2005/03/14 21:27:05 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.46 2005/03/15 19:21:03 genstef Exp $
+
+  15 Mar 2005; Stefan Schweizer <genstef@gentoo.org> acroread-7.0.ebuild:
+  Ebuild cleanup, version 0.7 bug 85226, adding ldap use-flag for bug 85297
+  thanks to Lee Trager <nukem@users.xeroprj.org> and devinkinder@comcast.net,
+  removing asainfonts DEPEND, thanks to Chin Yee <polar88bear@hotmail.com> in
+  bug 85343. Thanks to Herbie Hopkins and others.
 
 *acroread-7.0 (14 Mar 2005)
 
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 32eec15eca19..4177fa4582b7 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,6 +1,6 @@
-MD5 8eed919867f8745e9cb280c3527a92ad acroread-7.0.ebuild 1796
+MD5 5c746db18a28f7c3e7bbf918da6e800a acroread-7.0.ebuild 2495
 MD5 280de59e14d75551c2810de7b332058f acroread-5.10.ebuild 2365
-MD5 12ff926b8015c941d355dc8404fe05c2 ChangeLog 7573
+MD5 b64bb3e89f70617339ced09aeae493fb ChangeLog 7930
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 MD5 d0981fc5a58874b78a6f2a2b73d3e43d files/digest-acroread-5.10 63
 MD5 c54a04836864a99a8792ef5817a968c1 files/digest-acroread-7.0 73
diff --git a/app-text/acroread/acroread-7.0.ebuild b/app-text/acroread/acroread-7.0.ebuild
index 2af2f7c55d22..c4d7a9f3c2de 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.2 2005/03/14 21:33:29 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.ebuild,v 1.3 2005/03/15 19:21:03 genstef Exp $
 
 inherit nsplugins eutils
 
@@ -10,12 +10,13 @@ SRC_URI="ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/${PV}/enu/AdbeRdr${PV/.}_l
 
 LICENSE="Adobe"
 SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE="cjk noplugin"
+KEYWORDS="-* ~x86 ~amd64"
+IUSE="noplugin ldap"
 RESTRICT="nostrip"
 
-DEPEND="virtual/libc"
-RDEPEND="cjk? ( media-fonts/acroread-asianfonts )"
+RDEPEND="virtual/libc
+	!amd64? ( ldap? ( net-nds/openldap ))
+	amd64? ( >=app-emulation/emul-linux-x86-gtklibs-1.2-r1 )"
 PROVIDE="virtual/pdfviewer"
 
 INSTALLDIR=/opt/Acrobat7
@@ -57,11 +58,17 @@ src_install() {
 		inst_plugin ${INSTALLDIR}/Browser/intellinux/nppdf.so
 	fi
 
-	#dynamic environment by T.Henderson@cs.ucl.ac.uk (Tristan Henderson)
-	dodir /etc/env.d
-	echo -e "PATH=${INSTALLDIR}\nROOTPATH=${INSTALLDIR}" > \
-		${D}/etc/env.d/10acroread5
+	if use amd64 ; then
+		# Work around buggy 32bit glibc on amd64, bug 77229
+		dosed  "3i\export GCONV_PATH=\"/usr/lib32/gconv\"" ${INSTALLDIR}/acroread
+	fi
+
+	if use amd64 || ! use ldap ; then
+		mv ${D}${INSTALLDIR}/Reader/intellinux/plug_ins/PPKLite.api \
+			${D}${INSTALLDIR}/Reader/intellinux/plug_ins/PPKLite.api.disabled
+	fi
 
+	dosym ${INSTALLDIR}/acroread /usr/bin/acroread
 }
 
 pkg_postinst () {
@@ -69,4 +76,12 @@ pkg_postinst () {
 	find ${INSTALLDIR} -type d | xargs chmod 755 || die
 
 	einfo "The browser plugin does not work on firefox 1.0.1 (yet)"
+	einfo
+	einfo "Asianfonts are not avaiable seperately for version 7 (yet)"
+	einfo "The work around 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 there is no x86 ldap-emulation"
+	einfo "package available in portage."
 }