Fix dependencies of gImageReader, mask qtspell-qt4 and qtspell-qt5 and merge them into a single package (in addition to updating the EAPI of these ebuild).

app-text/gimagereader/Manifest

@@ -1,3 +1,3 @@
 DIST gimagereader-3.2.0.tar.xz 373156 SHA256 e31c6664f53503c8109135eadef74314cdbba649a26267ade7bbb9a63e33a5f2 SHA512 1f713aef0f3db8cc035fe91ccf581a716c37fc551aa05d4a9c2d78746c3c15c247075d7332bbf31c58473cabfbf27cbf985129753a34cd6a0815612059ec1b67 WHIRLPOOL 423817220937a0caf639d42f06f35b83babfa75f1d336fc18555ab24791afaff71520b2647190fc0cf090c5c7baade9f0b2bd4d7094372a42298d00cba38f2c8
-EBUILD gimagereader-3.2.0.ebuild 518 SHA256 111056d62064c5a629e5a46507f031b78f2e3e13b014b8555d3f2ca32550854a SHA512 7dec02c30a4fa33052e437439452a35c5b3bf4fbe00c95459faec263dd25989ec05f2910ea5f11f9cdbe6bb70fb21d2605517d36257850a3d8deaea64c405749 WHIRLPOOL 620db9c98276e27edde58f2a4bf0aa0c2422b8ee059feeca7b19b5350daf103e19757e61ade6d313a417eafe8000155d5c865e84a1f6151c916469c16bbc574e
+EBUILD gimagereader-3.2.0-r1.ebuild 571 SHA256 489cecd76ac853249a808b31b0f9086a9c07886b3ae503eea5696c5760f92b00 SHA512 6075f052a80f37d528996bc0594dcc1df462797cacc55e634235c45eac1e932a89563911218bbb71115e07b6a6579a10c6cc7ac599dfb76e31768971c0981ed7 WHIRLPOOL a0f5ec77332c67c7546aaa4dd3246f2ffb81396849d0fc91f7954cd432458f06eb1db44738073c720658209963dcb640a887be65e52a6ef42752bea138f483b9
 MISC metadata.xml 209 SHA256 6f72d6cdc8f1104e104e5ccbc659866e701fa27eb9ed2c399a124bea4c7b484a SHA512 93a3567dd7e44c6b5c62374eb15e6e36cd278565abcf9a4d2ba290ed090e67fb96681e1cf436fb6df47ce0c31bab60a6fefd355d2d3fa69d64cb20f0e98833d3 WHIRLPOOL f76979e9be24f43eb4dde80eb834841bf8cfef9ad404d89d1ee8efb11610cb9238f0da64ea3d0657bac67efe55485ae6bec6ee6a6ff27df6c5d556fce8000db2

app-text/gimagereader/gimagereader-3.2.0-r1.ebuild

@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="A tesseract OCR front-end"
@@ -14,8 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="scanner"
 
-DEPEND=">=app-text/qtspell-qt5-0.8.0
-	app-text/tesseract
+DEPEND=">=app-text/qtspell-0.8.0[qt5]
+	>=app-text/tesseract-3.04.00
 	app-text/poppler[qt5]
-	scanner? ( media-gfx/sane-backends )"
-
+	scanner? ( media-gfx/sane-backends )
+	app-text/podofo
+	media-libs/libjpeg-turbo"

app-text/qtspell-qt4/Manifest

@@ -1,2 +0,0 @@
-DIST qtspell-0.8.2.tar.xz 49872 SHA256 4f8b902b5da39ce532e532f9ec4916d03d623baf6e46a9b0c4afce76800c40e0 SHA512 11694d3e3df01cc5645feb1e195787424ddc08a28eac1bda144e155fc6b3b91a9b605a784d03c3bfbbdaca7ea60c16d3aab6b04f88daee489afa95808f6dd972 WHIRLPOOL e57f63eb2c7681a2a27e05694fa660245e019ffb18955185021e42949dcd17546eed301105acd518c7af52745fd89d4c88cc02801d71f684d9931a645d196598
-EBUILD qtspell-qt4-0.8.2.ebuild 377 SHA256 958c85b0425d77413f05613b54a07e20c970d5a209229fa2e94fc850302e2e16 SHA512 75fa6bf55b4ed871ca152889759e00122a82f249f5519ead84bb5f00e3f5d96583b1b0542e4c078f6d22b9ef12ea90e615aabc81c7d9bbcdbcf5c3743e7b797a WHIRLPOOL f961b0d323a9714569b11ceb78c03e9ceb9bc4c939ca6123976e5243afe100b075b1d3de22fafa6830c7e06a47d497940bbf23fd397304cfa3f033fc06fd066e

