tomka       15/08/04 08:02:52

  Modified:             tesseract-3.04.00-r1.ebuild ChangeLog
  Log:
  Fix URI and other things (bug 556590)
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
565C32BC)

Revision  Changes    Path
1.3                  app-text/tesseract/tesseract-3.04.00-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild?r1=1.2&r2=1.3

Index: tesseract-3.04.00-r1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tesseract-3.04.00-r1.ebuild 3 Aug 2015 15:29:30 -0000       1.2
+++ tesseract-3.04.00-r1.ebuild 4 Aug 2015 08:02:52 -0000       1.3
@@ -1,60 +1,60 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild,v 1.2 
2015/08/03 15:29:30 tomka Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00-r1.ebuild,v 1.3 
2015/08/04 08:02:52 tomka Exp $
 
 EAPI=5
 
 MY_PN="tesseract-ocr"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/tree/${PV}/";
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${PV}/";
 
 inherit eutils autotools autotools-utils
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr";
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz
-       ${URI_PREFIX}/eng.traineddata
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+       ${URI_PREFIX}eng.traineddata -> eng.traineddata-${PV}
        doc? ( 
http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz 
)
-       linguas_ar? ( ${URI_PREFIX}/ara.traineddata )
-       linguas_bg? ( ${URI_PREFIX}/bul.traineddata )
-       linguas_ca? ( ${URI_PREFIX}/cat.traineddata )
-       linguas_chr? ( ${URI_PREFIX}/chr.traineddata )
-       linguas_cs? ( ${URI_PREFIX}/ces.traineddata )
-       linguas_de? ( ${URI_PREFIX}/deu.traineddata
-                               ${URI_PREFIX}/deu_frak.traineddata )
-       linguas_da? ( ${URI_PREFIX}/dan.traineddata
-                               ${URI_PREFIX}/dan_frak.traineddata )
-       linguas_el? ( ${URI_PREFIX}/ell.traineddata )
-       linguas_es? ( ${URI_PREFIX}/spa.traineddata )
-       linguas_fi? ( ${URI_PREFIX}/fin.traineddata )
-       linguas_fr? ( ${URI_PREFIX}/fra.traineddata )
-       linguas_he? ( ${URI_PREFIX}/heb.traineddata )
-       linguas_hi? ( ${URI_PREFIX}/hin.traineddata )
-       linguas_hu? ( ${URI_PREFIX}/hun.traineddata )
-       linguas_id? ( ${URI_PREFIX}/ind.traineddata )
-       linguas_it? ( ${URI_PREFIX}/ita.traineddata )
-       linguas_jp? ( ${URI_PREFIX}/jpn.traineddata )
-       linguas_ko? ( ${URI_PREFIX}/kor.traineddata )
-       linguas_lt? ( ${URI_PREFIX}/lit.traineddata )
-       linguas_lv? ( ${URI_PREFIX}/lav.traineddata )
-       linguas_nl? ( ${URI_PREFIX}/nld.traineddata )
-       linguas_no? ( ${URI_PREFIX}/nor.traineddata )
-       linguas_pl? ( ${URI_PREFIX}/pol.traineddata )
-       linguas_pt? ( ${URI_PREFIX}/por.traineddata )
-       linguas_ro? ( ${URI_PREFIX}/ron.traineddata )
-       linguas_ru? ( ${URI_PREFIX}/rus.traineddata )
-       linguas_sk? ( ${URI_PREFIX}/slk.traineddata
-                               ${URI_PREFIX}/slk_frak.traineddata )
-       linguas_sl? ( ${URI_PREFIX}/slv.traineddata )
-       linguas_sr? ( ${URI_PREFIX}/srp.traineddata )
-       linguas_sv? ( ${URI_PREFIX}/swe.traineddata )
-       linguas_th? ( ${URI_PREFIX}/tha.traineddata )
-       linguas_tl? ( ${URI_PREFIX}/tgl.traineddata )
-       linguas_tr? ( ${URI_PREFIX}/tur.traineddata )
-       linguas_uk? ( ${URI_PREFIX}/ukr.traineddata )
-       linguas_vi? ( ${URI_PREFIX}/vie.traineddata )
-       linguas_zh_CN? ( ${URI_PREFIX}/chi_sim.traineddata )
-       linguas_zh_TW? ( ${URI_PREFIX}/chi_tra.traineddata )
-       osd? ( ${URI_PREFIX}/osd.traineddata )
+       linguas_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${PV} )
+       linguas_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${PV} )
+       linguas_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${PV} )
+       linguas_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${PV} )
+       linguas_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${PV} )
+       linguas_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${PV}
+                                 ${URI_PREFIX}deu_frak.traineddata -> 
deu_frak.traineddata-${PV} )
+       linguas_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${PV}
+                                 ${URI_PREFIX}dan_frak.traineddata -> 
dan_frak.traineddata-${PV} )
+       linguas_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${PV} )
+       linguas_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${PV} )
+       linguas_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${PV} )
+       linguas_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${PV} )
+       linguas_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${PV} )
+       linguas_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${PV} )
+       linguas_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${PV} )
+       linguas_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${PV} )
+       linguas_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${PV} )
+       linguas_jp? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${PV} )
+       linguas_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${PV} )
+       linguas_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${PV} )
+       linguas_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${PV} )
+       linguas_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${PV} )
+       linguas_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${PV} )
+       linguas_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${PV} )
+       linguas_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${PV} )
+       linguas_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${PV} )
+       linguas_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${PV} )
+       linguas_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${PV}
+                                 ${URI_PREFIX}slk_frak.traineddata -> 
slk_frak.traineddata-${PV} )
+       linguas_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${PV} )
+       linguas_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${PV} )
+       linguas_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${PV} )
+       linguas_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${PV} )
+       linguas_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${PV} )
+       linguas_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${PV} )
+       linguas_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${PV} )
+       linguas_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${PV} )
+       linguas_zh_CN? ( ${URI_PREFIX}chi_sim.traineddata -> 
chi_sim.traineddata-${PV} )
+       linguas_zh_TW? ( ${URI_PREFIX}chi_tra.traineddata -> 
chi_tra.traineddata-${PV} )
+       osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${PV} )
 "
 
 LICENSE="Apache-2.0"
