0.8.66 version bump.

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

3 files changed, 18 insertions, 13 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 854f43052806..ceb821e63b1a 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.222 2012/08/17 21:15:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.223 2012/08/24 20:28:26 zmedico Exp $
+
+*calibre-0.8.66 (24 Aug 2012)
+
+  24 Aug 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.66.ebuild,
+  -calibre-0.8.64.ebuild:
+  0.8.66 version bump.
 
 *calibre-0.8.65 (17 Aug 2012)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 183e84d31941..a1234ad51d75 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.64.tar.xz 25299108 SHA256 afb214051b89c4fb9a78c7183f721764d4869e3a2d078be54c23ce8e3baf3195 SHA512 a9184b33a17ebcdf776ed4c209cb3e222a6e9857b75e1827983d472e0a83a94e6800294ea10713df30a8330a0a7149484819459a1b072a386d1210f906df161e WHIRLPOOL dbfccdfc0214c19eced4ae84c06687f4c871c2b8be738a65f454c596663ac563d319dff76ec1f891b59055c280c31186726f20ce6667e94011ae81af12286c46
 DIST calibre-0.8.65.tar.xz 25275880 SHA256 51e969614bd40cefae92dc3c7eba10d682613090c0e60bdd4de5ef865e241b9b SHA512 eced2d9be93d29852701f0d63d035ce0913652ff2cea8675ec65d03d5b2f934b2fc2b4371788d0616cf93bfae30f5b16a0622ede2858cdf09e66330c1c7ac124 WHIRLPOOL 02021d57089eb9bfe7e53bd924223c2f813922d44b7765bf49661f2c283cb47f241239d3c76699a177fe0d6c91496065923779e93bab377ee410e9ac518ce426
+DIST calibre-0.8.66.tar.xz 26566208 SHA256 56711a154a29170f9bd12f616578abf3daf4d321e40a8f17210f74f51085275d SHA512 043e39972e8c303db2f39343deb95c7b3a73d341a5427361be9a0a1b33c1bf1b0e4e465648845ab51de67849f799470298d37bc6d1f2d0f1e6fb8eaf02eb7c9a WHIRLPOOL 21580087230ca898e946541331237b7881cb94f8130fd86b747e76f01dc1f72d9f76f984caf58eda4d7a6d12989e4095ee7027610e00887c22a791d1409ceb69
 EBUILD calibre-0.8.62.ebuild 5733 SHA256 8df8f09d00a789cc89172208c384a340aa251484d99f2c0ff869e0611794e067 SHA512 c7a8d240b718f2b5e94d316e4192e937375e73af18f9c781a3a8b34a7be5409a71d4d110af3f3adabd91eee863254186f5e1cf3b12f869b59b77d83f8a6628e7 WHIRLPOOL ae489cf1981b4c51d1fe0f0e5dfe9f1f422f22f3c23e6a075d9299b1e4ee9d5f03316006d6fefefe11432a129434829d916ec4149bc4656384933584cc082d20
-EBUILD calibre-0.8.64.ebuild 5752 SHA256 741d0c2d733d2f002253d69995e97b536f2f3c4c147dfad562f158e7fa38892a SHA512 b0555b60bc23c12c299241abb238e06e7b521c055e7fa539ac819a881242f39392bd0e1a99580701efa0a62cc1e16fc8893848fdc69b7a0b9e10e20f48c8e3f1 WHIRLPOOL 684e18565eda5e80333798ba74963c8a4a92685aff5d4b91592b905460ad0d1c62abe2a83e103b51e230dc109252acaec411616a7b68f2e411e85ca1f9a7cd20
 EBUILD calibre-0.8.65.ebuild 5781 SHA256 375c63c418070af35de0a15c5d095347e15aea044ca1c4381ddb6200e7e81dbb SHA512 d6f103988fbc52bbfd6b617a6ea3cecbf530c3a99897ea3cbaea181f2cefa61922eca3abab31ad2dfff0812dc9207f0584231be0ede097ef6460380a306624eb WHIRLPOOL 3762899f5636f0431d086f371b83ff05d32435fe2c317b680e2a2c76a7fb90b7460956b6f50ee0035b19375e33aefccc416323fbcbf3d6c478398be04d3969c1
