remove old, automake compatibility (bug 454506). Thanks Helmut Jarausch.

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 0x89DEB219565C32BC)

4 files changed, 21 insertions, 109 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index db75f7d90789..7348c23c1b89 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/tesseract
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.38 2012/12/16 14:55:42 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.39 2013/01/30 08:02:15 tomka Exp $
+
+  30 Jan 2013; Thomas Kahle <tomka@gentoo.org>
+  +files/tesseract-3.02-automake-compat.patch, -tesseract-3.01.ebuild,
+  tesseract-3.02.ebuild:
+  remove old, automake compatibility (bug 454506). Thanks Helmut Jarausch.
 
   16 Dec 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due retirement, #260683
diff --git a/app-text/tesseract/files/tesseract-3.02-automake-compat.patch b/app-text/tesseract/files/tesseract-3.02-automake-compat.patch
new file mode 100644
index 000000000000..40e601c814ca
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.02-automake-compat.patch
@@ -0,0 +1,11 @@
+--- configure.ac.ORIG	2013-01-25 10:24:52.713068658 +0100
++++ configure.ac	2013-01-29 12:05:31.582491749 +0100
+@@ -223,7 +223,7 @@
+ # TODO(luc) Resolve this issue.
+ #AM_INIT_AUTOMAKE(dist-zip)
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(config_auto.h:config/config.h.in)
++AC_CONFIG_HEADERS(config_auto.h:config/config.h.in)
+ #AM_PROG_CC_C_O
+ AM_MAINTAINER_MODE
+ # Need to tell automake if Visual C++ is being used:
diff --git a/app-text/tesseract/tesseract-3.01.ebuild b/app-text/tesseract/tesseract-3.01.ebuild
deleted file mode 100644
index 443447129796..000000000000
--- a/app-text/tesseract/tesseract-3.01.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.01.ebuild,v 1.6 2012/12/01 02:37:14 tomka Exp $
-
-EAPI=4
-
-MY_PN="${PN}-ocr"
-MY_P="${MY_PN}-${PV}"
-URI_PREFIX="http://${MY_PN}.googlecode.com/files"
-
-inherit eutils autotools
-
-DESCRIPTION="An OCR Engine that was developed at HP and now at Google"
-HOMEPAGE="http://code.google.com/p/tesseract-ocr/"
-SRC_URI="${URI_PREFIX}/${P}.tar.gz
-	${URI_PREFIX}/${MY_P}.eng.tar.gz
-	doc? ( ${URI_PREFIX}/${P}-doc-html.tar.gz )
-	linguas_ar? ( ${URI_PREFIX}/${MY_P}.ara.tar.gz )
-	linguas_bg? ( ${URI_PREFIX}/bul.traineddata.gz )
-	linguas_ca? ( ${URI_PREFIX}/cat.traineddata.gz )
-	linguas_chr? ( ${URI_PREFIX}/chr.traineddata.gz )
-	linguas_cs? ( ${URI_PREFIX}/ces.traineddata.gz )
-	linguas_de? ( ${URI_PREFIX}/deu.traineddata.gz
-				${URI_PREFIX}/deu-frak.traineddata.gz )
-	linguas_da? ( ${URI_PREFIX}/dan.traineddata.gz
-				${URI_PREFIX}/dan-frak.traineddata.gz )
-	linguas_el? ( ${URI_PREFIX}/ell.traineddata.gz )
-	linguas_es? ( ${URI_PREFIX}/spa.traineddata.gz )
-	linguas_fi? ( ${URI_PREFIX}/fin.traineddata.gz )
-	linguas_fr? ( ${URI_PREFIX}/fra.traineddata.gz )
-	linguas_he? ( ${URI_PREFIX}/${MY_P}.heb.tar.gz
-				${URI_PREFIX}/${MY_P}.heb-com.tar.gz )
-	linguas_hi? ( ${URI_PREFIX}/${MY_P}.hin.tar.gz )
-	linguas_hu? ( ${URI_PREFIX}/hun.traineddata.gz )
-	linguas_id? ( ${URI_PREFIX}/ind.traineddata.gz )
-	linguas_it? ( ${URI_PREFIX}/ita.traineddata.gz )
-	linguas_jp? ( ${URI_PREFIX}/jpn.traineddata.gz )
-	linguas_ko? ( ${URI_PREFIX}/kor.traineddata.gz )
-	linguas_lt? ( ${URI_PREFIX}/lit.traineddata.gz )
-	linguas_lv? ( ${URI_PREFIX}/lav.traineddata.gz )
-	linguas_nl? ( ${URI_PREFIX}/nld.traineddata.gz )
-	linguas_no? ( ${URI_PREFIX}/nor.traineddata.gz )
-	linguas_pl? ( ${URI_PREFIX}/pol.traineddata.gz )
-	linguas_pt? ( ${URI_PREFIX}/por.traineddata.gz )
-	linguas_ro? ( ${URI_PREFIX}/ron.traineddata.gz )
-	linguas_ru? ( ${URI_PREFIX}/rus.traineddata.gz )
-	linguas_sk? ( ${URI_PREFIX}/slk.traineddata.gz
-				${URI_PREFIX}/${MY_P}.slk-frak.tar.gz )
-	linguas_sl? ( ${URI_PREFIX}/slv.traineddata.gz )
-	linguas_sr? ( ${URI_PREFIX}/srp.traineddata.gz )
-	linguas_sv? ( ${URI_PREFIX}/swe.traineddata.gz
-				${URI_PREFIX}/swe-frak.traineddata.gz )
-	linguas_th? ( ${URI_PREFIX}/${MY_P}.tha.tar.gz )
-	linguas_tl? ( ${URI_PREFIX}/tgl.traineddata.gz )
-	linguas_tr? ( ${URI_PREFIX}/tur.traineddata.gz )
-	linguas_uk? ( ${URI_PREFIX}/ukr.traineddata.gz )
-	linguas_vi? ( ${URI_PREFIX}/vie.traineddata.gz )
-	linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata.gz )
-	linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata.gz )
-	osd? ( ${URI_PREFIX}/${MY_P}.osd.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-IUSE="doc examples jpeg png tiff -webp +scrollview linguas_ar linguas_bg linguas_ca linguas_chr linguas_cs linguas_de linguas_da linguas_el linguas_es linguas_fi linguas_fr linguas_he linguas_hi linguas_hu linguas_id linguas_it linguas_jp linguas_ko linguas_lt linguas_lv linguas_nl linguas_no linguas_pl linguas_pt linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_th linguas_tl linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW osd"
-
-DEPEND="media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# remove obsolete makefile, install target only in uppercase Makefile
-	rm "${S}/java/makefile" || die "remove obsolete java makefile failed"
-
-	epatch "${FILESDIR}/tesseract-2.04-gcc47.patch"
-	epatch_user
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable scrollview graphics) \
-			--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog NEWS README ReleaseNotes
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins eurotext.tif phototest.tif
-	fi
-
-	if use doc; then
-		dohtml -r doc/html/*
-	fi
-
-	# install language files
-	insinto /usr/share/tessdata
-	find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins '{}' +
-	doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
-}
diff --git a/app-text/tesseract/tesseract-3.02.ebuild b/app-text/tesseract/tesseract-3.02.ebuild
index ab2fd849cb52..042321aee2e3 100644
--- a/app-text/tesseract/tesseract-3.02.ebuild
+++ b/app-text/tesseract/tesseract-3.02.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.02.ebuild,v 1.2 2012/12/01 02:37:14 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.02.ebuild,v 1.3 2013/01/30 08:02:15 tomka Exp $
 
 EAPI=4
 
@@ -74,6 +74,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/tesseract-2.04-gcc47.patch"
+	epatch "${FILESDIR}/tesseract-3.02-automake-compat.patch"
 	epatch_user
 
 	eautoreconf