@@ -76,10 +76,10 @@
 )
 
 src_unpack() {
-       unpack ${PV}.tar.gz
+       unpack ${P}.tar.gz
        use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
-       mkdir "${WORKDIR}"/tesseract-ocr/tessdata || die
-       cp "${DISTDIR}"/*.traineddata "${WORKDIR}"/tesseract-ocr/tessdata/ || 
die
+       find "${DISTDIR}/" -name "*traineddata-${PV}" \
+                -execdir sh -c 'cp -- "$0" "${S}/tessdata/${0%-*}"' '{}' ';' 
|| die
 }
 
 src_configure() {
@@ -105,6 +105,5 @@
 
        # install language files
        insinto /usr/share/tessdata
-       find "${WORKDIR}" -maxdepth 1 -type f -name "*.traineddata" -exec doins 
'{}' +
-       doins "${WORKDIR}"/"${MY_PN}"/tessdata/*
+       doins "${S}"/tessdata/*traineddata*
 }



1.61                 app-text/tesseract/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tesseract/ChangeLog?rev=1.61&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tesseract/ChangeLog?rev=1.61&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/tesseract/ChangeLog?r1=1.60&r2=1.61

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog   3 Aug 2015 15:29:30 -0000       1.60
+++ ChangeLog   4 Aug 2015 08:02:52 -0000       1.61
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/tesseract
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.60 
2015/08/03 15:29:30 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.61 
2015/08/04 08:02:52 tomka Exp $
+
+  04 Aug 2015; Thomas Kahle <to...@gentoo.org> tesseract-3.04.00-r1.ebuild:
+  Fix URI and other things (bug 556590)
 
   03 Aug 2015; Thomas Kahle <to...@gentoo.org> tesseract-3.04.00-r1.ebuild,
   tesseract-3.04.00.ebuild:




Reply via email to