cleanup

5 files changed, 48 insertions, 201 deletions

diff --git a/app-text/gocr/files/digest-gocr-0.3.1 b/app-text/gocr/files/digest-gocr-0.3.1
deleted file mode 100644
index 78e9ca071371..000000000000
--- a/app-text/gocr/files/digest-gocr-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38a7a1c36c4661a460e0ce9530af1d84 gocr-0.3.1.tar.gz 419341
diff --git a/app-text/gocr/files/digest-gocr-0.3.3 b/app-text/gocr/files/digest-gocr-0.3.3
deleted file mode 100644
index 1755302bf375..000000000000
--- a/app-text/gocr/files/digest-gocr-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1d6d47f6a95bcdf76cb034cbc337393d gocr-0.3.3.tar.gz 488730
diff --git a/app-text/gocr/gocr-0.3.1.ebuild b/app-text/gocr/gocr-0.3.1.ebuild
deleted file mode 100644
index 8954fb25bd9e..000000000000
--- a/app-text/gocr/gocr-0.3.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.1.ebuild,v 1.1 2001/04/28 11:59:27 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Converts PNM to ASCII"
-SRC_URI="http://download.sourceforge.net/jocr/${A}"
-HOMEPAGE="http://altmark.nat.uni-magdeburg.de/~jschulen/ocr/"
-
-DEPEND="virtual/glibc
-        app-text/tetex
-        app-text/ghostscript
-        >=media-libs/netpbm-9.10"
-
-RDEPEND="virtual/glibc
-        >=media-libs/netpbm-9.10"
-
-src_unpack() {
-
-  unpack ${A}
-  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/:/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() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make src frontend database
-    if [ "`use tex`" ]
-    then
-      try make examples doc
-    fi
-
-}
-
-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
-    if [ "`use tex`" ]
-    then 
-      doins examples/*.pbm
-      insinto /usr/share/gocr/db
-      docinto ps
-      dodoc doc/ocr.ps
-    fi
-
-}
-
diff --git a/app-text/gocr/gocr-0.3.3.ebuild b/app-text/gocr/gocr-0.3.3.ebuild
deleted file mode 100644
index 102c6fea8d43..000000000000
--- a/app-text/gocr/gocr-0.3.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.3.ebuild,v 1.1 2001/08/17 23:03:20 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Converts PNM to ASCII"
-SRC_URI="http://prdownloads.sourceforge.net/jocr/${A}"
-HOMEPAGE="http://altmark.nat.uni-magdeburg.de/~jschulen/ocr/"
-
-DEPEND="virtual/glibc
-        app-text/tetex
-        app-text/ghostscript
-        >=media-libs/netpbm-9.10"
-
-RDEPEND="virtual/glibc
-        >=media-libs/netpbm-9.10"
-
-src_unpack() {
-
-  unpack ${A}
-  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/:/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() {
-
-    try ./configure --prefix=/usr --host=${CHOST}
-    try make src frontend database
-    if [ "`use tex`" ]
-    then
-      try make examples doc
-    fi
-
-}
-
-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
-    if [ "`use tex`" ]
-    then 
-      doins examples/*.pbm
-      insinto /usr/share/gocr/db
-      docinto ps
-      dodoc doc/ocr.ps
-    fi
-
-}
-
diff --git a/app-text/gocr/gocr-0.3.4.ebuild b/app-text/gocr/gocr-0.3.4.ebuild
index b5877019ccff..c6d67aca945d 100644
--- a/app-text/gocr/gocr-0.3.4.ebuild
+++ b/app-text/gocr/gocr-0.3.4.ebuild
@@ -1,76 +1,73 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.4.ebuild,v 1.1 2001/11/06 13:41:47 achim Exp $
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.3.4.ebuild,v 1.2 2002/04/28 03:59:29 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Converts PNM to ASCII"
-SRC_URI="http://prdownloads.sourceforge.net/jocr/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/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"
+	app-text/tetex
+	app-text/ghostscript
+	>=media-libs/netpbm-9.12-r1"
 
 RDEPEND="virtual/glibc
-        >=media-libs/netpbm-9.12-r1"
+	>=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/:/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
+	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/:/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() {
 
-    try CFLAGS="$CFLAGS -I/usr/include/pbm" ./configure --prefix=/usr --host=${CHOST}
-    try make src frontend database
-    if [ "`use tex`" ]
-    then
-      try make doc
-    fi
+	export CFLAGS="${CFLAGS} -I/usr/include/pbm"
+	./configure --prefix=/usr --host=${CHOST} || die
+	make src frontend database
+	use tetex && make 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
-    if [ "`use tex`" ]
-    then 
-      insinto /usr/share/gocr/db
-      docinto ps
-      dodoc doc/ocr.ps
-    fi
+	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
+	)
 
 }