version bump, thanks to Ed Davison for the report and Daniel Pielmeier for the updated patch. Bug #243250

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.3 x86_64

4 files changed, 92 insertions, 2 deletions

diff --git a/app-text/gocr/ChangeLog b/app-text/gocr/ChangeLog
index 1d2bb924d226..e195021e6461 100644
--- a/app-text/gocr/ChangeLog
+++ b/app-text/gocr/ChangeLog
@@ -1,6 +1,13 @@
 # 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.55 2008/04/06 18:55:37 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.56 2008/10/26 13:43:25 aballier Exp $
+
+*gocr-0.46 (26 Oct 2008)
+
+  26 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/gocr-0.46-makefile.patch, +gocr-0.46.ebuild:
+  version bump, thanks to Ed Davison for the report and Daniel Pielmeier for
+  the updated patch. Bug #243250
 
   06 Apr 2008; Tobias Klausmann <klausman@gentoo.org> gocr-0.45.ebuild:
   Stable on alpha, bug #189461
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index c6105d567247..b817d0f446f4 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gocr-0.43-makefile.patch 1017 RMD160 9db6d03f27b87183c999722ddea8f590316165bf SHA1 5ff4bfcee3735fa9c57da39b377dabf4c433eef8 SHA256 7d35a81fab4490d260524764897955e2df179295911978e2b489152ba601227c
 AUX gocr-0.45-makefile.patch 705 RMD160 a40fb6747abed407efd97ec77bd55b10be4f63ef SHA1 227edd1ef804cd3dca3451fa83ac6b290505ae5c SHA256 3b3cdd999dc33a7190c05b96672e4163f9ce37d3461b601be2393be91f6537a4
+AUX gocr-0.46-makefile.patch 702 RMD160 d6d26c5d092a7c01dc12fe232a010970bab3f6de SHA1 173dd114c05e390fb7c85a0c8bc93d7ba3771c71 SHA256 838fe2e9260bb15724f9e2dce913493f2ebaf97a141d514c3e2e6aa3c6921b0e
 DIST gocr-0.45.tar.gz 362952 RMD160 e0c2980fb39ca7c66cdc3e0805480f495fdb1a9b SHA1 5804535068ae13447ad86242966533f89d208d2b SHA256 d1846fe037b5d509373c92c0bc7dd4e6e5c290962e30e03fea5766326ec4b7f4
+DIST gocr-0.46.tar.gz 700288 RMD160 0f61fc05015b945d471c039e38497c3b9d550dac SHA1 eb1ff70f490d121c54ce612da043dcf52aae0601 SHA256 85e91143e86018ef324b8547c8622b01c7c965d80e98919b38030795aef4a0bc
 EBUILD gocr-0.45.ebuild 1331 RMD160 cd58c004194c7d123bba667c95274f2dc3d582e8 SHA1 3ff844d6e54a0ff3635c6ca62ad2c0ca852b6b69 SHA256 6e3d339227f4e9fc5e520e7d42a03c350805f071b99a7d8dbd5d3710355d87a5
-MISC ChangeLog 7436 RMD160 661f51f1f4c8c8c47044ffb96cc8bf4be236b080 SHA1 067a19d1fd8470548529dd942b2b12944c60f546 SHA256 2a5eba1a7fba708b3290d13a2f83002d190ac984371552258a2a7a5d01ce1b2a
+EBUILD gocr-0.46.ebuild 1337 RMD160 b9f2f0c23bd97fd404d155c138d75b1c26a64783 SHA1 94d195d6fcb040af1120c3b855549a24bc81e860 SHA256 c60643af20bbf614e83dcf565de66e74c44a468cd7653025495b64908c8b1048
+MISC ChangeLog 7679 RMD160 8b7e7ffc527903ee4fe1b0a64e1fcd313d4969bc SHA1 b4a6797e0cffc09ed98c38d14037dc596263e67e SHA256 45cb8cc05aa9c3856f05b4ef8a8c9e9bd6d3ceb5cc79f452fafc9b7d20bbd70b
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkEdAMACgkQvFcC4BYPU0qbTwCgiRkNSatc7NvnXVhEtt1X44TH
+u4sAni7QCPV8MaYVjIBcNtwMEYI4A2TM
+=NDZI
+-----END PGP SIGNATURE-----
diff --git a/app-text/gocr/files/gocr-0.46-makefile.patch b/app-text/gocr/files/gocr-0.46-makefile.patch
new file mode 100644
index 000000000000..5d14e8398a67
--- /dev/null
+++ b/app-text/gocr/files/gocr-0.46-makefile.patch
@@ -0,0 +1,21 @@
+--- 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/gocr-0.46.ebuild b/app-text/gocr/gocr-0.46.ebuild
new file mode 100644
index 000000000000..3a5e7f961a40
--- /dev/null
+++ b/app-text/gocr/gocr-0.46.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 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.1 2008/10/26 13:43:25 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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc tk"
+
+DEPEND=">=media-libs/netpbm-9.12
+	doc? ( >=media-gfx/transfig-3.2 virtual/ghostscript )
+	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}
+}