-MISC ChangeLog 35676 SHA256 376f5c13704dab75531663c8b4350b62d83242f0d413b04887b3fd10b32e4d52 SHA512 26b2109bbb57f1e9ef39d43fac38dfd8dc4cf783f45711ea60921a75fb6dde6ec49bde503020fd3fca09ba7dd81f6ba70b1860e08a801b0b3081d488bb2dd322 WHIRLPOOL 76e456a82a02d5f2749f482f7a1101cab9210512f33d6dc84e46b82bfe9673eb8da4a949c7078fdc317df665236cb6e13aa06eeb6a32f23fe5e42caa6ec94167
+EBUILD calibre-0.8.66.ebuild 5744 SHA256 f42b8211b432d65147ee840c3f4cb5cadeb64e6ab7c596ec2000bbae7ef5c5cd SHA512 07981b91297fd3e51f428e5090ec5f65a6f6c4cec9f31dc3dc3a77c306ce606629fff763f2ea7c5b0c83da9c8435ecc168447c5079fa1e1be917ec8f99457fe5 WHIRLPOOL da6086f3f86db64cb13a088df14a3c861cc50a941dd804c8f1bcd0fdc0dbf1f84233972064cad8d40aa3eb6d81aca0c4587a629633e10ac48901857995d58a9f
+MISC ChangeLog 35828 SHA256 7dc08735f40b84e76850ff6112db198a6c7ee25aed6a29a69ff3da3a771b2197 SHA512 42c49c618573fa3a99382c6231c31794b31aeff82afc8dd72295749a130604a534ef7e63bfc9030d334bddbe03e96a0375a22a8820fdd7de3a2aa56818e22d11 WHIRLPOOL 5472c23c35f1ae66a73aab5747793c5f201426d42b8619110b13044b808ccf17cf79a52156b5494b210343e3db83e79f9a6bf3b258e3adbfcf329f3061538466
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAutJMACgkQ/ejvha5XGaPACgCfZFrDj3COITCnbm2vTMD76isP
-TRoAniV5zVBUo525YqCXPf0AS6Biq9hr
-=9UMN
+iEYEAREIAAYFAlA34/EACgkQ/ejvha5XGaNipACfTAz1k9+n7Cx234bf0h1HZ7VI
+gu8AnRmqdI1+Lu5vCcIb9spwIw4YlXDa
+=9o44
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.64.ebuild b/app-text/calibre/calibre-0.8.66.ebuild
index 8934b3b5610f..a8d1b9191fc3 100644
--- a/app-text/calibre/calibre-0.8.64.ebuild
+++ b/app-text/calibre/calibre-0.8.66.ebuild
@@ -1,12 +1,12 @@
 # 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.64.ebuild,v 1.1 2012/08/10 22:20:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.66.ebuild,v 1.1 2012/08/24 20:28:26 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
 PYTHON_USE_WITH="ssl sqlite"
 
-inherit python distutils eutils fdo-mime bash-completion-r1 multilib
+inherit python eutils fdo-mime bash-completion-r1 multilib
 
 DESCRIPTION="Ebook management application."
 HOMEPAGE="http://calibre-ebook.com/"
@@ -84,8 +84,6 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
-
-	distutils_src_prepare
 }
 
 src_install() {
@@ -127,11 +125,12 @@ src_install() {
 
 	dodir "$(python_get_sitedir)" # for init_calibre.py
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-		distutils_src_install \
+	python setup.py install \
+		--root="${D}" \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/${libdir}" \
 		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}"
+		--staging-libdir="${ED}usr/${libdir}" || die
 
 	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
 		die "failed to fix harcoded \$D in paths"