more sandbox violation fixes

5 files changed, 15 insertions, 89 deletions

diff --git a/app-text/gocr/ChangeLog b/app-text/gocr/ChangeLog
index 976e982b5a3d..4f8156755d5e 100644
--- a/app-text/gocr/ChangeLog
+++ b/app-text/gocr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/gocr
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.3 2002/06/29 14:57:40 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.4 2002/07/07 02:08:11 seemant Exp $
+
+*gocr-0.3.6-r2 (06 Jul 2002)
+
+  06 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gocr-0.3.6-r2.ebuild
+  files/digest-gocr-0.3.6-r2 :
+
+  real fix for sandbox violation
 
 *gocr-0.3.6-r1 (29 Jun 2002)
 
diff --git a/app-text/gocr/files/digest-gocr-0.3.6-r1 b/app-text/gocr/files/digest-gocr-0.3.6-r1
deleted file mode 100644
index 9dfd2823000b..000000000000
--- a/app-text/gocr/files/digest-gocr-0.3.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47dadd37fe434c9e33443288119878a5 gocr-0.3.6.tar.gz 668653
diff --git a/app-text/gocr/files/digest-gocr-0.3.6 b/app-text/gocr/files/digest-gocr-0.3.6-r2
index 9dfd2823000b..9dfd2823000b 100644
--- a/app-text/gocr/files/digest-gocr-0.3.6
+++ b/app-text/gocr/files/digest-gocr-0.3.6-r2
diff --git a/app-text/gocr/gocr-0.3.6-r1.ebuild b/app-text/gocr/gocr-0.3.6-r2.ebuild
index 4c668e9b564f..9b1a224690bb 100644
--- a/app-text/gocr/gocr-0.3.6-r1.ebuild
+++ b/app-text/gocr/gocr-0.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.6-r1.ebuild,v 1.2 2002/07/01 20:13:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.6-r2.ebuild,v 1.1 2002/07/07 02:08:11 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Converts PNM to ASCII"
@@ -13,8 +13,9 @@ DEPEND="${RDEPEND}
 	app-text/tetex
 	app-text/ghostscript"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL"
+KEYWORDS="x86"
 
 src_unpack() {
 
@@ -45,14 +46,16 @@ src_compile() {
 	make
 	make src frontend database
 	use tetex && ( \
-		addwrite "/usr/share/texmf"
 		make examples || die
 	)
 }
 
 src_install () {
 
-	einstall || die
+	addwrite "/usr/share/texmf"
+
+	make DESTDIR=${D} \
+		install || die
 #	dobin bin/gocr
 #	exeinto /usr/bin
 #	doexe bin/gocr.tcl
diff --git a/app-text/gocr/gocr-0.3.6.ebuild b/app-text/gocr/gocr-0.3.6.ebuild
deleted file mode 100644
index 060a7974efe8..000000000000
--- a/app-text/gocr/gocr-0.3.6.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.6.ebuild,v 1.1 2002/06/28 18:19:07 rphillips Exp $
-
-# this is just TEMPORARY until we can get to the core of the problem
-# The problem is in the generation of the fonts
-SANDBOX_DISABLED="1"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Converts PNM to ASCII"
-SRC_URI="mirror://sourceforge/jocr/${P}.tar.gz"
-HOMEPAGE="http://altmark.nat.uni-magdeburg.de/~jschulen/ocr/"
-
-DEPEND="virtual/glibc
-	app-text/tetex
-	app-text/ghostscript
-	>=media-libs/netpbm-9.12-r1"
-
-RDEPEND="virtual/glibc
-	>=media-libs/netpbm-9.12-r1"
-
-src_unpack() {
-
-	unpack ${A}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
-	cd ${S}
-	autoconf
-	cd ${S}/doc
-	cp Makefile.in Makefile.orig
-	sed -e "s:\$(DVIPS) \$?:\$(DVIPS) -o \$(OCRDOC).ps \$?:" \
-		Makefile.orig > Makefile.in
-	cd ../bin
-	mv gocr.tcl gocr.orig
-	sed -e "s:\.\./examples:/usr/share/gocr/fonts:" \
-		gocr.orig > gocr.tcl
-	cd ../src
-	cp database.c database.orig
-	sed -e "s:\./db/:${D}/usr/share/gocr/db/:" database.orig > database.c
-	cd ../examples
-	cp Makefile Makefile.orig
-	sed -e "s:polish.pbm man.pbm:polish.pbm:" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-	export CFLAGS="${CFLAGS} -I/usr/include/pbm"
-	./configure --prefix=/usr --host=${CHOST} || die
-	make src frontend database
-	use tetex && (\
-		make \ 
-		prefix=${D}/usr \
-        sysconfdir=/${D}/etc \
-        mandir=${D}/usr/share/man \
-        datadir=${D}/usr/share \					
-	 	 doc || die 
-	)
-}
-
-src_install () {
-
-	dobin bin/gocr
-	exeinto /usr/bin
-	doexe bin/gocr.tcl
-	dolib.a src/libPgm2asc.a
-	insinto /usr/include
-	doins src/gocr.h
-	insinto /usr/share/gocr/db
-	doins db/*
-	doman man/man1/gocr.1
-	dodoc AUTHORS BUGS CREDITS HISTORY README* REMARK.txt REVIEW TODO gpl.html
-	docinto txt
-	dodoc doc/*.txt
-
-	use tetex && ( \
-		insinto /usr/share/gocr/db
-		docinto ps
-		dodoc doc/ocr.ps
-	)
-
-}
-