0.8.68 version bump.

Package-Manager: portage-2.2.0_alpha124/cvs/Linux i686

3 files changed, 23 insertions, 8 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 51798dd94583..b2130e4fd25b 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.225 2012/09/04 16:45:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.226 2012/09/07 20:17:54 zmedico Exp $
+
+*calibre-0.8.68 (07 Sep 2012)
+
+  07 Sep 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.68.ebuild,
+  -calibre-0.8.66.ebuild:
+  0.8.68 version bump.
 
   04 Sep 2012; Zac Medico <zmedico@gentoo.org> calibre-0.8.67.ebuild:
   Use system liberation-fonts for bug #433932.
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 9278530629d8..8f42507e1339 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 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.8.62.tar.xz 25090932 SHA256 5da54282959e86f288dbb3e275ab403db5a66c74c7ab384adeeb24c459612159 SHA512 2d129b49b3b6daa2a5c85c02a57e70c8ac1ca8b102bca6f708c9094b9f04fb97abed62b4b00e2876473e887492cffbda3247be6021dfb6fe869f878b335c213d WHIRLPOOL c2b90f76b21dda70902dfcdda7fc698f1dcdb5397724f409745530be3f891e556806aab10a3d9328ad695455a6e0ad04084182f63af55fb4328ba60fab228cfc
-DIST calibre-0.8.66.tar.xz 26566208 SHA256 56711a154a29170f9bd12f616578abf3daf4d321e40a8f17210f74f51085275d SHA512 043e39972e8c303db2f39343deb95c7b3a73d341a5427361be9a0a1b33c1bf1b0e4e465648845ab51de67849f799470298d37bc6d1f2d0f1e6fb8eaf02eb7c9a WHIRLPOOL 21580087230ca898e946541331237b7881cb94f8130fd86b747e76f01dc1f72d9f76f984caf58eda4d7a6d12989e4095ee7027610e00887c22a791d1409ceb69
 DIST calibre-0.8.67.tar.xz 26569752 SHA256 de1f332bf5bf9368d3000dbb0b06af92ebf550eeef6678f7418ebbcb7265b84c SHA512 1b0baed4179f62f635f393a34891e3c36a4254c2e5e4450925136a7b254388387dbab08fca1a6900dfb3450e3512089c056bdc6f27e5525d2de52079a0b6141d WHIRLPOOL 1f806d1457ad2b97c6acd11e3bad4fd18976fabea13f8457cfb34d44fbf7df347240d80caad5443dc259a7930cc8a74132ee80986d034b25eaae567a1bc420e3
+DIST calibre-0.8.68.tar.xz 26852296 SHA256 dd5f6ce36d0a013e3043abf543a86f8eac0f842e8c97d702960e1ff9e0bf4b04 SHA512 7afd99fddfe86e76e174c1139e1b495282af0314d5241d9278fe3ad56f8681d97ef942536c831ce4bcb55eb68202cc3040412d63a58b67b700cd0b9126ace5ab WHIRLPOOL 612495b65b60293455886029ce2113ec9ed2e0e02d40dcb966c3cda4225dd40f6df6af6078f37837910c5313572bc3c5f1a3ee4536535457cec9e152457e4292
 EBUILD calibre-0.8.62.ebuild 5733 SHA256 8df8f09d00a789cc89172208c384a340aa251484d99f2c0ff869e0611794e067 SHA512 c7a8d240b718f2b5e94d316e4192e937375e73af18f9c781a3a8b34a7be5409a71d4d110af3f3adabd91eee863254186f5e1cf3b12f869b59b77d83f8a6628e7 WHIRLPOOL ae489cf1981b4c51d1fe0f0e5dfe9f1f422f22f3c23e6a075d9299b1e4ee9d5f03316006d6fefefe11432a129434829d916ec4149bc4656384933584cc082d20
