Added casts to qreal (bug #515698), thanks to William Throwe <wtt6@cornell.edu>; added mimetypes to .desktop (bug #516794); depend on qtcore[ssl] (bug #462044); added -j1 (bug #484516)

Package-Manager: portage-2.2.10/cvs/Linux i686
Manifest-Sign-Key: 0x3AFFCE974D34BD8C!

5 files changed, 64 insertions, 22 deletions

diff --git a/app-text/fbreader/ChangeLog b/app-text/fbreader/ChangeLog
index 26fb1300a148..8bcd1c0ed3e6 100644
--- a/app-text/fbreader/ChangeLog
+++ b/app-text/fbreader/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/fbreader
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.39 2014/04/14 09:03:36 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/ChangeLog,v 1.40 2014/07/10 10:46:29 grozin Exp $
+
+*fbreader-0.99.4-r2 (10 Jul 2014)
+
+  10 Jul 2014; Andrey Grozin <grozin@gentoo.org> -fbreader-0.99.4.ebuild,
+  +fbreader-0.99.4-r2.ebuild, +files/fbreader-0.99.4-mimetypes.patch,
+  +files/fbreader-0.99.4-qreal-cast.patch:
+  Added casts to qreal (bug #515698), thanks to William Throwe
+  <wtt6@cornell.edu>; added mimetypes to .desktop (bug #516794); depend on
+  qtcore[ssl] (bug #462044); added -j1 (bug #484516)
 
   14 Apr 2014; Andrey Grozin <grozin@gentoo.org> metadata.xml:
   Set maintainer to grozin
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index a68675d92876..bcf64489f324 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,28 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX fbreader-0.99.4-mimetypes.patch 505 SHA256 8f7f6c793ed08ef305031d402e996911942fabead97e69f87e7cc556572647f1 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b WHIRLPOOL 3f4847c2c02cd9f6dedd1df4fc33ca007ee8fd3dac6d0ba170bb2f188a1fad4f393ae1865dd705f78b4666e0af48684c2bae3ce5f7c55a3a83baadb8d580dd66
+AUX fbreader-0.99.4-qreal-cast.patch 950 SHA256 0f3e585292c0dbefa4db33c2b69e90871400be0f92f18fa6ed32daae1227f848 SHA512 260e1966eb5f0bfd42fc3c28fdcdd92d37314d93b31f44e1ec0f94e81ad0084caeaadb69cbd16eb4e8f8b9359534449604845e1b79e63b0dd2eff96b342286d1 WHIRLPOOL aafe31212c1111e43d504f4b84119cdd766c656c86ea454a2fbee541fa5f6bf3649c33aa4874b578d5f0b8ad0541b417a9c69bca11c06c63263f52b62dd3a12d
 AUX fbreader-0.99.4.patch 472 SHA256 cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d WHIRLPOOL c9bed0e846e90e9d31240d24ae536092a00819676fa9588b3125182bb242a597a69947eaa4b19ab5f7b2aba5fc4cf5e700c945f5174d2e8a384677ac6c256c42
 DIST fbreader-sources-0.99.4.tgz 2345664 SHA256 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 WHIRLPOOL 1d25ff39bcd93d3b0445abc76d3bbaf5e376385303fd71c98e3844123c85b9edd413f18c8d89a95807391ee2fb9c044d4dfc4b5898484548a011ecc22993e3d9
 EBUILD fbreader-0.99.4-r1.ebuild 1994 SHA256 a62425accc12bfbd7a14c9c3cf616aa94060051fb2391c0589d42a7cd7efc8d0 SHA512 f20f556953368aa1ba2b26feffc1e9a4c155ca2d2b7b6d7ed3cd3ffb7299aff1e2320d4779254fdcacf4f3afad63b9d8d9ad60132c6cfe0c073b425f9bbaeeaa WHIRLPOOL d7ac0a428da4fc59e9976548732e2939d3eeb2ae4c3a599f057b679e20dcfb9ab37ec2b78cf832220afcfed95fb8075b33a05875945f33348f0c62fcc459114e
-EBUILD fbreader-0.99.4.ebuild 1947 SHA256 59961992974de61e2ae179c88560f78d340aab93d0220cd8c9add93af1c8e392 SHA512 22bec80165902c9003e316b90863cacf276bc33d391fac85a8a1d369824a7a59440234fa8897137745c5985e0cf1f4d648846d4c04dff4f552f92226986373c8 WHIRLPOOL 96098e145d8f930828200d709d062c3582987db2013a37e927c75c1639c5089346891fc094991f8e493faffbd970b03daec5c53b961d2ed7ed9c20459d72f2ac
-MISC ChangeLog 5918 SHA256 f8afd03a0f5ec9d276f1c428be9ac33677d728805cb8bffdd2cbf9e7da7be859 SHA512 18a4d5be506c983285328c272cd083b4cd2ec86fc5df1c32f7c43acad590350522ec7afdf74dd516c05a6ec3ce704889ff8e28d6d74cada121df59447c781e91 WHIRLPOOL 07a8d1785749f2cd2bbd0e72944af3d4d2ba24a42ac24f40db79a87d41ed8906fa73610a91958ab0771626a1f55b6042c610b0c90dd5b070238b2d495853e3db
+EBUILD fbreader-0.99.4-r2.ebuild 2166 SHA256 a94ca42b6b29b153349d28a9cf637098ed87a2fe9a41173511e235f22d63e631 SHA512 a3a0118daec93fdf7a2a19cd966727a3c73af1c42c89e5e064af7a0b96f64828de6f6fc8e3319f29ce4cff4b1456895e6bf424903ca853bffdb8fc4dbb7c55fb WHIRLPOOL 26260ee8c90871ab075069d8627d61a30943d8677c12b505efced9aee4ede1c861e8487916bf6bec7b365383a02376e4e983bee8401e0aa42c5a055ebd670986
+MISC ChangeLog 6332 SHA256 c7f56f62bbfecb4c7a78178d375e1df412b132088192ad7976ce36be86db9604 SHA512 ae852aac88b93b33800b1a4d0a4b7fa528d5aa947dfed3c3b381d185480dea2b112c704f1aab15b2b2837e7e9786e1fb123a7c24cd702f531b6e79ca7bda6a36 WHIRLPOOL a3f103323d2c9a06b1f6a9003c4c13c450287bdf8d215de5976bb668a47d55c45f4a0f4549c682f58dccb1fb2cabcc76e805ae6fe3b7edb0ce8b107332456a18
 MISC metadata.xml 318 SHA256 699867b401860e2b779d8b10e09788369b722a499a325ba30253a155829d53a5 SHA512 b95ba5c5a6c913dd140540a82b8e891e73eda95b8fc277cfa0c1517e17a5f2dc616ac0d2243c3bb52f49f357451d15449d51a08652669b8a90df331d0aa07b39 WHIRLPOOL 6e8ba2e72f0f4eb8b1f1eb37291f91dfe9508c55fec3b3f4e6efd67e1852a670acb5ca13406fed1e361a82a3764eebf79a620fe3bff372d365fa10c805d96919
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTS6KwXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTvm0dXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwOEM0RURGNjY5QzVBNjMwRkU3REVCOTQz
-QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MnL0QAJ4UErGsVaXx7IePmfrJfBMp
-FtQB4+HMX7Ol1RnGcXAjIESMCIJjxxkySaHKGYzCyW29wZAC+hm8jvvA5CjEhHQF
-ov0uJVd2XtnQeUK4dRtrBgMA0qLijvDuVjn2P99tzvyCe60kT9VhJm2+2qugGcuP
-ygk8/VGRrq5SS3Hjdz3Q9OlvRIIbN+gyxBhjm79q2ZSdsolxwKM3UWhapmZR3JaU
-DMRU/2L+JKqFplx4zfzBwS7ZEPrWt98VxIS61E5GyEHp6U1nUGXtQkgfnz8k3s6u
-Op9+s4yv9w8BXAie8gv3yipUuf5S454Uq5zm4oFVt1lI+UflLguG1/eoKGaTBak7
-YMRrG0yMwjrLxpS3BVqGAzut4yELEXwAQwcjestCQTjlJH6aK/9rAjY5jBvZNmlu
-SzF0odTz98vhJdgU/b0Gf+QXs1tAozSfNs0GeR0aDJq4wmdFjuz92WPArVAxo7Sh
-fY6JE0mxKJQ2W67fTvc+luVOQp6GtmC+FyKY+/F8Hlj1C/iS/jfZ9vbesrIL0iGk
-SWDFAukeKH95p+iqEAI1YPkbCoQQP5keJB1TYSeL8PXiR07CQsPolKRE4gfjmC0I
-Ha1kkkI3ii0LUlZsmrYvTD8TEnjMvu1/e7lHcADiTOd7ACqDniw71mNZSpxUplOe
-8L3cKfebmnwbJ34ipZNO
-=hsGQ
+QUZGQ0U5NzREMzRCRDhDAAoJEDr/zpdNNL2MiEwP+wUDHsqjo+xQdyCO+Ikbi05v
+FPZwUq6fNKdIprVgcEmDLeNso31AKXu9nWmS/VCi99jleiTDnPkF25hG9PeLfMQr
+k8X7qpJtlW8OOmUSw1/HFDYZURh7Tsy05+c9ehcBoXP2D4gysEWAnwZAN+wu0BXg
+WbKPJ0dQuzz/aqEaYBpBIbs61znzRbWIUGNKTnzEm7zYAgdJy4DrufgJHacu0f4M
+3G7W3z6dyJ/FdbT3460X63E4eHx22/0PcCahwhh9zpXHi2Y7GITPKkpKMFjLXRDi
+nyGq9IYxubalT7RuJhLk7gR023soJzFnjv69I4Ag452LY7ap2tG3iR2oAbJDxOFr
+3ftmoeTsozOnprZk1thjm55jVU5Ym+b7DcfGvH53TgLYut+GlJ1rBWGfVjdQNNlv
+cnPzjGgBKXAw70Pqfgj//qwxCXGEuEXVyYI6og4Tg+ZCwPu0dy+d6Z0R3Z5jqiBe
+jVf+kLPx/YzFr4VBvYc139SfVoVQ2hYmaV58+rl7+68n7/kurgvx2BnDlLaBSz5e
+aPDqBeiSj0yBN6sWZ3FKlnzL4ceSwKkkTJLNGvuDxgsZ49HWuS3tWG+tMrL7fZ4z
+Gks1iKTXNlVSgJE952ghT9ryFX5ZUye3C+kOWlWlG7M26o096cdxjX5YnpDHk1VY
++xRy08YjVPNxG0EWk3lv
+=9t2U
 -----END PGP SIGNATURE-----
diff --git a/app-text/fbreader/fbreader-0.99.4.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
index ee4a963eddb1..18817f13b573 100644
--- a/app-text/fbreader/fbreader-0.99.4.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4.ebuild,v 1.3 2013/03/02 19:42:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/fbreader/fbreader-0.99.4-r2.ebuild,v 1.1 2014/07/10 10:46:29 grozin Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug"
 
 RDEPEND="
@@ -23,7 +23,7 @@ RDEPEND="
 	dev-db/sqlite
 	net-misc/curl
 	sys-libs/zlib
-	dev-qt/qtcore:4
+	dev-qt/qtcore:4[ssl]
 	dev-qt/qtgui:4
 "
 DEPEND="${RDEPEND}
@@ -65,6 +65,18 @@ src_prepare() {
 	else
 		echo "TARGET_STATUS = release" >> makefiles/target.mk
 	fi
+
+	# bug #452636
+	epatch "${FILESDIR}"/${P}.patch
+	# bug #515698
+	epatch "${FILESDIR}"/${P}-qreal-cast.patch
+	# bug #516794
+	epatch "${FILESDIR}"/${P}-mimetypes.patch
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
 }
 
 src_install() {
diff --git a/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch b/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch
new file mode 100644
index 000000000000..0e4a2935d442
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch
@@ -0,0 +1,6 @@
+diff -r -U1 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
+--- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/desktop/desktop	2014-07-10 20:56:33.527638562 +0700
+@@ -23 +23,2 @@
+ Categories=Office;Viewer;Literature;
++MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
diff --git a/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch b/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch
new file mode 100644
index 000000000000..ffd21b2924f7
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch
@@ -0,0 +1,13 @@
+diff -r -U1 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2014-07-10 19:18:17.002886537 +0700
+@@ -88,3 +88,3 @@
+ void QtWaitingSpinner::setRoundness(qreal roundness) {
+-	myRoundness = std::max(0.0, std::min(100.0, roundness));
++	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
+ }
+@@ -150,3 +150,3 @@
+ 	qreal resultAlpha = color.alphaF() - gradation * distance;
+-	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
++	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
+ 	color.setAlphaF(resultAlpha);