remove old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

6 files changed, 7 insertions, 164 deletions

diff --git a/app-text/gocr/ChangeLog b/app-text/gocr/ChangeLog
index 0df18f044553..a00c2dbacc1b 100644
--- a/app-text/gocr/ChangeLog
+++ b/app-text/gocr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gocr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.60 2010/02/28 20:08:37 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.61 2010/06/11 19:09:30 aballier Exp $
+
+  11 Jun 2010; Alexis Ballier <aballier@gentoo.org>
+  -files/gocr-0.43-makefile.patch, -gocr-0.46.ebuild,
+  -files/gocr-0.46-makefile.patch, -gocr-0.47.ebuild,
+  -files/gocr-0.47-makefile.patch:
+  remove old
 
 *gocr-0.48 (28 Feb 2010)
 
diff --git a/app-text/gocr/files/gocr-0.43-makefile.patch b/app-text/gocr/files/gocr-0.43-makefile.patch
deleted file mode 100644
index 946f1ffdcf1a..000000000000
--- a/app-text/gocr/files/gocr-0.43-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -Nru gocr-0.43.orig/frontend/Makefile gocr-0.43/frontend/Makefile
---- gocr-0.43.orig/frontend/Makefile	2007-01-20 11:07:44.000000000 +0200
-+++ gocr-0.43/frontend/Makefile	2007-01-20 11:07:20.000000000 +0200
-@@ -11,5 +11,5 @@
- 
- 
- gnome/Makefile: gnome/configure
--	(cd gnome;configure)
-+	(cd gnome;./configure)
- 
-diff -Nru gocr-0.43.orig/src/Makefile.in gocr-0.43/src/Makefile.in
---- gocr-0.43.orig/src/Makefile.in	2006-10-31 13:20:09.000000000 +0200
-+++ gocr-0.43/src/Makefile.in	2007-01-20 11:10:46.000000000 +0200
-@@ -43,7 +43,8 @@
- CPPFLAGS=@CPPFLAGS@
- # to see the config.h
- CFLAGS=@CFLAGS@ $(CPPFLAGS) -I../include $(DEFS)
--LDFLAGS=@LDFLAGS@ @LIBS@ -L.
-+LDFLAGS=@LDFLAGS@
-+LIBADD=@LIBS@
- DESTDIR=@prefix@
- 
- .c.o: $(INCLUDEFILES)
-@@ -54,7 +55,7 @@
- all: $(PROGRAM) $(LIBPGMASCLIB)
- 
- $(PROGRAM): $(LIBPGMASCLIB) gocr.o
--	$(CC) -o $@ gocr.o $(LDFLAGS) ./lib$(PGMASCLIB).a
-+	$(CC) $(LDFLAGS) gocr.o ./lib$(PGMASCLIB).a $(LIBADD) -o $@
- 	if test -r $(PROGRAM); then cp $@ ../bin; fi
- 
- gocr.o: gocr.h Makefile
diff --git a/app-text/gocr/files/gocr-0.46-makefile.patch b/app-text/gocr/files/gocr-0.46-makefile.patch
deleted file mode 100644
index 5d14e8398a67..000000000000
--- a/app-text/gocr/files/gocr-0.46-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gocr-0.46/src/Makefile.in	2008-02-05 22:20:44.000000000 +0100
-+++ gocr-0.46/src/Makefile.in.new	2008-10-22 20:55:41.000000000 +0200
-@@ -48,7 +48,8 @@
- CPPFLAGS=@CPPFLAGS@
- # to see the config.h
- CFLAGS=@CFLAGS@ $(CPPFLAGS) -I../include $(DEFS)
--LDFLAGS=@LDFLAGS@ @LIBS@ -L.
-+LDFLAGS=@LDFLAGS@
-+LIBADD=@LIBS@
- DESTDIR=@prefix@
- 
- .c.o: gocr.h pgm2asc.h ../include/config.h
-@@ -67,7 +68,7 @@
- $(PROGRAM): $(LIBOBJS) gocr.o
- 	# make it conform to ld --as-needed
- 	#$(CC) -o $@ gocr.o ./lib$(PGMASCLIB).a $(LDFLAGS)
--	$(CC) -o $@ gocr.o $(LIBOBJS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) gocr.o $(LIBOBJS) $(LIBADD) -o $@
- 	if test -r $(PROGRAM); then cp $@ ../bin; fi
- #$(LIBPGMASCLIB): $(LIBOBJS)
- #	-rm -f $@
diff --git a/app-text/gocr/files/gocr-0.47-makefile.patch b/app-text/gocr/files/gocr-0.47-makefile.patch
deleted file mode 100644
index 0614bcd79111..000000000000
--- a/app-text/gocr/files/gocr-0.47-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gocr-0.47/src/Makefile.in
-===================================================================
---- gocr-0.47.orig/src/Makefile.in
-+++ gocr-0.47/src/Makefile.in
-@@ -78,7 +78,7 @@ gocr.o: gocr.h Makefile ../include/versi
- $(PROGRAM): $(LIBOBJS) gocr.o
- 	# make it conform to ld --as-needed
- 	#$(CC) -o $@ $(LDFLAGS) gocr.o ./lib$(PGMASCLIB).a $(LIBS)
--	$(CC) -o $@ gocr.o $(LIBOBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $@ gocr.o $(LIBOBJS) $(LIBS)
- 	if test -r $(PROGRAM); then cp $@ ../bin; fi
- 
- libs: lib$(PGMASCLIB).a lib$(PGMASCLIB).@PACKAGE_VERSION@.so
diff --git a/app-text/gocr/gocr-0.46.ebuild b/app-text/gocr/gocr-0.46.ebuild
deleted file mode 100644
index c048fd9bc3b1..000000000000
--- a/app-text/gocr/gocr-0.46.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.46.ebuild,v 1.3 2010/02/28 20:08:37 billie Exp $
-
-inherit eutils
-
-DESCRIPTION="An OCR (Optical Character Recognition) reader"
-HOMEPAGE="http://jocr.sourceforge.net"
-SRC_URI="mirror://sourceforge/jocr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc tk"
-
-DEPEND=">=media-libs/netpbm-9.12
-	doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
-	tk? ( dev-lang/tk )"
-
-DOCS="AUTHORS BUGS CREDITS HISTORY RE* TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	local mymakes="src man"
-
-	use doc && mymakes="${mymakes} doc examples"
-
-	econf || die "econf failed"
-	emake ${mymakes} || die "make ${mymakes} failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="/usr"  exec_prefix="/usr" install || die "make install failed"
-	# remove the tk frontend if tk is not selected
-	use tk || rm "${D}"/usr/bin/gocr.tcl
-	# and install the documentation and examples
-	if use doc ; then
-		DOCS="${DOCS} doc/gocr.html doc/examples.txt doc/unicode.txt"
-		insinto /usr/share/doc/${P}/examples
-		doins "${S}"/examples/*.{fig,tex,pcx}
-	fi
-	# and then install all the docs
-	dodoc ${DOCS}
-}
diff --git a/app-text/gocr/gocr-0.47.ebuild b/app-text/gocr/gocr-0.47.ebuild
deleted file mode 100644
index c7b55bcb189e..000000000000
--- a/app-text/gocr/gocr-0.47.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.47.ebuild,v 1.3 2010/02/22 20:58:34 abcd Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="An OCR (Optical Character Recognition) reader"
-HOMEPAGE="http://jocr.sourceforge.net"
-SRC_URI="mirror://sourceforge/jocr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="doc tk"
-
-DEPEND=">=media-libs/netpbm-9.12
-	doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
-	tk? ( dev-lang/tk )"
-
-DOCS="AUTHORS BUGS CREDITS HISTORY RE* TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	local mymakes="src man"
-
-	use doc && mymakes="${mymakes} doc examples"
-
-	emake ${mymakes} || die "make ${mymakes} failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr"  exec_prefix="${EPREFIX}/usr" install || die "make install failed"
-	# remove the tk frontend if tk is not selected
-	use tk || rm "${ED}"/usr/bin/gocr.tcl
-	# and install the documentation and examples
-	if use doc ; then
-		DOCS="${DOCS} doc/gocr.html doc/examples.txt doc/unicode.txt"
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/examples/*.{fig,tex,pcx}
-	fi
-	# and then install all the docs
-	dodoc ${DOCS}
-}