Bump to 3.04.00, drop old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

6 files changed, 36 insertions, 391 deletions

diff --git a/app-text/tesseract/ChangeLog b/app-text/tesseract/ChangeLog
index eb494047403d..b6f16e329286 100644
--- a/app-text/tesseract/ChangeLog
+++ b/app-text/tesseract/ChangeLog
@@ -1,6 +1,13 @@
 # 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.57 2015/05/10 18:20:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/ChangeLog,v 1.58 2015/07/31 08:06:39 tomka Exp $
+
+*tesseract-3.04.00 (31 Jul 2015)
+
+  31 Jul 2015; Thomas Kahle <tomka@gentoo.org> +tesseract-3.04.00.ebuild,
+  -files/sanitize-configure-file.patch, -files/sanitize-pkgconfig-file.patch,
+  -tesseract-3.02-r1.ebuild, -tesseract-3.02.ebuild:
+  Bump to 3.04.00, drop old
 
   10 May 2015; Jeroen Roovers <jer@gentoo.org> tesseract-3.03_rc1-r1.ebuild:
   Mark ~ppc64 (bug #544622).
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index d8258ba1e856..382ebf40e9ef 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,10 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX sanitize-configure-file.patch 7250 SHA256 ded937baa0b285064d7f5ee2d65d7392ddf3cc17fa2ed9955e45da6e4c50ff5e SHA512 03fd84cf4fa3e42761520a644824e12d41aba35deb96130f677bfe6b998200dbf4dfa80774fc9abc71b7fa18e37aee3cc40a4bbc578df82daca8ae40b31886b6 WHIRLPOOL f5b2ed5e6a2a0d33b99eccfa8b5f939dfbfa173af05031093b4c83f6ad5dfaf814a1231f284fb0bc7e8c7c109cdedeaf952c352ab931797ce941243e8a62a6f9
-AUX sanitize-pkgconfig-file.patch 627 SHA256 1cb2a2b16415f8dcb6c4672a4ea97b617d58acae0f5883f05a1e6db7a65056e8 SHA512 4f6bdc9bc6896289b31a25b59b1a0ee5af7de8105950fc85a38d0f35afc3ba825f96b2932e42669cda863523b3050511027b289d1d6a7549eccb05bf8e0de0bc WHIRLPOOL c7ce0e7b4832bbf26409e51e44f947ccc9c60af2fb04f3e8121c852b701f096054729e2c36cbcd0e7f4876c1daed1a4382188d78b96ed1162c39ed77ba2365d5
 AUX tesseract-2.04-gcc44.patch 440 SHA256 f0e0004621a0be2ba475bafa812fbe7af13dd187fd6d55650df0569831383025 SHA512 4d1538d0a124de7c89d4a2a6c8cd3f38b623e9c5405affe8c59d9d8a3be1df10853a4a794197453e516965a99f898dc2a0552c7a23e68182e444c8d85802b8f6 WHIRLPOOL 1eba35e9579b26c7a92cd3dbacd81e869f73db2231c324c1d751c6320eae5be828c136dbcecdd1cc584aa032f1c97d0f0bbc55dc93b7a31c9eaaf12b43da1976
 AUX tesseract-2.04-gcc47.patch 289 SHA256 746c23a72b12df832d7b4a4c5d5be2307ae628960a57f517a3f11e8106cb28c4 SHA512 fc4cf373b97369063a3034f4155c6c314902f5c33e5bae4df89e7aea8b1843ee25a62787a32d377d893622a1bbdc6fe44759ec0d034df5c0200fb75e4028db59 WHIRLPOOL a7a124671f1dc97811b18abea06b892e91469233eb52bf7a89d23840a0f014481ae230c93a15208c9dcb0b38b7a7f7de2eefb767aad253311dbfaf149b45c1ba
+DIST 3.04.00.tar.gz 2264427 SHA256 7e6e48b625e1fba9bc825a4ef8c39f12c60aae1084939133b3c6a00f8f8dc38c SHA512 60c31bad40b4c01395782fb98b3326407e75ebdbda962de4fb0e878824efb05140bdcb139dcf7d4f699ae5350e81a00320ebe7fbec083a0d374952488cc59e25 WHIRLPOOL 81b685e4d50d94056a4f99ce6beb4c73983e9449e1eed07a69d4649b0a8231b17fede430a8c181b37216a55e9f6102a578c85d84b2bbe6e9643ca98f16ae3260
 DIST bul.traineddata.gz 848731 SHA256 fc3c650568d014f2337052658e9ddd8efaff6ac74c9a90952d740eafdf400e2d SHA512 69dca9b285da3985142fc3e8d2a75d7fb217308c077114004c274972491c8cd8aebd60e27ffb26c9906a6ae78e05e19bbc5fd24ab97b961df5882cbd295f747a WHIRLPOOL a331336952140946bae38c59f9005d131dc9f7976358ff06a4458311ac0e5e10102868d0c37a41eae3f73a27d6a9a253c599e53167dbdf6c7c086ba8418f0624
 DIST cat.traineddata.gz 995008 SHA256 dcc52db7522c67d2629117b7fde4c114ca51677f7f1efbedc12bf1e7319acde2 SHA512 603286de44dba701b53a0e4e7c9ba7e4e871bbadbc582f644417246ceb58155f826555fd8f53b58dca48cfa96633509cdde3cab6c0c5d3b43f5998d231ed54bb WHIRLPOOL efa6696ecc48d1bda4ff6efc01b5230cdf3cdb57e13f9b6b2adc9b50798e38b30fce0f9595d61f23e144c7b5c36301beb1de4c0753492213d7be8f447b33acbe
 DIST ces.traineddata.gz 1059966 SHA256 9848a4c137be45659e29f4aa07ccb6357fd4401307478cce0ed5f8e6686480d2 SHA512 5dba38364a423bdced1ef8edcb0d05adc02d5b4db77f31e31df571d75430e88a6b3d1d3c0ed43dac71c444bd716799e2d7346aa2d6baca788d27707f327d6fb8 WHIRLPOOL 1bfe54cbd9a8085f8a34018abf26d9e6b0ae650d5378db4fad27bd3b5d27af6662171db6417422d13a57416d2a22e37c21078e131283952a73964c5e445c57e3
@@ -48,7 +47,6 @@ DIST tesseract-2.01.por.tar.gz 2107696 SHA256 0dc30b76814a7694246ca347ccb402bcd4
 DIST tesseract-2.01.vie.tar.gz 964277 SHA256 8026240029341d45a6142cfccf6f0f98e5b1f35cae5725f8379ac4a8de34283f SHA512 568b91ffa79ca57b613d6548504adf37677fa04a7226d366bc7d4548d1480dc00b397b76f42ef96a2ca0d78b6ffc635fa5586b0cd251d54cf22eb960ab3c920e WHIRLPOOL c32c5e8a5b62f688df43a94a69f0d1326179866e6a9674b625d984ceed26b085764c9b7cd3980507546e23c567f350f9a0ccb3d2d4b2c8d2efe1a1a9ef98d430
 DIST tesseract-2.04.eus.tar.gz 1207994 SHA256 19aa30dda8049fb03e125e3b17d05ae402544e9ec81adcb18964d4a7b125a2fe SHA512 613fedb033f3c678a15d71a7346ad7d2da7d0908f18b0450bc4c198b19e3671fdab025e44a4f6f73257848f626af58c144464ce349a3e5c4b91eebc8b4018c1f WHIRLPOOL 7c0f5556ff2acbc4aac3b60885dc15db22385135c43ea57ad8d4b4226b603e6aad6a346d57099429d3c92bffeda9c9604e621c8d9bc2c98c4b770634250d17e1
 DIST tesseract-2.04.tar.gz 1118386 SHA256 62866f283916553e02cebdeb1b485856c6a790f5f8bf86c30b87c6304374bef8 SHA512 c095407910235f7f914aa6a51feedade3f0b33108c7801b88c5ade26f2b75d1756b034d9ac32ad362a326ee468f97b69476978102ef0cefcc1b5c93be2342d42 WHIRLPOOL 2ce585c295477d17de265bac563d50c249b036301058b98e552b79f040829facea778cfc7692ae06299fc6b55bf2d890e511300c9746be525f9439d0d93d1280
-DIST tesseract-3.02.02.tar.gz 3664109 SHA256 6f142b56ff27092f237aa78d78014703dfaa2a06a57c49e5bc3a5e98358140fb SHA512 83ce712dd2e0a76b7d9e52b1a66e6a74161edc4d6cd343eba3f4a7e38f8393fb85c220c8871fcee06ad00d02a94733b279ab0e69a8ac20d1740bf448c2986db0 WHIRLPOOL ce1364c130fa348e85c23b65d5729e2f5feac0f3371842b54a4d649994fc153b07d317d28ee286061b955cd159af8be4829d2e216f0ed6020ee0be68b1fe2a38
 DIST tesseract-3.03-rc1.tar.gz 12812907 SHA256 d244956236f7491d74d7f342895f611a6c46c45fa9900173d5b7625d8461d2ea SHA512 4acd6a3c0db5568bd6cb199776a52fbf1643692cf2d9da7449644662461c0c3ef7e5941bb49be94135433a90de400413df062edd612ce9ec9c06e9206a57113f WHIRLPOOL 93f33f62aeb5a9f65a7642bc282138622076989618f787a044ad79463ab9cd9a9ebaeb5e34e52cf5c95c569b01fc552a44d2eda24e697d0c9a045fb626b9aa77
 DIST tesseract-ocr-3.01.heb-com.tar.gz 270977 SHA256 20a9d53172a8dbf1a4bbd7f7e9e3a523a9435c47c751533642e8a9becc8584ff SHA512 378dc49da535f70c860c29b9a43cae478f6d8403c93a623b1781194c02aad3ea12345f9ea6ebbac4fb2033179964d23fb075e6aa206ec79530b41947d5d44411 WHIRLPOOL cc6463928c05d5904af71ea6170e946e601639761eaab317f0570275e0eaee81cba2c0636dc5dec40f8ba6d16ad498e7177a0c2bf5a886f2598c99568f151fd6
 DIST tesseract-ocr-3.01.osd.tar.gz 4320544 SHA256 7861210fd0970ad30503e8c70d7841de6716bd293d8512fd8787a1a07219b7aa SHA512 ad0d6246574db10dbe5a439ba4266765114b1343228608c5ad35bea125c5e308e286a133ecf2fc9407287af56ea57bb48c32f445fef98256a119a2f432f6e2b6 WHIRLPOOL ffa5a9f209e54a36860e2a2cdee955a83df768fbb814717a2d1e0efe05b3aa2283bc14a33cfa72d7179ddeb684587fe04c0d37cefa944ba2182c9c7e6c9affd4
@@ -64,16 +62,15 @@ DIST tur.traineddata.gz 933401 SHA256 cb4e187f6c25c145252c88a576f3e3c9204c1d77e1
 DIST ukr.traineddata.gz 927741 SHA256 a54f0ce0843c863f102bfe135939200fc18702ce61ae6ebc571ab49460849365 SHA512 78f24a43246330b30090fc89b5434e9fb0c79c7ad114c7dd2caa265f3d48b87e91238181f230682bcdce0501b5a17d197ae4791fb9de1dc167e8713c2a45fc28 WHIRLPOOL 665172eaa31913424b66d0b0173b7a9787a73fec8bf031ecd669061814cae55a8bbd4d806efba909b98b982723d419e49bb85f6eb3c6f0ad1106dd33c7687f9c
 DIST vie.traineddata.gz 1575539 SHA256 5f61c32daf9a7071ff0dc95415aed75276538813398e3debb3849bba70bda713 SHA512 1843cb5628544794eab9d78aa87ded3c156a553627537b7e0ec5b5ceb402c723469e525c634ef92924de75ac9f9a4a2b8737b8d0932cae582b0d4d72fc39393e WHIRLPOOL 83d2bbf14d4b7a1d1f846fb053986d1e9f537faf8626e71ac0f83cd120074c58fb5baeff78dd3beec8fab98b2c456ad2b6d2c11c0fb8a56b6b8ecb8741057ad2
 EBUILD tesseract-2.04-r1.ebuild 2728 SHA256 f92d34a25a4124fdc22160c2dca0685eb4037b75d8812681c9ceb50af83e33f8 SHA512 2768705c7d50e86ba2b26915aceae591856482b0c0c98531afd22459456bb91cbffc93e71b3a90468847d4713a76c3d2c838ada1132edecc7aeb7dc957c2e06f WHIRLPOOL b795eb0c124e998ce83bf1c428c98364ee33e0806343a82beec658775c28a521fbe0b32b42341b2b0748454a35523bde3af0a0cc91be5c5ffaf02501b74cae83
-EBUILD tesseract-3.02-r1.ebuild 4241 SHA256 546f7a27d91804674b3711a7cb60c0507ba3d7bf7a6abd53a2f11123e957e333 SHA512 f9bc59d7537d335a5f9e7d033cc8a7a314ceee011e271a27a77b64c15a9b96b1fa74bd30ec37ade15f57fbce263afcb09bba8a1edb7dae427b6e224d8c206082 WHIRLPOOL b3bd0766199b6aa96cc0e07784ed46fe83ba1c1c55be79e3810f084a210f39bca707ced93f3e83eb88c262fd61fba24f99fe58c64a4f9eaf1c9c34b3a67bde9a
-EBUILD tesseract-3.02.ebuild 4161 SHA256 8a3e2ed779aa30758a118e1747f71e54eb923acc7245397c1ece316826c09ade SHA512 1857689ab514b23fa7ceeaf55a1a488a6f983c08b5fee4b6655307fd99e2372080f5fa1d1d2d9e0b9213efbd63535f5118d1ae774d4ed5bf6e24a5e7afd8e7a8 WHIRLPOOL 4cb1f03d58a5f4828d2aba3589fb686b0261e0352c784735d5025eeba31568ccd1b8e746bfca3a8263091f2df51a6f8df15efee55561175a3b943a56ec375277
 EBUILD tesseract-3.03_rc1-r1.ebuild 4302 SHA256 031d1459401863b53eba39f599ee4d52a9cdbc553e08f805638afb6895b69087 SHA512 2fe80e7edf13f8f0a27fc7a69e3f278426f601e9be806930c8d09ecab604b66bc50501bb202f027984ae294c70cf803c8f9975709afecad387502a7856164b33 WHIRLPOOL 5dd65b2510bbd1c4622e10819a25746edf18f455578a2daccc1c040be7921b65bb6541e756f755fde454e073c8e133cb436e425eb13f9c253878f5b665ad04ab
 EBUILD tesseract-3.03_rc1.ebuild 4156 SHA256 dac031b9ab35c77fd438737101e97426e02d67423d886ff2ef73bc5109df03a5 SHA512 2849db643eb8ae7dcc1bbf4980735360bd3cbe7ef2f7dce2d7098b860d18d4789e27b872a462d933c961266868c7a0a2887ddddfc629e33daf200f40caa868cc WHIRLPOOL cc9143a36f44e5c7cbcb771d98f86756d58b48e720e97101803a01bdfe442b3ab1748757e8d3d56de06f76a600691c78718175c5f2cffe346be29a15dd86cdb1
-MISC ChangeLog 8441 SHA256 a79bcfb0af4ff890fb7eba84007f8028200f9d390d9337e2e2c158b588885676 SHA512 7e7576c036a0b57259171bfbafdafd9ccd777f66f20c2bb39c62c48f1c7454c8602053ca9e23ccf367d1b4bd49733da0d7830b7617137aff04fbe809b5e800b0 WHIRLPOOL 9e76d39bcb3ccb4c45196a41ec99294ae8eeeb6fb7a664660b48b7abb52f9e0198235f0f07bbc4c17acd21722ef0460422f678b3473877e46208cf0c4936b8ba
+EBUILD tesseract-3.04.00.ebuild 4240 SHA256 ba7f76d4f532c831e88a0fc0c387c71d23981d3c62e3c7693f1952a3520f2e4e SHA512 2121d652f115b49ff4b23b1f898aa55662771ab69b233d3d0badd15c33d9deac2ef233aedaf37c9376ff899ddb84f54e176a52976bbc58827fdbb6fea5325bc5 WHIRLPOOL f374895c4674cd2fe27852f3af2c466009b3fdf575451e80adf25aa64562136f41515d919149f2a040bff2428def7e8caf4c226249378178ab266332500e76d3
+MISC ChangeLog 8711 SHA256 a1a6a339ad37b49577faed9771d4de1dca6985c09137048c3ad101316b586966 SHA512 792333fb28daee59e7ceef55403dc295b8a98726fc96abbfe25c7f8bf2dd2976efe4a04cb6f569724fda979ea6a1f1a9c65417ed6c295789e7f737a2c22f3202 WHIRLPOOL 36f2c1e65cd842c085c0f1bc9bd398c1aff06229a7e0ec4e8e99412a3e2dc35092bfd87e36345ca694eafdece0acae6412b48c6d54e8734ad5c82825b1fffb03
 MISC metadata.xml 1139 SHA256 7d6a11cf77954f85d142b9cac8188e73317b86b87564f609acfa41d31703ebe9 SHA512 2dd87148f3528c9dd5f5c546e6de534a62888ac344578c9dcc61f2732a6ab2c547186a1a5a7d40d05be5db28036e5b9643c5e50f650f2300312f1b1864c576a7 WHIRLPOOL fdd6058307c2b385e8b5a1a22d89ef9fa16d1712eab85c73b30918209dbfdb5ea0d8c07e9fbe65faabaa4ceabc99528cacdd306cb382a623c584fda2d373153d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVPoX4ACgkQVWmRsqeSphPHcACfZ+PJb5d6zLaXV9ZkBErQ92Qg
-XicAn38AB7b1Iliyo4VYrJEd8s/yzRJx
-=r67f
+iF4EAREIAAYFAlW7LJAACgkQid6yGVZcMrygqQD/RE7dt/W9uqFCjQImshn+uljc
+0FL2hwbCthw0ZCW1s2ABAICTwj8qgybMZR6omWYIovrrmzU+2m7czZ1Gl2MYuSmU
+=sJzG
 -----END PGP SIGNATURE-----
diff --git a/app-text/tesseract/files/sanitize-configure-file.patch b/app-text/tesseract/files/sanitize-configure-file.patch
deleted file mode 100644
index c1677f08ee55..000000000000
--- a/app-text/tesseract/files/sanitize-configure-file.patch
+++ /dev/null
@@ -1,237 +0,0 @@
-Index: configure.ac
-===================================================================
---- configure.ac	(revision 822)
-+++ configure.ac	(revision 823)
-@@ -56,6 +56,8 @@
- AM_CONDITIONAL(MINGW, false)
- AM_CONDITIONAL(GRAPHICS_DISABLED, false)
- 
-+
-+#############################
- #
- # Platform specific setup
- #
-@@ -75,24 +77,6 @@
- 
- includedir="${includedir}/tesseract"
- 
--AC_ARG_WITH(extra-includes,
--            AC_HELP_STRING([--with-extra-includes=DIR],
--                       [Define an additional directory for include files]),
--        [ if test -d "$withval" ; then
--            CFLAGS="$CFLAGS -I$withval"
--          else
--            AC_MSG_ERROR([Cannot stat directory $withval])
--          fi ] )
--
--AC_ARG_WITH(extra-libraries,
--            AC_HELP_STRING([--with-extra-libraries=DIR],
--                       [Define an additional directory for library files]),
--        [ if test -d "$withval" ; then
--           LDFLAGS="$LDFLAGS -L$withval"
--          else
--            AC_MSG_ERROR([Cannot stat directory $withval])
--          fi ] )
--
- AC_MSG_CHECKING(--enable-graphics argument)
- AC_ARG_ENABLE([graphics],
-  [AC_HELP_STRING([--enable-graphics],[enable graphics (ScrollView) (default)])
-@@ -208,27 +192,19 @@
- # ----------------------------------------
- 
- # Define order of compilers
--AC_PROG_CXX(cl.exe g++)
--# Not needed
--# AC_PROG_CC
-+AC_PROG_CXX(g++)
- 
- AC_PROG_LIBTOOL
- 
-+# ----------------------------------------
- # Automake configuration
- # ----------------------------------------
- 
--# Note: may need to configure automake to use ZIP as a distribution
--# format because of an apparent bug with GZIP, which results in bogus
--# archives.
--# TODO(luc) Resolve this issue.
--#AM_INIT_AUTOMAKE(dist-zip)
- AM_INIT_AUTOMAKE
--AM_CONFIG_HEADER(config_auto.h:config/config.h.in)
--#AM_PROG_CC_C_O
-+AC_CONFIG_HEADERS(config_auto.h:config/config.h.in)
- AM_MAINTAINER_MODE
--# Need to tell automake if Visual C++ is being used:
--AM_CONDITIONAL(USING_CL, test "x${CC}" = 'xcl.exe' )
- 
-+# ----------------------------------------
- # Additional checking of compiler characteristics
- # ----------------------------------------
- 
-@@ -245,108 +221,22 @@
- # Check where all the following programs are and set
- # variables accordingly:
- LT_INIT
--# AC_PROG_LN_S
--# AC_PATH_PROG(MV, mv)
--# AC_PATH_PROG(CP, cp)
--# AC_PATH_PROG(RM, rm)
--# AC_PATH_PROG(AR, ar)
--# AC_PATH_PROG(TOUCH, touch)
--# AC_PATH_PROG(SED, sed)
--# AC_PATH_PROG(BASH, bash, ,[$PATH:/usr/bin:/util/tools/bin])
--# # To use substitution in makefiles, use something like:
--# AC_SUBST(BASH)
- 
--# TODO(luc) Handle documentation. None of the following
--# is really needed until then
--#
--# AC_PROG_DOXYGEN_VERSION(1.3.2,[DOXYGEN_OK=1])
--# AC_PATH_PROG(DOT, dot)
--# AC_PATH_PROG(LATEX, latex)
--# AC_PATH_PROG(DVIPS, dvips)
--# AC_PATH_PROG(MAKEINDEX, makeindex)
--# AC_PATH_PROG(PDFLATEX, pdflatex)
--# AC_PATH_PROG(GZIP, gzip)
--#
--# if test -z "$DOXYGEN_OK" -o -z "$DOT"; then
--#   AC_MSG_WARN([------------------------------------
--# *** Disabling automatic documentation generation for this
--# *** package. Please check that you have 'doxygen' (version
--# *** $ac_doxygen_version or later) and 'graphviz' (aka, 'dot')
--# *** installed on your system. In addition, to generate
--# *** PostScript and PDF documentation, you will need to have
--# *** LaTeX and PdfLaTeX respectively. Re-run this configuration
--# *** script after you have updated your environment.
--# --------------------------------------------------------])
--#
--# # We have appropriate version of doxygen and dot, so we
--# # can generate documentation. It remains to be seen whether
--# # we can generate PDF and PostScript documentation..
--# else
--#   GENERATE_DOCUMENTATION="true"
--#
--# # Determine if PostScript documentation is generated:
--#   if test -z "$LATEX" -o -z "$DVIPS" -o -z "$MAKEINDEX"; then
--#     AC_MSG_WARN([Disabling generation of PostScript documentation])
--#   else
--#     GENERATE_PS_DOCUMENTATION="true"
--#   fi
--#
--#   # Determine if PDF documentation is generated:
--#   if test -z "$PDFLATEX" -o -z "$MAKEINDEX"; then
--#     AC_MSG_WARN([Disabling generation of PDF documentation])
--#   else
--#     GENERATE_PDF_DOCUMENTATION="true"
--#   fi
--# fi
--#
--# # These substitutions could be inside the 'else'
--# # conditionals above, but it is not necessary and would
--# # only cause some confusion...
--# AC_SUBST(DOXYGEN)
--# AC_SUBST(DOT)
--# AC_SUBST(LATEX)
--# AC_SUBST(DVIPS)
--# AC_SUBST(MAKEINDEX)
--# AC_SUBST(PDFLATEX)
--# AC_SUBST(GZIP)
--#
--# # Adjust makefiles based on the kind of documentation that
--# # is being generated,
--# AM_CONDITIONAL(GENERATE_DOCUMENTATION, test -n "$GENERATE_DOCUMENTATION")
--# AM_CONDITIONAL(GENERATE_PS_DOCUMENTATION, test -n "$GENERATE_PS_DOCUMENTATION")
--# AM_CONDITIONAL(GENERATE_PDF_DOCUMENTATION, test -n "$GENERATE_PDF_DOCUMENTATION")
- 
--
--# Test for GNUWIN32 tools (only useful under windows)
--# AC_PATH_GNUWIN32
--
- # ----------------------------------------
- # C++ related options
- # ----------------------------------------
- 
- AC_LANG_CPLUSPLUS
- 
--# Enable --enable-debug or --disable-debug and set
--# compile options accordingly. We are supposed to be either
--# in debug mode or in optimize mode. Note that in debug mode,
--# DEBUG_MODE will be set by this macro
--# AC_CXX_OPTIMIZE
--# AC_CXX_BOOL
--# AC_CXX_TYPENAME
--# AC_CXX_STDINCLUDES
--# AC_CXX_RPO
- 
- # ----------------------------------------
- # Check for libraries
- # ----------------------------------------
- 
--# This option seems to always add -lm to the link line,
--# which causes unnecessary warnings with Visual C++.
--# Comment it out for now.
--#AC_CHECK_LIB(m,sqrt)
- AC_SEARCH_LIBS(sem_init,pthread rt)
--#AC_CHECK_LIB(pthread,sem_init)
- 
-+
- # ----------------------------------------
- # Checks for header files.
- # ----------------------------------------
-@@ -356,7 +246,6 @@
- AC_HEADER_SYS_WAIT
- AC_CHECK_HEADERS(sys/ipc.h sys/shm.h)
- AC_CHECK_HEADERS(limits.h malloc.h)
--AC_CHECK_HEADERS(allheaders.h)
- # Enable use of system-defined bool type if available:
- AC_HEADER_STDBOOL
- 
-@@ -370,27 +259,9 @@
- # ----------------------------------------
- 
- AC_CHECK_TYPES(wchar_t)
--AC_CHECK_TYPES(long long int)
- AC_CHECK_TYPES(mbstate_t,,,[#include "wchar.h"])
- 
--#AC_TYPE_MODE_T
--#AC_TYPE_OFF_T
--AC_TYPE_SIZE_T
--#AC_TYPE_PID_T
--
--
- # ----------------------------------------
--# Checks for library functions.
--# ----------------------------------------
--
--AC_FUNC_MMAP
--AC_FUNC_FORK
--AC_CHECK_FUNCS(strerror vsnprintf)
--AC_CHECK_FUNCS(gethostname)
--AC_CHECK_FUNCS(strchr memcpy)
--AC_CHECK_FUNCS(acos asin)
--
--# ----------------------------------------
- # Test auxilliary packages
- # ----------------------------------------
- 
-@@ -423,11 +294,6 @@
- # Final Tasks and Output
- # ----------------------------------------
- 
--# Define installation paths
--# AC_DEFINE_INSTALL_PATHS
--# Redundant with PACKAGE_VERSION - comment out
--# AC_DEFINE_UNQUOTED(TESSERACT_VERSION,["${PACKAGE_VERSION}"],[version string])
--
- # Output files
- AC_CONFIG_FILES([Makefile tesseract.pc])
- #if test "$enable_gettext" = "yes"; then
-@@ -470,8 +336,6 @@
- echo ""
- echo "Configuration is done."
- echo "You can now build $PACKAGE_NAME by running:"
--# test x$GXX = xyes && \
--# echo "% make depend  [optional]"
- echo ""
- echo "% make"
- 
diff --git a/app-text/tesseract/files/sanitize-pkgconfig-file.patch b/app-text/tesseract/files/sanitize-pkgconfig-file.patch
deleted file mode 100644
index d206bac1410a..000000000000
--- a/app-text/tesseract/files/sanitize-pkgconfig-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: tesseract.pc.in
-===================================================================
---- tesseract.pc.in	(revision 816)
-+++ tesseract.pc.in	(revision 817)
-@@ -10,6 +10,7 @@
- Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
- URL: https://code.google.com/p/tesseract-ocr
- Version: @VERSION@
--# Requires: lept  ## leptonica do not provide lept.pc
--Libs: -L${libdir} -ltesseract @LDFLAGS@ @LIBS@
--Cflags: -I${includedir} @CFLAGS@ @CPPFLAGS@ @CXXFLAGS@ @DEFS@
-+# Requires.private: lept
-+Libs: -L${libdir} -ltesseract
-+Libs.private: -lpthread -llept
-+Cflags: -I${includedir}
diff --git a/app-text/tesseract/tesseract-3.02.ebuild b/app-text/tesseract/tesseract-3.02.ebuild
deleted file mode 100644
index d24e0561ac2a..000000000000
--- a/app-text/tesseract/tesseract-3.02.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2014 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.4 2014/08/21 11:35:02 armin76 Exp $
-
-EAPI=4
-
-MY_PN="${PN}-ocr"
-MY_P="${MY_PN}-${PV}"
-URI_PREFIX="http://${MY_PN}.googlecode.com/files"
-
-inherit eutils autotools versionator
-
-MY_MINOR=$(get_after_major_version)
-S="${WORKDIR}/${P}.${MY_MINOR}"
-
-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}.${MY_MINOR}.tar.gz
-	${URI_PREFIX}/${MY_P}.eng.tar.gz
-	doc? ( ${URI_PREFIX}/${MY_P}.${MY_MINOR}-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_PN}-3.01.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_PN}-3.01.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_PN}-3.01.osd.tar.gz )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~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() {
-	epatch "${FILESDIR}/tesseract-2.04-gcc47.patch"
-	epatch "${FILESDIR}/tesseract-3.02-automake-compat.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 "${WORKDIR}"/"${MY_PN}"/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-r1.ebuild b/app-text/tesseract/tesseract-3.04.00.ebuild
index e319f8b4f792..a0dea62d2c59 100644
--- a/app-text/tesseract/tesseract-3.02-r1.ebuild
+++ b/app-text/tesseract/tesseract-3.04.00.ebuild
@@ -1,24 +1,21 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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.02-r1.ebuild,v 1.8 2014/08/21 11:35:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tesseract/tesseract-3.04.00.ebuild,v 1.1 2015/07/31 08:06:39 tomka Exp $
 
-EAPI=4
+EAPI=5
 
 MY_PN="${PN}-ocr"
-MY_P="${MY_PN}-${PV}"
+DL_P="${MY_PN}-3.02"
 URI_PREFIX="http://${MY_PN}.googlecode.com/files"
 
-inherit eutils autotools autotools-utils versionator
+inherit eutils autotools autotools-utils
 
-MY_MINOR=$(get_after_major_version)
-S="${WORKDIR}/${P}.${MY_MINOR}"
-
-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}.${MY_MINOR}.tar.gz
-	${URI_PREFIX}/${MY_P}.eng.tar.gz
-	doc? ( ${URI_PREFIX}/${MY_P}.${MY_MINOR}-doc-html.tar.gz )
-	linguas_ar? ( ${URI_PREFIX}/${MY_P}.ara.tar.gz )
+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}/${DL_P}.eng.tar.gz
+	doc? ( ${URI_PREFIX}/${DL_P}.02-doc-html.tar.gz )
+	linguas_ar? ( ${URI_PREFIX}/${DL_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 )
@@ -31,9 +28,9 @@ SRC_URI="${URI_PREFIX}/${P}.${MY_MINOR}.tar.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
+	linguas_he? ( ${URI_PREFIX}/${DL_P}.heb.tar.gz
 				${URI_PREFIX}/${MY_PN}-3.01.heb-com.tar.gz )
-	linguas_hi? ( ${URI_PREFIX}/${MY_P}.hin.tar.gz )
+	linguas_hi? ( ${URI_PREFIX}/${DL_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 )
@@ -53,7 +50,7 @@ SRC_URI="${URI_PREFIX}/${P}.${MY_MINOR}.tar.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_th? ( ${URI_PREFIX}/${DL_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 )
@@ -65,25 +62,27 @@ SRC_URI="${URI_PREFIX}/${P}.${MY_MINOR}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="doc examples jpeg png tiff -webp +scrollview static-libs 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"
+IUSE="doc examples jpeg opencl osd png +scrollview static-libs tiff -webp 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"
 
-DEPEND="media-libs/leptonica[zlib,tiff?,jpeg?,png?,webp?]"
+# With opencl tiff is necessary regardless of leptonica status   <-- Check this
+DEPEND=">=media-libs/leptonica-1.70[zlib,tiff?,jpeg?,png?,webp?]
+		opencl? ( virtual/opencl
+				  media-libs/tiff:0 )"
 RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS ChangeLog NEWS README ReleaseNotes )
 
 PATCHES=(
 	"${FILESDIR}/tesseract-2.04-gcc47.patch"
-	"${FILESDIR}/sanitize-pkgconfig-file.patch"
-	"${FILESDIR}/sanitize-configure-file.patch"
 )
 
 src_configure() {
 	local myeconfargs=(
+		$(use_enable opencl) \
 		$(use_enable scrollview graphics) \
-			--disable-dependency-tracking
+		--disable-dependency-tracking
 	)
 	autotools-utils_src_configure
 }