*calibre-0.8.18 (10 Sep 2011)

  10 Sep 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.8.18.ebuild:
  0.8.18 version bump.

  10 Sep 2011; Zac Medico <zmedico@gentoo.org> -calibre-0.8.14.ebuild:
  Remove old version.

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

3 files changed, 31 insertions, 26 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 5dac45ed39e3..523e507f706e 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.159 2011/08/30 02:03:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.160 2011/09/10 20:55:35 zmedico Exp $
+
+*calibre-0.8.18 (10 Sep 2011)
+
+  10 Sep 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.8.18.ebuild:
+  0.8.18 version bump.
+
+  10 Sep 2011; Zac Medico <zmedico@gentoo.org> -calibre-0.8.14.ebuild:
+  Remove old version.
 
 *calibre-0.8.16 (30 Aug 2011)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 9fdda9c195fa..204df51be057 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST calibre-0.8.14.tar.gz 29055568 RMD160 f1112537c65a73d9661e7db9e983928214e8641f SHA1 46de2de350e67c63c9338590a9e9b7b4274a5f16 SHA256 ec46f80512f66130dcdcdef5feaa6ca9d523d68283904cfa23eaa1908f457ea0
 DIST calibre-0.8.16.tar.gz 37070257 RMD160 56e3eef65f9761a6dfc3c7ec84a57db70403883d SHA1 3dcb817cc80946d8d0bb5b39eb7411c16eac17db SHA256 5aaef1efa5478d31518237944dbcadc105d9e31a87c1d307cd8b4525e12ec23d
-EBUILD calibre-0.8.14.ebuild 5381 RMD160 1a8a799862671c1f5104936e784414ed539a2627 SHA1 3d60696e4d19654a2b7b194b97daf728737fa4ea SHA256 f356b458d81c6755c7e4aadb299ad9d926e9f9e63dd2a1cd7534a6a34bb54bdc
+DIST calibre-0.8.18.tar.gz 37020762 RMD160 bd38a49c9c7f8de0e3a9955b3eae26557fbdadc1 SHA1 33347da2864f0f52a94ec8929aefab2e1cc40523 SHA256 4f1a7d81c0c6d6f31dcc7269623f5a39e9af2db88a03a6e6fadaa83e7e323336
 EBUILD calibre-0.8.16.ebuild 5381 RMD160 c8a29a68dabf0a63b0d8b25285676cf3d4420f62 SHA1 073c770d8494ca49b92e499391e8984023a09435 SHA256 c138a08d696934bf681575bf05363f32cc23277bc462e81043569f03a7f426b3
-MISC ChangeLog 25668 RMD160 10c6ef1f3bff2ea5c0bf5e44af45a4ba1f463b32 SHA1 814babf95fa2a9bae670cbf9016ccabe00f21e6d SHA256 e4002d0f669927dcf4ecf62373c0d7a827054a84f5f89a74e76887f1a439d2a4
+EBUILD calibre-0.8.18.ebuild 5282 RMD160 55e95de33d53627c94fe3aef9d72e3947bb2ad31 SHA1 053d8b8dbe2ac35855fa5202ff4827825b5acea7 SHA256 0816294fabff50e24ee64979794ee92f6c6c212ad9769ff072995e408cb87200
+MISC ChangeLog 25888 RMD160 53bcb29ba5af4a76329be7b39f7107245f97142b SHA1 f541dfc6fd54c57fdad1f78b1ed2b97bddecd4dc SHA256 5327c8302d3000049fd633a764259cd98c93930b8470dca11e3b3f6793733f78
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5cRQYACgkQ/ejvha5XGaPHnACcDtCxAUbb8LLiV+CjcEAQAQIK
-jJAAn2wG+Y6QHz3h3wTEIXlqy0frm+1P
-=oXaM
+iEYEARECAAYFAk5rzs4ACgkQ/ejvha5XGaP7iQCgrzPhnKznGVy9VfwvV5MN0UCG
+EN4AoNKloozbjC2ElHWonfhbfZIzqVmi
+=EfLP
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.14.ebuild b/app-text/calibre/calibre-0.8.18.ebuild
index 80e18acfe9a0..de33bc9f8a3b 100644
--- a/app-text/calibre/calibre-0.8.14.ebuild
+++ b/app-text/calibre/calibre-0.8.18.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.14.ebuild,v 1.1 2011/08/16 11:12:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.18.ebuild,v 1.1 2011/09/10 20:55:35 zmedico Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.7
 PYTHON_USE_WITH=sqlite
 
-inherit python distutils eutils fdo-mime bash-completion multilib
+inherit python distutils eutils fdo-mime bash-completion-r1 multilib
 
 DESCRIPTION="Ebook management application."
 HOMEPAGE="http://calibre-ebook.com/"
@@ -113,17 +113,15 @@ src_install() {
 
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 		distutils_src_install \
-		--staging-root="${D}usr" \
-		--staging-libdir="${D}usr/${libdir}"
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}"
 
-	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
 		die "failed to fix harcoded \$D in paths"
 
-	grep -rlZ "/usr/lib/calibre" "${D}" | \
-		xargs -0 sed -e "s:/usr/lib/calibre:/usr/${libdir}/calibre:g" -i ||
-		die "failed to fix harcoded libdir paths"
-
-	find "${D}"usr/share/calibre/man -type f -print0 | \
+	find "${ED}"usr/share/calibre/man -type f -print0 | \
 		while read -r -d $'\0' ; do
 			if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
 				newname=${REPLY%calibre.bz2}.bz2
@@ -132,36 +130,35 @@ src_install() {
 				rm -f "${newname}" || die "rm failed"
 			fi
 		done
-	rmdir "${D}"usr/share/calibre/man/* || \
+	rmdir "${ED}"usr/share/calibre/man/* || \
 		die "could not remove redundant man subdir(s)"
-	rmdir "${D}"usr/share/calibre/man || \
+	rmdir "${ED}"usr/share/calibre/man || \
 		die "could not remove redundant man dir"
 
 	# The menu entries end up here due to '--mode user' being added to
 	# xdg-* options in src_prepare.
 	dodir /usr/share/mime/packages
 	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${D}"usr/share/mime/packages/ ||
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
 		die "failed to register mime types"
 	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${D}"usr/share/icons/ ||
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
 		die "failed to install icon files"
 
 	domenu "${HOME}"/.local/share/applications/*.desktop ||
 		die "failed to install .desktop menu files"
 
-	dobashcompletion "${D}"usr/etc/bash_completion.d/calibre
-	rm -r "${D}"usr/etc/bash_completion.d
-	find "${D}"usr/etc -type d -empty -delete
+	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre || die
+	rm -r "${ED}"usr/etc/bash_completion.d
+	find "${ED}"usr/etc -type d -empty -delete
 
-	python_convert_shebangs -r $(python_get_version) "${D}"
+	python_convert_shebangs -r $(python_get_version) "${ED}"
 }
 
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 	python_mod_optimize /usr/$(get_libdir)/${PN}
-	bash-completion_pkg_postinst
 }
 
 pkg_postrm() {