more fix0rs

5 files changed, 15 insertions, 62 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index a54079738f1c..5b39a00657c5 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/acroread
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.6 2002/05/25 21:56:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.7 2002/06/03 11:53:39 seemant Exp $
+
+*acroread-5.05-r3 (3 Jun 2002)
+
+  3 Jun 2002; Seemant Kulleen <seemant@gentoo.org> acroread-5.05-r3.ebuild
+  files/digest-acroread-5.05-r3 :
+
+  Ownership and permission fixes.  This closes bug #3260 by
+  gentoo-bugs@devrieze.net (Paul de Vrieze)
 
 *acroread-5.05-r2 (25 May 2002)
 
diff --git a/app-text/acroread/acroread-5.05-r1.ebuild b/app-text/acroread/acroread-5.05-r1.ebuild
deleted file mode 100644
index a21e779c41a7..000000000000
--- a/app-text/acroread/acroread-5.05-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: system@gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.05-r1.ebuild,v 1.1 2002/05/24 08:51:44 seemant Exp $
-
-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/"
-
-DEPEND="virtual/glibc"
-RDEPEND="virtual/x11"
-
-LICENSE="Adobe"
-
-INSTALLDIR=/opt/Acrobat5
-
-src_compile () {
-	
-	tar xvf LINUXRDR.TAR
-	tar xvf COMMON.TAR
-
-	sed -e "s:REPLACE_ME:${INSTALLDIR}/Reader:" \
-		bin/acroread.sh > acroread
-}
-
-src_install () {
-
-	dodir ${INSTALLDIR}
-	for i in Browsers Reader Resource
-	do
-		cp -a ${S}/${i} ${D}/${INSTALLDIR}
-	done
-
-	exeinto ${INSTALLDIR}
-	doexe acroread
-	dodoc README LICREAD.TXT MANIFEST
-	into /opt/netscape/plugins
-	dosym ${INSTALLDIR}/Browsers/intellinux/nppdf.so /opt/netscape/plugins
-
-	#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
-
-	#mozilla compatibility contributed by m3thos@netcabo.pt(Miguel Sousa Filipe)
-	if use mozilla; then
-		into /usr/lib/mozilla/plugins
-		dosym \
-			${INSTALLDIR}/intellinux/nppdf.so \
-			/usr/lib/mozilla/plugins/nppdf.so
-	fi
-}
diff --git a/app-text/acroread/acroread-5.05-r2.ebuild b/app-text/acroread/acroread-5.05-r3.ebuild
index 9c9e15b4158f..24b192bc593d 100644
--- a/app-text/acroread/acroread-5.05-r2.ebuild
+++ b/app-text/acroread/acroread-5.05-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: system@gentoo.org
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.05-r2.ebuild,v 1.1 2002/05/25 21:56:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.05-r3.ebuild,v 1.1 2002/06/03 11:53:39 seemant Exp $
 
 MY_P=linux-${PV/./}
 S=${WORKDIR}
@@ -30,7 +30,8 @@ src_install () {
 	dodir ${INSTALLDIR}
 	for i in Browsers Reader Resource
 	do
-		cp -a ${S}/${i} ${D}/${INSTALLDIR}
+		insinto ${INSTALLDIR}
+		doins ${i}/*
 	done
 
 	exeinto ${INSTALLDIR}
@@ -38,17 +39,16 @@ src_install () {
 	dodoc README LICREAD.TXT MANIFEST
 	into /opt/netscape/plugins
 	dosym ${INSTALLDIR}/Browsers/intellinux/nppdf.so /opt/netscape/plugins
-
+	
 	#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
 
 	#mozilla compatibility contributed by m3thos@netcabo.pt(Miguel Sousa Filipe)
-	if use mozilla; then
-		into /usr/lib/mozilla/plugins
+	use mozilla && ( \
 		dosym \
 			${INSTALLDIR}/Browsers/intellinux/nppdf.so \
 				/usr/lib/mozilla/plugins/nppdf.so
-	fi
+	)
 }
diff --git a/app-text/acroread/files/digest-acroread-5.05-r2 b/app-text/acroread/files/digest-acroread-5.05-r2
deleted file mode 100644
index 1b87e159ed8a..000000000000
--- a/app-text/acroread/files/digest-acroread-5.05-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c1cef0b5b1eb75ed01fefb3d6a88ce0 linux-505.tar.gz 9280449
diff --git a/app-text/acroread/files/digest-acroread-5.05-r1 b/app-text/acroread/files/digest-acroread-5.05-r3
index 1b87e159ed8a..1b87e159ed8a 100644
--- a/app-text/acroread/files/digest-acroread-5.05-r1
+++ b/app-text/acroread/files/digest-acroread-5.05-r3