0.9.19 version bump.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 22 insertions, 21 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index f510a176ffb1..cb68cf8e57ed 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.260 2013/02/10 20:11:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.261 2013/02/15 19:06:27 zmedico Exp $
+
+*calibre-0.9.19 (15 Feb 2013)
+
+  15 Feb 2013; Zac Medico <zmedico@gentoo.org> +calibre-0.9.19.ebuild,
+  -calibre-0.9.17.ebuild:
+  0.9.19 version bump.
 
   10 Feb 2013; Tomáš Chvátal <scarabeus@gentoo.org> calibre-0.9.18.ebuild:
   Uncomment again the LANG unsetting.
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 6a58788339c0..d1d1367aa6c3 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,27 +6,17 @@ AUX calibre-no_updates_dialog.patch 891 SHA256 59cbef4d8026241bd198f36728c4dfde6
 AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
 AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b SHA512 c51c7cae899bebe7fb339f9cfd4070caa778f86ce997dce26052e158dac12444d3a72db91fd83528ccad07d9bd9a9e72edca9ba91d1805e91c91a0a6ed32f579 WHIRLPOOL cf91dc9993b0329821a9a7b9b4a5245c8ef7a6a2a407cddae4b7b94aff1698e663e9ba08352b61b48fe34a1e3c83701ac71ac549142fd12795e1828d5d8f779d
 DIST calibre-0.9.14.tar.xz 27947396 SHA256 e9df7052902a2c5447abe4305d7cee0c8b675b52f299d6a879d232d3901059a1 SHA512 bdb25750386d692ee909c5affe1845f4098444d340f80333a6002f6a1964477ebad0fc5f80bf1c499238986cab95733a75a8051dde937babf9065ca06fdb60b4 WHIRLPOOL bce5a0486eb9bd45aed16b14df78b8472cee0da2392958889e340f2b6f9eea8e965b4a7e8e5f1fee842d76e17b25d46feb68b9d8f415a55b1bd0862b71c5b223
-DIST calibre-0.9.17.tar.xz 28020076 SHA256 520dc6f46fc6984ce7882f3eb720313df38a3041dfd8275daa55c3a0a22e0ad9 SHA512 0c6d8331c8bbcea23987d8ab33b75247614a86ac048f4ad47a569d67f8ab8fda7b929cf477d2fcd2b20f9c67cec981518d4aeb2618fe3f45ee5f3129b1084031 WHIRLPOOL e948fc3b62ff7cc66a541d4f1df6d4bd5c5b430d3996b8962eb3d118999d2ad33c8ef41e88ed445e0bb887173187b38c7b0ba643c2942707308308c2bf0cf045
 DIST calibre-0.9.18.tar.xz 28052268 SHA256 aa02cdd764277d049b546e0715506ab9209399d4f3ff00bcfcba299f7b7bac8c SHA512 5949785e161c20ef74ff827ecf8ad840f0b595c337430bccce4e311b56caed43c2f5b743581788078a84b406986e95b565f309f3cfb314280b3693409b52508c WHIRLPOOL 99f18f9928ae4e8598d38b4a6cff54edb99447c623be13ae6297e7b1900173282264d9c431aec70e454b94785cb01e3213e5abd93a65e092bdc817e26aaa8235
+DIST calibre-0.9.19.tar.xz 28146824 SHA256 c913b8b45bcfc781cdc1a573ff6a57e6989abfcb17b8401d59cf0b9d5e8cf0d5 SHA512 00d52b9dde5d236632db7b3acb3ce68ba4aaf91bf3c10ee30554e76bf4414598bd3dd5d6472a923d7906cb5cea198a16e3c45f5ca292db396714844000a2ef82 WHIRLPOOL 056b02e08886e36706cd29859f3e9199dc049221bc7c0b49441bcfc0f5b6d7ff8277405112ff165e6690522062c69947321fdd9c47507c23542274dd5a73e5da
 EBUILD calibre-0.9.14.ebuild 6113 SHA256 469ccbaa3a6b195864c7d11b213ecc93d387e618bcce17ff3b7d3748654a6024 SHA512 af1b533087cdc81c1fc652f2d5ef066042e133e3bec5ca6c3e234adef57cc4cae1b7f68b60ea342192fb158b56c0a83080914ac7333fc5b1e89816d2e1fb724b WHIRLPOOL 115083c37b807a4aefce177d59868b9acdf8b0a2db78a4ce695f045e8d0399a8bd7a73cb659a487606e963ca8e05444ce71049fa1a81327aa038796b9b75eef0
-EBUILD calibre-0.9.17.ebuild 6115 SHA256 4d141baeaad6f3c6cc74ea8e9cac861a37f640a3726c933952d18bb4a28dfff4 SHA512 a326dd8ec67e585935b9a8d433d0abd363739c5850b67d2d174e7a0cbb658a6dbfdb6eb9454fb1c0a0bc8568281ab47428a568d528def18da973ac55341b541a WHIRLPOOL f87ad126d1ead049001c207e7ea29a472ecb25dd05b7dcbeffe65337a141f2a93b549727ad6c3bf40765e8c1fdd2554626f23940aa1fdf5e066a0fe9f58fa8b9
 EBUILD calibre-0.9.18.ebuild 6374 SHA256 8715ec115255fd3eadfb7583b088cd40852bb102fd3139f35c8edf4e52f59b1d SHA512 76950b8efd9f43f418a15660618806558f626c3d92a62ca0e2fb226ff57dbf77c4c911acd723462eedfb150b6cc896b10f2134f9def76da805faf8c3bb02e00b WHIRLPOOL 7924fbdb8ed00fac347662902b6218b0e070af3cba779d52e66750a4bac50f2941fc9d984f3ee681650ce50299e53686efa3f80f2e5f9ce9be0ff9549fd8aa6a
