utf-8 fix0r

6 files changed, 46 insertions, 21 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index 6f1a4427e233..514b38c7fcfa 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/acroread
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.18 2003/02/12 05:21:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.19 2003/02/16 12:15:38 seemant Exp $
+
+*acroread-5.06-r3 (16 Feb 2003)
+
+  16 Feb 2003; Seemant Kulleen <seemant@gentoo.org> acroread-5.06-r1.ebuild acroread-5.06-r2.ebuild acroread-5.06-r3.ebuild files/acroread-utf8-gentoo.diff files/digest-acroread-5.06-r3 :
+  patch to allow acroread to function in a UTF-8 environment.  thanks to: Markus Bertheau <ska-fan@gentoo.org>
 
 *acroread-5.06-r2 (21 Nov 2002)
 
diff --git a/app-text/acroread/acroread-5.06-r1.ebuild b/app-text/acroread/acroread-5.06-r1.ebuild
index ccf56796104f..f31937d3fa1e 100644
--- a/app-text/acroread/acroread-5.06-r1.ebuild
+++ b/app-text/acroread/acroread-5.06-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.06-r1.ebuild,v 1.8 2003/02/13 09:32:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.06-r1.ebuild,v 1.9 2003/02/16 12:15:38 seemant Exp $
 
 MY_P=linux-${PV/./}
 S=${WORKDIR}
@@ -11,7 +11,7 @@ IUSE="mozilla"
 
 SLOT="0"
 LICENSE="Adobe"
-KEYWORDS="x86 -ppc"
+KEYWORDS="x86 -ppc -sparc -alpha -mips -hppa -arm"
 
 RESTRICT="nostrip"
 
diff --git a/app-text/acroread/acroread-5.06-r2.ebuild b/app-text/acroread/acroread-5.06-r2.ebuild
index 31b415813dbe..9ebd5e98c727 100644
--- a/app-text/acroread/acroread-5.06-r2.ebuild
+++ b/app-text/acroread/acroread-5.06-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.06-r2.ebuild,v 1.4 2003/02/13 09:32:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.06-r2.ebuild,v 1.5 2003/02/16 12:15:38 seemant Exp $
 
 inherit nsplugins
 
@@ -13,7 +13,7 @@ IUSE=""
 
 SLOT="0"
 LICENSE="Adobe"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
 
 RESTRICT="nostrip"
 DEPEND="virtual/glibc"
diff --git a/app-text/acroread/acroread-5.06.ebuild b/app-text/acroread/acroread-5.06-r3.ebuild
index 5c4608760c91..007d89f36b23 100644
--- a/app-text/acroread/acroread-5.06.ebuild
+++ b/app-text/acroread/acroread-5.06-r3.ebuild
@@ -1,29 +1,33 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.06.ebuild,v 1.5 2003/02/13 09:32:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.06-r3.ebuild,v 1.1 2003/02/16 12:15:38 seemant Exp $
+
+inherit nsplugins eutils
 
 MY_P=linux-${PV/./}
 S=${WORKDIR}
 DESCRIPTION="Adobe's PDF reader"
 SRC_URI="ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/5.x/${MY_P}.tar.gz"
 HOMEPAGE="http://www.adobe.com/products/acrobat/"
-IUSE="mozilla"
-
-DEPEND="virtual/glibc"
+IUSE=""
 
 SLOT="0"
 LICENSE="Adobe"
-KEYWORDS="x86 -ppc"
+KEYWORDS="~x86 -ppc -sparc -alpha -mips -hppa -arm"
 
+RESTRICT="nostrip"
+DEPEND="virtual/glibc"
 INSTALLDIR=/opt/Acrobat5
 
 src_compile () {
 	
-	tar xvf LINUXRDR.TAR
-	tar xvf COMMON.TAR
+	tar -xvf LINUXRDR.TAR --no-same-owner
+	tar -xvf COMMON.TAR --no-same-owner
 
 	sed -e "s:REPLACE_ME:${INSTALLDIR}/Reader:" \
 		bin/acroread.sh > acroread
+	
+	epatch ${FILESDIR}/acroread-utf8-gentoo.diff
 }
 
 src_install () {
@@ -31,10 +35,17 @@ src_install () {
 	dodir ${INSTALLDIR}
 	for i in Browsers Reader Resource
 	do
-		chown -R root.root ${i}
-		cp -a ${i} ${D}${INSTALLDIR}
+		if [ -d ${i} ] ; then
+		chown -R --dereference root.root ${i}
+		cp -Rd ${i} ${D}${INSTALLDIR}
+		fi
 	done
 	
+
+	mv acroread acroread.sed
+	sed -e "s:\$PROG =.*:\$PROG = '${INSTALLDIR}/acroread.real':" \
+		acroread.sed > acroread
+	
 	exeinto ${INSTALLDIR}
 	doexe acroread
 	dodoc README LICREAD.TXT
@@ -46,11 +57,5 @@ src_install () {
 	echo -e "PATH=${INSTALLDIR}\nROOTPATH=${INSTALLDIR}" > \
 		${D}/etc/env.d/10acroread5
 
-	#mozilla compatibility contributed by m3thos@netcabo.pt(Miguel Sousa Filipe)
-	use mozilla && ( \
-		dodir /usr/lib/mozilla/plugins
-		dosym \
-			${INSTALLDIR}/Browsers/intellinux/nppdf.so \
-				/usr/lib/mozilla/plugins/nppdf.so
-	)
+	inst_plugin ${INSTALLDIR}/Browsers/intellinux/nppdf.so
 }
diff --git a/app-text/acroread/files/acroread-utf8-gentoo.diff b/app-text/acroread/files/acroread-utf8-gentoo.diff
new file mode 100644
index 000000000000..9a140a9715ad
--- /dev/null
+++ b/app-text/acroread/files/acroread-utf8-gentoo.diff
@@ -0,0 +1,15 @@
+--- acroread.old	2003-02-16 04:12:58.000000000 -0800
++++ acroread	2003-02-16 04:13:53.000000000 -0800
+@@ -289,6 +289,12 @@
+     ;;
+ esac
+ 
++# Set the locale to something generic because it won't 
++# run under a UTF-8 locale and doesn't support localization
++# anyway.
++
++export LANG=POSIX
++
+ #
+ # Set the command.  Process any debug flags and exec.
+ #
diff --git a/app-text/acroread/files/digest-acroread-5.06 b/app-text/acroread/files/digest-acroread-5.06-r3
index 0d5fb1bbd8c3..0d5fb1bbd8c3 100644
--- a/app-text/acroread/files/digest-acroread-5.06
+++ b/app-text/acroread/files/digest-acroread-5.06-r3