Added --as-needed patch, bug #132567

Package-Manager: portage-2.1_pre10-r3

6 files changed, 137 insertions, 4 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/Manifest b/app-text/gocr/Manifest
index 3fd97ae37f01..e5f5931bc8a2 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,6 +1,45 @@
-MD5 5441a7bd6eb1d0995866b4bb1343fc1b ChangeLog 3990
-MD5 bfbcd9ee87b9d132e24dbd21f750d886 files/digest-gocr-0.39 61
-MD5 b76eb9d6cbf5b502f9332c80dc75462b files/digest-gocr-0.40 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gocr-0.40-as-needed.patch 611 RMD160 364f6be01b58de2c1ba997f5aa3ef0e3cf124be6 SHA1 fdcf40b381610c9d3da3dbbad711e48b7d348a4a SHA256 c0c7bb801af291acbdc271f4c112db38885d4c9610f1102c1a151f6e391b5b67 size 611
+MD5 89808c6b3a0062416600335660c461bc files/gocr-0.40-as-needed.patch 611
+RMD160 364f6be01b58de2c1ba997f5aa3ef0e3cf124be6 files/gocr-0.40-as-needed.patch 611
+SHA256 c0c7bb801af291acbdc271f4c112db38885d4c9610f1102c1a151f6e391b5b67 files/gocr-0.40-as-needed.patch 611
+DIST gocr-0.39.tar.gz 720915 size 720915
+DIST gocr-0.40.tar.gz 780744 RMD160 1e34277b7d923706789d6e5c85996968d8506427 SHA256 bab419672bedbc00fc7fe1395d0eb4f9b5841c248245a8457dfd4ee1d19a6f4c size 780744
+EBUILD gocr-0.39.ebuild 1338 RMD160 23c89431ac19cbd112d04a452ff3b26043f69369 SHA1 30120e7d8eaab5a6c51f7fb935ebf864de436241 SHA256 3a9d0159670661064c57f093a57bad607b5a7c684a158a8e7b187a9ddc587b55 size 1338
 MD5 a40d2d65828be7fbfeebb9015b37212c gocr-0.39.ebuild 1338
+RMD160 23c89431ac19cbd112d04a452ff3b26043f69369 gocr-0.39.ebuild 1338
+SHA256 3a9d0159670661064c57f093a57bad607b5a7c684a158a8e7b187a9ddc587b55 gocr-0.39.ebuild 1338
+EBUILD gocr-0.40-r1.ebuild 1487 RMD160 94d571a5cb6d2ced76e39a4ac91dec6616b6342f SHA1 701e82cf18ac75a29139cee6b3490b79e5a9dd57 SHA256 89899749f5e5b8cf007b06f962c5454f7417fba8cb96b99fe3e7700f5abcdfd3 size 1487
+MD5 a0416ca8bfabd21a34c3cc7d7335d7f7 gocr-0.40-r1.ebuild 1487
+RMD160 94d571a5cb6d2ced76e39a4ac91dec6616b6342f gocr-0.40-r1.ebuild 1487
+SHA256 89899749f5e5b8cf007b06f962c5454f7417fba8cb96b99fe3e7700f5abcdfd3 gocr-0.40-r1.ebuild 1487
+EBUILD gocr-0.40.ebuild 1340 RMD160 4e98d5292ffdf716067ebfa1b13689ff6d69c5a9 SHA1 0c8995df4448008bc8da4136beb1793cb6b37d51 SHA256 96c1a0fc2534ac775db423f2da722f9a3e4daf61886dde1eb60da0e408869741 size 1340
 MD5 20fe5f4270866ad8f83d7c7d8f977aa6 gocr-0.40.ebuild 1340
+RMD160 4e98d5292ffdf716067ebfa1b13689ff6d69c5a9 gocr-0.40.ebuild 1340
+SHA256 96c1a0fc2534ac775db423f2da722f9a3e4daf61886dde1eb60da0e408869741 gocr-0.40.ebuild 1340
+MISC ChangeLog 4202 RMD160 f019ef9c9953499c16c5093e8fc644e77f3f0868 SHA1 f5914244358e2948142362c049bbe9d01397f2a5 SHA256 71a9e12c352874b4e6dce10833195d2d62411caed3af72d71b600bf2acff58fa size 4202
+MD5 d431bf2a276fc2f374ff52d3fcd67df6 ChangeLog 4202
+RMD160 f019ef9c9953499c16c5093e8fc644e77f3f0868 ChangeLog 4202
+SHA256 71a9e12c352874b4e6dce10833195d2d62411caed3af72d71b600bf2acff58fa ChangeLog 4202
+MISC metadata.xml 164 RMD160 698422e821458386b8da17baa6014296f8284e0b SHA1 a805613d38e6e3bff93cba3858d6a92cc79fe2f7 SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f size 164
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+RMD160 698422e821458386b8da17baa6014296f8284e0b metadata.xml 164
+SHA256 7bd4d93c657a26aa9af1dea4232520c0d388cc92115dd9ca0eb04259228e044f metadata.xml 164
+MD5 bfbcd9ee87b9d132e24dbd21f750d886 files/digest-gocr-0.39 61
+RMD160 d70c65f25b5a771f39b04afe0a264c370264b0d1 files/digest-gocr-0.39 61
+SHA256 108e416399968630f8355d4a487ff1e26973ffc30086e948e22a6bfb6462b08c files/digest-gocr-0.39 61
+MD5 07a26831c29a5e5cbb9a183f3fdb32de files/digest-gocr-0.40 229
+RMD160 945bd12c3bb7d7301f7adc5486b13e04de59b94e files/digest-gocr-0.40 229
+SHA256 fa00ed0b41d48e5b409396b1e1d91507c2c17eb64bce0f1f75cd75248c06baad files/digest-gocr-0.40 229
+MD5 07a26831c29a5e5cbb9a183f3fdb32de files/digest-gocr-0.40-r1 229
+RMD160 945bd12c3bb7d7301f7adc5486b13e04de59b94e files/digest-gocr-0.40-r1 229
+SHA256 fa00ed0b41d48e5b409396b1e1d91507c2c17eb64bce0f1f75cd75248c06baad files/digest-gocr-0.40-r1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEXv8MzxUa4FWw6mwRAlfpAKCvSHxFbORN7ZhDtOxK+f+/CTsxTACfcb10
+mtZtzQRvSSHA8f0HqrBtB1U=
+=vibi
+-----END PGP SIGNATURE-----
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}
+
+}