-MISC ChangeLog 41559 SHA256 2167fb4ad0d398bc92a30497f2d78056f68f29316cb373bdd6a85ceebfb49ae8 SHA512 37301ddb59ac829021fdc49687f0631efb7175e638173c65fe2558ada0ef9a8ae2b107c216e3ee36b94701675cc6818f73aed446fc810ead55c1df79131cd313 WHIRLPOOL 0186460d04a79771ee63f0995516108627a09bc82f88c4512f07eebdc9a3668ae79c6f3dc183aae398d5be7bc318473f942d65248955c1a3f6a805de66dbd30d
+EBUILD calibre-0.9.19.ebuild 6372 SHA256 44469aeeeb0923c7c8bb2cf53c6eaf5dd1c8e68c11e1937cb5c7d2f8e9b352cf SHA512 bd3bc57e9115feae22730480e56d40cc86ba925068ba9004434d1f67aa00300540a00c0fd90da81c97b711ccae1b1a72e1ba0ef9ce97c68399603ba6fc617687 WHIRLPOOL b90dcfd535889d49103e3c16335f06c3633e06a9ec98dad500c4e02c242bb3c02fd3f9aab00b340af545cd8fb3a4ffad87164d4f26890d17ad414e80c7c05aab
+MISC ChangeLog 41709 SHA256 a916515931a10582d03215a921bbc2665c6d3d07b14d431383f18a8038f87a5a SHA512 c9e46a70cdb2236c9ac5191dba2eb6ad96d659945b1ed6ccfe8fa24f17146719123a8ec830683f0365412aa988b9c4de7d82a8435f8c7d1a25582b55ab2c7540 WHIRLPOOL f5db3306391d53568d39682c7000240436f92b29e731a91510f00018620d15311ae414e8473962d62b6b2638f0d5d202a2c70b6ee2e9171fbcfb09b036fabaca
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRF/76AAoJEOSiRoyO7jvo/CwQAI6qbze/LPInc4aMAfSBYth5
-KMnvUxIqsvMnkOWBY6J3JF33LUmVuPzj6C4SXPMya7k17T5wOMuAodgLBA+G1ysO
-FvxF0HUjq6opEJ3XPx0rCFT2E31WjfSQ507UiM5/01Ddge06fRySZDi+i7Y7r+ca
-mbCb9sYjK/eHVEfbizgIvEBGDBOCbUyWCkkn03xUXqQ+Xm+nkdA8FpHGwpAg+5Ah
-0tia5wT4QYQW2yPESlp/AjXm2rJPCT+lGqWHg/raqu65wWPyTXLdLkzEyNxjvJ9U
-H5JE5746XCUggyD4qC2fJ1ryK1ZTJAvkRystH0K3UPiu+dtOLK/KwnqpRHltIK5x
-ZcIyrB3SMOQejuAy4JxT59HaR1i+mEexo6aDIOGYxWvInKxWn9iC6KvdTwfiRyzb
-ssDXLNHiLGfwp1rMGK4whIsPkHD1F+PQMrXq3IibaEKi/X7evz987nSR4AdKz4Gh
-oK1Rkh1krFpN7+MBIjqvzf/9VZvR5SvYQOoVAMT/0vRfIM79fOPMy0uvqgrf0Sfz
-QrEdkneLCV3/AmHlTyJV2XHb6BOtp95uLkSl6k/SppbHgJ0zEmkMzG1rpRPa/SNe
-H2CMo0a/wJfsdhMWK2Z/TgMvvR21Qf4JQwLYue4/Yy4rDKzGfjHetTMBzH2tZpat
-DiOIf81/KA2DHjdTLmTt
-=rXE+
+iEYEAREIAAYFAlEehzYACgkQ/ejvha5XGaOM7QCgpmwoPQm1IklWlCvNrjDCsrvY
+i4UAn3or51/pYkoCbio0x448izbCzwAH
+=U1NJ
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.17.ebuild b/app-text/calibre/calibre-0.9.19.ebuild
index f24f34372460..8f8d9c675343 100644
--- a/app-text/calibre/calibre-0.9.17.ebuild
+++ b/app-text/calibre/calibre-0.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.17.ebuild,v 1.3 2013/02/07 03:29:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.19.ebuild,v 1.1 2013/02/15 19:06:27 zmedico Exp $
 
 EAPI=5
 PYTHON_DEPEND=2:2.7
@@ -22,7 +22,7 @@ IUSE="+udisks"
 
 COMMON_DEPEND="
 	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)]
+	>=app-text/poppler-0.12.3-r3:=[qt4,xpdf-headers(+)]
 	>=dev-libs/chmlib-0.40:=
 	>=dev-libs/icu-4.4:=
 	>=dev-python/beautifulsoup-3.0.5:python-2
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=dev-python/python-dateutil-1.4.1
 	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
 	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9:=[jpeg,png]
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
 	>=media-libs/freetype-2:=
 	>=media-libs/libwmf-0.2.8
 	>=media-libs/libmtp-1.1.4:=
@@ -88,10 +88,15 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	epatch \
+		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
 }
 
 src_install() {
-
 	# Bypass kbuildsycoca and update-mime-database in order to
 	# avoid sandbox violations if xdg-mime tries to call them.
 	cat - > "${T}/kbuildsycoca" <<-EOF