-EBUILD calibre-0.8.66.ebuild 5744 SHA256 f42b8211b432d65147ee840c3f4cb5cadeb64e6ab7c596ec2000bbae7ef5c5cd SHA512 07981b91297fd3e51f428e5090ec5f65a6f6c4cec9f31dc3dc3a77c306ce606629fff763f2ea7c5b0c83da9c8435ecc168447c5079fa1e1be917ec8f99457fe5 WHIRLPOOL da6086f3f86db64cb13a088df14a3c861cc50a941dd804c8f1bcd0fdc0dbf1f84233972064cad8d40aa3eb6d81aca0c4587a629633e10ac48901857995d58a9f
 EBUILD calibre-0.8.67.ebuild 6014 SHA256 95b717e8347fd8a16fbc277a52692db6eface2fffefbed53694fe9f727072fdd SHA512 398441c0aedf2d14cd150d3547e06a100891ac5d65abf382b861737f77b4bf9ba9a9cf85f7368e7308da74ef9c05bc66440052ad5191786f63fe314720c23b45 WHIRLPOOL a0a22df1cddf59612af9b3b844c60edfd447783815c8aaad35d815fbd6461fe42ee3250bfd3bade1f2624ed96a4e7ab0f679d7a73996bc1be61372e522a21696
-MISC ChangeLog 36098 SHA256 11c0e6f980bce84fa81b131ae6fc090258985d7eaaf62cf0fbf5ad420ba55e48 SHA512 45bcfa69dee6dda7fcf2a58291908aad6e1ab128e086442a8402fe33967eb6fc6354ae5915af2ef043ede0d9360534ef526e7361874820366c09f3a981ecd4b6 WHIRLPOOL 3b2165a37d8ba7c10ed2c41f0e47b3cbf752ffbfc7e9cd50764f5236ff95491b4f7d43d8241fd68b39c0dcbbf9f0d3c39167068b4db99ea48e5cfd1a3e1da297
+EBUILD calibre-0.8.68.ebuild 6014 SHA256 a3989d2d042638690e6006e9b13e74bd69796c5be401868a27a547b6e37a1302 SHA512 5331e1e3ebb1c517ec846406371fc87fc93bef76bc59b6e72ee136edbf4e4651b8393455a17f00caacbca41a0ec99971324c24139ed356bff3fb724fb4c463d6 WHIRLPOOL 50293458582b0fcf817e17c8f4d12945a8b10956afc3d101818715d04e9093262658f35b2aa7df8ec6dfee994d7215c21eb9fba626d6057b46cc7a03b82f9f89
+MISC ChangeLog 36250 SHA256 996709dd04fd8e5306c130bc9a0534d2688f5a7d39277cafd66d82b4766b243e SHA512 9201b6ac97fa614b105a0bff23dc336e1efcff716873d7c3b96a72ace2ca3b1d74404612ddea0c6876dc2c21988ff2bc4d692900499a6847c238a83445cfb30d WHIRLPOOL 10a5851911b09af1c89753043ed80de7203182bac8e19da5c983cb8c326a280a58d8cb8faf15eba444a46308f9d5fcd388ad714b86fe51accb8f28b1eb0ace43
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBGMEAACgkQ/ejvha5XGaPh+wCfRaBZ/CYH7CFsAY0DHWI70Fqe
-t2MAoOf1GECTwnLfay5db/Xe66HfDFe6
-=eeah
+iEYEAREIAAYFAlBKVn4ACgkQ/ejvha5XGaMx9ACfTYTEgGt3oIbjpIYnr6Bzl03q
+bNgAoKa48JV5S/9rDzYfsQriwpyjQx3z
+=3vqC
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.66.ebuild b/app-text/calibre/calibre-0.8.68.ebuild
index a8d1b9191fc3..87e7513436a2 100644
--- a/app-text/calibre/calibre-0.8.66.ebuild
+++ b/app-text/calibre/calibre-0.8.68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.66.ebuild,v 1.1 2012/08/24 20:28:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.68.ebuild,v 1.1 2012/09/07 20:17:54 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -26,6 +26,7 @@ COMMON_DEPEND="
 	>=dev-libs/chmlib-0.40
 	>=dev-libs/icu-4.4
 	>=dev-python/beautifulsoup-3.0.5:python-2
+	dev-python/netifaces
 	dev-python/python-dateutil
 	>=dev-python/dnspython-1.6.0
 	>=dev-python/cssutils-0.9.9
@@ -35,6 +36,7 @@ COMMON_DEPEND="
 	>=dev-python/mechanize-0.1.11
 	>=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-libs/libwmf-0.2.8
 	media-libs/libmtp
@@ -156,6 +158,13 @@ src_install() {
 	rm -r "${ED}"usr/etc/bash_completion.d
 	find "${ED}"usr/etc -type d -empty -delete
 
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
 	python_convert_shebangs -r $(python_get_version) "${ED}"
 
 	newinitd "${FILESDIR}"/calibre-server.init calibre-server