diff options
| -rw-r--r-- | app-text/gocr/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/gocr/files/gocr-0.40-as-needed.patch | 22 | ||||
| -rw-r--r-- | app-text/gocr/files/gocr-0.44-makefile.patch | 32 | ||||
| -rw-r--r-- | app-text/gocr/gocr-0.40-r2.ebuild | 62 | ||||
| -rw-r--r-- | app-text/gocr/gocr-0.44.ebuild | 59 |
5 files changed, 6 insertions, 176 deletions
diff --git a/app-text/gocr/ChangeLog b/app-text/gocr/ChangeLog index a3ce68ec11f9..49b0fd6bc999 100644 --- a/app-text/gocr/ChangeLog +++ b/app-text/gocr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/gocr # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.48 2008/01/26 17:02:46 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.49 2008/03/07 18:10:20 aballier Exp $ + + 07 Mar 2008; Alexis Ballier <aballier@gentoo.org> + -files/gocr-0.40-as-needed.patch, -files/gocr-0.44-makefile.patch, + -gocr-0.40-r2.ebuild, -gocr-0.44.ebuild: + remove unused versions *gocr-0.45 (26 Jan 2008) diff --git a/app-text/gocr/files/gocr-0.40-as-needed.patch b/app-text/gocr/files/gocr-0.40-as-needed.patch deleted file mode 100644 index c62df4c29428..000000000000 --- a/app-text/gocr/files/gocr-0.40-as-needed.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gocr-0.40/src/Makefile.in.orig 2006-05-07 16:06:35.000000000 +0200 -+++ gocr-0.40/src/Makefile.in 2006-05-07 16:09:10.000000000 +0200 -@@ -42,7 +42,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: -@@ -53,7 +54,7 @@ - all: $(PROGRAM) $(LIBPGMASCLIB) - --$(PROGRAM): $(LIBPGMASCLIB) gocr.o -- $(CC) -o $@ gocr.o $(LDFLAGS) -l$(PGMASCLIB) -+$(PROGRAM): $(LIBOBJS) gocr.o -+ $(CC) $(LDFLAGS) $(LIBOBJS) gocr.o $(LIBADD) -o $@ - if test -r $(PROGRAM); then cp $@ ../bin; fi - - diff --git a/app-text/gocr/files/gocr-0.44-makefile.patch b/app-text/gocr/files/gocr-0.44-makefile.patch deleted file mode 100644 index 0361c6663aad..000000000000 --- a/app-text/gocr/files/gocr-0.44-makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Nru gocr-0.44.orig/frontend/Makefile gocr-0.44/frontend/Makefile ---- gocr-0.44.orig/frontend/Makefile 2001-10-28 13:45:04.000000000 +0100 -+++ gocr-0.44/frontend/Makefile 2007-03-29 15:53:10.000000000 +0200 -@@ -11,5 +11,5 @@ - - - gnome/Makefile: gnome/configure -- (cd gnome;configure) -+ (cd gnome;./configure) - -diff -Nru gocr-0.44.orig/src/Makefile.in gocr-0.44/src/Makefile.in ---- gocr-0.44.orig/src/Makefile.in 2006-12-13 17:00:05.000000000 +0100 -+++ gocr-0.44/src/Makefile.in 2007-03-29 15:55:06.000000000 +0200 -@@ -45,7 +45,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) -@@ -57,7 +58,7 @@ - - $(PROGRAM): $(LIBPGMASCLIB) gocr.o - # make it conform to ld --as-needed -- $(CC) -o $@ gocr.o ./lib$(PGMASCLIB).a $(LDFLAGS) -+ $(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/gocr-0.40-r2.ebuild b/app-text/gocr/gocr-0.40-r2.ebuild deleted file mode 100644 index 76d5b9649c7b..000000000000 --- a/app-text/gocr/gocr-0.40-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.40-r2.ebuild,v 1.8 2007/06/26 01:43:36 mr_bones_ 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" - -IUSE="gtk doc" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" - -DEPEND=">=media-libs/netpbm-9.12 - doc? ( >=media-gfx/transfig-3.2 ) - gtk? ( =x11-libs/gtk+-1* - media-gfx/imagemagick )" - -DOCS="AUTHORS BUGS CREDITS HISTORY RE* TODO" - -src_unpack() { - - unpack ${A} - # fix for erroneous Makefile in frontend/ - cd "${S}"/frontend - sed -i -e "s/configure/\.\/configure/" Makefile - - # fix compilation with LDFLAGS="-Wl,--as-needed" - cd "${S}" - epatch "${FILESDIR}"/${P}-as-needed.patch || die "patch failed" - -} - -src_compile() { - - local mymakes="src man" - - use gtk && mymakes="${mymakes} frontend" - use doc && mymakes="${mymakes} doc examples" - - econf || die - make ${mymakes} || die - -} - -src_install() { - - make DESTDIR="${D}" prefix="/usr" exec_prefix="/usr" install || die - # install the gtk frontend - use gtk && dobin ${S}/frontend/gnome/src/gtk-ocr - # 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.44.ebuild b/app-text/gocr/gocr-0.44.ebuild deleted file mode 100644 index b75222feb2e1..000000000000 --- a/app-text/gocr/gocr-0.44.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.44.ebuild,v 1.2 2007/09/20 20:00:28 aballier 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" - -IUSE="gtk doc tk" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" - -DEPEND=">=media-libs/netpbm-9.12 - doc? ( >=media-gfx/transfig-3.2 virtual/ghostscript ) - gtk? ( =x11-libs/gtk+-1* - media-gfx/imagemagick ) - tk? ( dev-lang/tk )" - -DOCS="AUTHORS BUGS CREDITS HISTORY RE* TODO" - -src_unpack() { - - unpack ${A} - - epatch "${FILESDIR}/${P}-makefile.patch" -} - -src_compile() { - - local mymakes="src man" - - use gtk && mymakes="${mymakes} frontend" - 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 - # install the gtk frontend - use gtk && dobin "${S}"/frontend/gnome/src/gtk-ocr - # 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} - -} |