Adding german and english versions thanks to tuXXer <bs.net@gmx.de>, Jakub Moc <jakub.moc@seznam.cz>, Heinrich Wendel <lanius@gentoo.org> and Rafael Kolless <rafael@mondoria.de> in bug 92699. Fix startup bug with scim thanks to Clement Siuchung Cheung <sccheung@umich.edu> and Ulrich Plate <plate@gentoo.org> in bug 89766

(Portage version: 1.589-cvs)

5 files changed, 123 insertions, 2 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 38cf3e6a775b..8d317c015010 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,16 @@
 # 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.51 2005/05/14 18:27:56 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.52 2005/05/18 07:41:18 genstef Exp $
+
+*acroread-7.0.0.2-r1 (18 May 2005)
+
+  18 May 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/acroread-scim.patch, +acroread-7.0.0.2-r1.ebuild:
+  Adding german and english versions thanks to tuXXer <bs.net@gmx.de>, Jakub
+  Moc <jakub.moc@seznam.cz>, Heinrich Wendel <lanius@gentoo.org> and Rafael
+  Kolless <rafael@mondoria.de> in bug 92699. Fix startup bug with scim thanks
+  to Clement Siuchung Cheung <sccheung@umich.edu> and Ulrich Plate
+  <plate@gentoo.org> in bug 89766
 
 *acroread-7.0.0.2 (14 May 2005)
 
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 19296e5e6322..25494d95c0e9 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,8 +1,11 @@
 MD5 941cef678a8716928d50825cc5ebcbf4 acroread-7.0.ebuild 2242
 MD5 5b5f9119fe3b2a9644cd0730e9ed9ded acroread-5.10.ebuild 2488
+MD5 b59bd8f36c902572ffa3edb0794e494c acroread-7.0.0.2-r1.ebuild 2475
 MD5 5e50e42bc0f54eaf552b0e8d4dd43359 acroread-7.0.0.2.ebuild 2192
-MD5 cc8b9d2a102bdf0dddfd803fa73801c9 ChangeLog 8783
+MD5 eb7ec6d3135205bc89e7601f4bac4b13 ChangeLog 9264
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
+MD5 534bf3895fb743626befc0077a1e5004 files/digest-acroread-7.0.0.2-r1 237
 MD5 d0981fc5a58874b78a6f2a2b73d3e43d files/digest-acroread-5.10 63
 MD5 a0a63a0ea609625aa0bfe86919510102 files/digest-acroread-7.0.0.2 79
 MD5 c54a04836864a99a8792ef5817a968c1 files/digest-acroread-7.0 73
+MD5 00414d6be2296740cc5225ca93a3d035 files/acroread-scim.patch 488
diff --git a/app-text/acroread/acroread-7.0.0.2-r1.ebuild b/app-text/acroread/acroread-7.0.0.2-r1.ebuild
new file mode 100644
index 000000000000..49df33d7b1f1
--- /dev/null
+++ b/app-text/acroread/acroread-7.0.0.2-r1.ebuild
@@ -0,0 +1,87 @@
+# 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-r1.ebuild,v 1.1 2005/05/18 07:41:18 genstef Exp $
+
+inherit nsplugins eutils rpm versionator
+
+DESCRIPTION="Adobe's PDF reader"
+HOMEPAGE="http://www.adobe.com/products/acrobat/"
+SRC_HEAD="ftp://ftp.adobe.com/pub/adobe/reader/unix/7x/7.0"
+SRC_FOOT="-$(replace_version_separator 3 "-").i386.rpm"
+SRC_URI="			linguas_de? ( ${SRC_HEAD}/deu/AdobeReader_deu${SRC_FOOT} )
+	!linguas_de? (  linguas_fr? ( ${SRC_HEAD}/fra/AdobeReader_fra${SRC_FOOT} ))
+	!linguas_de? ( !linguas_fr? ( ${SRC_HEAD}/enu/AdobeReader_enu${SRC_FOOT} ))"
+LICENSE="Adobe"
+SLOT="0"
+KEYWORDS="-* ~x86 ~amd64"
+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-7.0* )"
+PROVIDE="virtual/pdfviewer"
+
+INSTALLDIR=/opt/Acrobat7
+
+S=${WORKDIR}/usr/local/Adobe/Acrobat7.0
+
+# x86 binary package, ABI=x86
+# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
+has_multilib_profile && ABI="x86"
+
+src_unpack() {
+	rpm_src_unpack
+	cd ${S}
+	epatch ${FILESDIR}/acroread-scim.patch
+}
+
+src_install() {
+	local i
+
+	cp Resource/Support/AdobeReader_KDE.desktop AdobeReader.desktop
+	domenu AdobeReader.desktop
+	doicon Resource/Icons/AdobeReader.png
+
+	dodir ${INSTALLDIR}
+	DIRS="Reader Resource"
+	for i in ${DIRS}
+	do
+		if [ -d ${i} ] ; then
+			chown -R --dereference root:root ${i}
+			mv ${i} ${D}${INSTALLDIR}
+		fi
+	done
+
+	exeinto ${INSTALLDIR}
+	doexe bin/acroread || die "doexe failed"
+	dodoc Browser/Browser_Plugin_HowTo.txt
+
+	if ! use noplugin ; then
+		exeinto /opt/netscape/plugins
+		doexe Browser/intellinux/nppdf.so
+		inst_plugin /opt/netscape/plugins/nppdf.so
+	fi
+
+	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
+		rm ${D}${INSTALLDIR}/Reader/intellinux/plug_ins/PPKLite.api
+	fi
+
+	dodir /usr/bin
+	dosym ${INSTALLDIR}/acroread /usr/bin/acroread
+}
+
+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."
+}
diff --git a/app-text/acroread/files/acroread-scim.patch b/app-text/acroread/files/acroread-scim.patch
new file mode 100644
index 000000000000..518d7b306603
--- /dev/null
+++ b/app-text/acroread/files/acroread-scim.patch
@@ -0,0 +1,18 @@
+This patch was taken from http://bugs.gentoo.org/show_bug.cgi?id=89766#c6
+
+It fixes startup with scim thanks to Clement Siuchung Cheung <sccheung@umich.edu>
+
+--- Acrobat7.0/bin/acroread	2005-05-18 09:05:35.000000000 +0200
++++ Acrobat7.0/bin/acroread	2005-05-18 09:06:29.000000000 +0200
+@@ -255,6 +255,11 @@
+ 	fi
+ fi
+ 
++if [ "$GTK_IM_MODULE" = "scim" ]; then
++	GTK_IM_MODULE=xim
++	export GTK_IM_MODULE
++fi
++
+ if [ "$1" = "-DEBUG" ] ; then
+   if [ $# = 1 ] ; then
+     export ACRO_EXEC_CMD
diff --git a/app-text/acroread/files/digest-acroread-7.0.0.2-r1 b/app-text/acroread/files/digest-acroread-7.0.0.2-r1
new file mode 100644
index 000000000000..3d88818c9721
--- /dev/null
+++ b/app-text/acroread/files/digest-acroread-7.0.0.2-r1
@@ -0,0 +1,3 @@
+MD5 a06081e7ee88523c9a2608e647d56eb5 AdobeReader_deu-7.0.0-2.i386.rpm 44130150
+MD5 51f587962e132448a162d28a30f2e58f AdobeReader_fra-7.0.0-2.i386.rpm 43685825
+MD5 386dd54cb91014f1e631764ba10deef7 AdobeReader_enu-7.0.0-2.i386.rpm 39263484