diff options
| author |   Herbie Hopkins <herbs@gentoo.org> | 2005-08-04 22:50:16 +0000 |
|---|---|---|
| committer | Herbie Hopkins <herbs@gentoo.org> | 2005-08-04 22:50:16 +0000 |
| commit | e7a539c18e1732c546fff61dd60481858efc4295 (patch) | |
| tree | d899d9770238a1d82e1f4e1d23182de4248513ee /app-text/acroread | |
| parent | Marked ~amd64. (diff) | |
| download | gentoo-2-e7a539c18e1732c546fff61dd60481858efc4295.tar.gz gentoo-2-e7a539c18e1732c546fff61dd60481858efc4295.tar.bz2 gentoo-2-e7a539c18e1732c546fff61dd60481858efc4295.zip | |
Don't disable security plugin on amd64.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'app-text/acroread')
| -rw-r--r-- | app-text/acroread/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/acroread/Manifest | 4 | ||||
| -rw-r--r-- | app-text/acroread/acroread-7.0.0.2-r2.ebuild | 19 |
3 files changed, 16 insertions, 13 deletions
diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog index 6abe493d6636..faffb6ca3328 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.57 2005/07/24 12:52:12 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.58 2005/08/04 22:50:16 herbs Exp $ + + 04 Aug 2005; Herbie Hopkins <herbs@gentoo.org> acroread-7.0.0.2-r2.ebuild: + Don't disable security plugin on amd64 any more since we have openldap in + >=emul-baselibs-2. 24 Jul 2005; Stefan Schweizer <genstef@gentoo.org> acroread-7.0.0.2-r2.ebuild: diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest index 3330adb96c96..2bdf1b7b972c 100644 --- a/app-text/acroread/Manifest +++ b/app-text/acroread/Manifest @@ -1,6 +1,6 @@ -MD5 6c79576d10bf02070be5537a7bd1accc acroread-7.0.0.2-r2.ebuild 2734 +MD5 9c519392d8cbf8fc84128d5c92e8cde4 acroread-7.0.0.2-r2.ebuild 2659 MD5 5b5f9119fe3b2a9644cd0730e9ed9ded acroread-5.10.ebuild 2488 -MD5 903159b740f1ea52349f2539fb1ba1f9 ChangeLog 10334 +MD5 d5ea282e05971273e976860e3480c589 ChangeLog 10509 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161 MD5 26bef9104ff02da783b459c37981f406 files/digest-acroread-7.0.0.2-r2 553 MD5 d0981fc5a58874b78a6f2a2b73d3e43d files/digest-acroread-5.10 63 diff --git a/app-text/acroread/acroread-7.0.0.2-r2.ebuild b/app-text/acroread/acroread-7.0.0.2-r2.ebuild index 8ce69e40cf47..f4a36b4e7760 100644 --- a/app-text/acroread/acroread-7.0.0.2-r2.ebuild +++ b/app-text/acroread/acroread-7.0.0.2-r2.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.0.2-r2.ebuild,v 1.4 2005/07/24 12:52:12 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.0.2-r2.ebuild,v 1.5 2005/08/04 22:50:16 herbs Exp $ inherit nsplugins eutils rpm versionator @@ -21,10 +21,11 @@ KEYWORDS="-* amd64 x86" IUSE="mozilla ldap" RESTRICT="nostrip" -RDEPEND="!amd64? ( virtual/libc - >=x11-libs/gtk+-2.0 - ldap? ( net-nds/openldap ) ) - amd64? ( >=app-emulation/emul-linux-x86-gtklibs-1.2-r1 )" +RDEPEND="virtual/libc + !amd64? ( >=x11-libs/gtk+-2.0 + ldap? ( net-nds/openldap ) ) + amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.0 + >=app-emulation/emul-linux-x86-gtklibs-2.0 )" PROVIDE="virtual/pdfviewer" INSTALLDIR=/opt/Acrobat7 @@ -70,10 +71,10 @@ src_install() { if use amd64 ; then # Work around buggy 32bit glibc on amd64, bug 77229 - dosed "3i\export GCONV_PATH=\"/usr/lib32/gconv\"" ${INSTALLDIR}/acroread + dosed "3i\export GCONV_PATH=\"/usr/$(get_libdir)/gconv\"" ${INSTALLDIR}/acroread fi - if use amd64 || ! use ldap ; then + if ! use ldap ; then rm ${D}${INSTALLDIR}/Reader/intellinux/plug_ins/PPKLite.api fi @@ -85,7 +86,5 @@ pkg_postinst () { # fix wrong directory permissions (bug #25931) find ${INSTALLDIR} -type d | xargs chmod 755 || die - 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." + einfo "The Acrobat(TM) Security Plugin will be enabled with USE=ldap" } |