app-text/qtspell-qt4/qtspell-qt4-0.8.2.ebuild

@@ -1,20 +0,0 @@
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Spell checking for Qt text widgets"
-HOMEPAGE="https://github.com/manisandro/qtspell"
-SRC_URI="https://github.com/manisandro/${PN}/releases/download/${PV}/qtspell-${PV}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/enchant"
-
-src_unpack()
-{
-  unpack "${A}"
-  cd "${WORKDIR}"
-  mv qtspell-${PV} ${P}
-}

app-text/qtspell-qt5/Manifest

@@ -1,2 +0,0 @@
-DIST qtspell-0.8.2.tar.xz 49872 SHA256 4f8b902b5da39ce532e532f9ec4916d03d623baf6e46a9b0c4afce76800c40e0 SHA512 11694d3e3df01cc5645feb1e195787424ddc08a28eac1bda144e155fc6b3b91a9b605a784d03c3bfbbdaca7ea60c16d3aab6b04f88daee489afa95808f6dd972 WHIRLPOOL e57f63eb2c7681a2a27e05694fa660245e019ffb18955185021e42949dcd17546eed301105acd518c7af52745fd89d4c88cc02801d71f684d9931a645d196598
-EBUILD qtspell-qt5-0.8.2.ebuild 449 SHA256 36dd4b32b46eb884940716d8889a3f767a670e5135f77cab98f092ec2c93924c SHA512 bcf2df33b62cc23bdd60b2e7b552c37899f886035afe204aafd8af19fef96ca0feece38c82e22e54dfa5cdcd6a99ac749d5e12da50fcf853d6476b2f90258c00 WHIRLPOOL 21441bb9a8d82f9b8368ce583c7dceafed223ef4f3859be6fc85ba6d385d094e465f85507112c1afd795b241702fe3528c872dda26acd3c442f081e72b014413

app-text/qtspell/Manifest

@@ -0,0 +1,2 @@
+DIST qtspell-0.8.2.tar.xz 49872 SHA256 4f8b902b5da39ce532e532f9ec4916d03d623baf6e46a9b0c4afce76800c40e0 SHA512 11694d3e3df01cc5645feb1e195787424ddc08a28eac1bda144e155fc6b3b91a9b605a784d03c3bfbbdaca7ea60c16d3aab6b04f88daee489afa95808f6dd972 WHIRLPOOL e57f63eb2c7681a2a27e05694fa660245e019ffb18955185021e42949dcd17546eed301105acd518c7af52745fd89d4c88cc02801d71f684d9931a645d196598
+EBUILD qtspell-0.8.2-r1.ebuild 480 SHA256 8545c534ebb3ef1c8cf1dc47290371ee3dd6f99bc1ade5968389e20d4f6887c3 SHA512 47d12007ecc8f0494477e61688ab681981afa573efc7b4b7267b57b49888b4e27adebebc2f9890f52937a461565c506b18b3d753da903f7df2db6bec40498e53 WHIRLPOOL 7e7d6a54fe591ba63ca236e670c50ee5430cf3f40797912cdeb2c3f08685576320b51e0cebb4c8918105426223ec2f1a9668e8f0e9957451743bd3d62e5b1038

app-text/qtspell/qtspell-0.8.2-r1.ebuild

@@ -1,4 +1,4 @@
-EAPI=5
+EAPI=6
 inherit cmake-utils
 
 DESCRIPTION="Spell checking for Qt text widgets"
@@ -8,7 +8,7 @@ SRC_URI="https://github.com/manisandro/${PN}/releases/download/${PV}/qtspell-${P
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="qt5"
 
 DEPEND="app-text/enchant"
 
@@ -17,6 +17,8 @@ src_unpack()
   unpack "${A}"
   cd "${WORKDIR}"
   mv qtspell-${PV} ${P}
-  cd "${S}"
-  sed -i "s/SET(USE_QT5 OFF/SET(USE_QT5 ON/" CMakeLists.txt
+  if use qt5; then
+    cd "${S}"
+    sed -i "s/SET(USE_QT5 OFF/SET(USE_QT5 ON/" CMakeLists.txt
+  fi
 }

profiles/package.mask

@@ -0,0 +1,3 @@
+# Both packages were combined in app-text/qtspell, remove one of these before updating
+app-text/qtspell-qt4
+app-text/qtspell-qt5