Added --as-needed patch, bug #132567

(Portage version: 2.1_pre10-r3)

5 files changed, 95 insertions, 1 deletions

diff --git a/app-text/gocr/ChangeLog b/app-text/gocr/ChangeLog
index 3fe2b5ee9e17..975d313b1438 100644
--- a/app-text/gocr/ChangeLog
+++ b/app-text/gocr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/gocr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.27 2006/04/23 17:40:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/ChangeLog,v 1.28 2006/05/08 08:19:08 ehmsen Exp $
+
+*gocr-0.40-r1 (08 May 2006)
+
+  08 May 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  +files/gocr-0.40-as-needed.patch, +gocr-0.40-r1.ebuild:
+  Added --as-needed patch from TGL <degrenier@easyconnect.fr>, bug #132567.
 
   23 Apr 2006; Markus Rothe <corsair@gentoo.org> gocr-0.40.ebuild:
   Stable on ppc64
diff --git a/app-text/gocr/files/digest-gocr-0.40 b/app-text/gocr/files/digest-gocr-0.40
index 2c4b3893e28f..1e0a9dc0df02 100644
--- a/app-text/gocr/files/digest-gocr-0.40
+++ b/app-text/gocr/files/digest-gocr-0.40
@@ -1 +1,3 @@
 MD5 13cc0d008747f5bb56d8b17be9b61859 gocr-0.40.tar.gz 780744
+RMD160 1e34277b7d923706789d6e5c85996968d8506427 gocr-0.40.tar.gz 780744
+SHA256 bab419672bedbc00fc7fe1395d0eb4f9b5841c248245a8457dfd4ee1d19a6f4c gocr-0.40.tar.gz 780744
diff --git a/app-text/gocr/files/digest-gocr-0.40-r1 b/app-text/gocr/files/digest-gocr-0.40-r1
new file mode 100644
index 000000000000..1e0a9dc0df02
--- /dev/null
+++ b/app-text/gocr/files/digest-gocr-0.40-r1
@@ -0,0 +1,3 @@
+MD5 13cc0d008747f5bb56d8b17be9b61859 gocr-0.40.tar.gz 780744
+RMD160 1e34277b7d923706789d6e5c85996968d8506427 gocr-0.40.tar.gz 780744
+SHA256 bab419672bedbc00fc7fe1395d0eb4f9b5841c248245a8457dfd4ee1d19a6f4c gocr-0.40.tar.gz 780744
diff --git a/app-text/gocr/files/gocr-0.40-as-needed.patch b/app-text/gocr/files/gocr-0.40-as-needed.patch
new file mode 100644
index 000000000000..c62df4c29428
--- /dev/null
+++ b/app-text/gocr/files/gocr-0.40-as-needed.patch
@@ -0,0 +1,22 @@
+--- 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/gocr-0.40-r1.ebuild b/app-text/gocr/gocr-0.40-r1.ebuild
new file mode 100644
index 000000000000..943dcc2154e0
--- /dev/null
+++ b/app-text/gocr/gocr-0.40-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gocr/gocr-0.40-r1.ebuild,v 1.1 2006/05/08 08:19:08 ehmsen 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* )"
+
+DOCS="AUTHORS BUGS CREDITS HISTORY INSTALL 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}
+
+}