*calibre-0.8.6 (20 Jun 2011)

  20 Jun 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.8.6.ebuild:
  0.8.6 version bump.

  20 Jun 2011; Zac Medico <zmedico@gentoo.org> -calibre-0.8.2.ebuild:
  Remove old version.

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

3 files changed, 38 insertions, 43 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 9ca3a74126fe..e139a8d38c34 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.153 2011/06/07 09:16:41 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.154 2011/06/20 19:41:50 zmedico Exp $
+
+*calibre-0.8.6 (20 Jun 2011)
+
+  20 Jun 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.8.6.ebuild:
+  0.8.6 version bump.
+
+  20 Jun 2011; Zac Medico <zmedico@gentoo.org> -calibre-0.8.2.ebuild:
+  Remove old version.
 
 *calibre-0.8.4 (07 Jun 2011)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 22164a0f9bf3..c4cc574025de 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.2.tar.gz 28195417 RMD160 05ef243ee65405f3243c74cd444278411b949b7c SHA1 4e5a19b063aa3f8a7af3fcbdd6c4bad5cfb28ca0 SHA256 bf8687fa4b6800ea25a02336c225bb784dbf2ce6ec680f6bf15f3743e2082abf
 DIST calibre-0.8.4.tar.gz 28958511 RMD160 a3b19e01aedef2348ef68205d7820358afdf4c65 SHA1 670b3d9f72889889a17c20a0ebcea07f234ec983 SHA256 6262193421b6c40fc6aedbcd5b85f79d8b215b50a1027ee896798daece2832c5
-EBUILD calibre-0.8.2.ebuild 5827 RMD160 c866fe9b358e933e0cfc1db78cff25f42e7e1f8f SHA1 d86de27abf8ca311d5d52b87a424d7634f73e4e7 SHA256 f6c17a3388df59948e17edcc1facc5cac5d88b9e62afdf950b116197437716fd
+DIST calibre-0.8.6.tar.gz 28494397 RMD160 82133b60968e33a1ddaa114e2b09fdeb608adcdc SHA1 467f68b8c6a403e53274a49baecf09964a370948 SHA256 811a967fa44b59a34d313eda984c19f575cf2c5fe774170e08b4c536e9e22b72
 EBUILD calibre-0.8.4.ebuild 5212 RMD160 8f483ba643cb7050ea796e416608b15d62e00084 SHA1 0a6adafb03dc380a329bfacf1b3fd9cdbcb087a8 SHA256 74257a0da2dc8b7b73c4b0d6bbea29725da976c29fcf32e505a7c7df3643e4d3
-MISC ChangeLog 24406 RMD160 a4dd997c87653cb9fb4cb0a7853772580f289c09 SHA1 23e0196ff3563e568dd0b30fa26bed905d51a54a SHA256 5cdb1f607411a3beda9df403140f058f5ee5b383081ffd742c96cf8f05dd8384
+EBUILD calibre-0.8.6.ebuild 5377 RMD160 d27bf91cf458cd606440c9afd6321ee00c77b064 SHA1 a370c4a99a64cc2097f830a19685f0b4a03e7150 SHA256 6edbd40b0d231546f2b9b7ac9dc7c8044332a535354e9f77c10e7bacfd8e1508
+MISC ChangeLog 24622 RMD160 efbeddeda82065b9ca580379cdf3146d0ad9fa29 SHA1 aa6f64a61d28ed17eb98527f07d6f61a89cf1eb9 SHA256 05390f1f99341b087a79110a34299a9c66fa9f4b0d9b53d3fa4754eee64a57ed
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3t7HkACgkQ/ejvha5XGaNi4QCgu0YKYznG2VfKrpdqKihvPX+o
-1H0AoN+1qS4NUugwO/YbTxnynOyO19UW
-=18Zk
+iEYEARECAAYFAk3/oo0ACgkQ/ejvha5XGaOrIQCeOeyLFY8a5wr93+pFE85hvoo5
+o34An3bQb/lXUsCBUcuuwDXUK0J2SH7x
+=0/RC
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.2.ebuild b/app-text/calibre/calibre-0.8.6.ebuild
index c1dcff75110d..6f3f97cc01d5 100644
--- a/app-text/calibre/calibre-0.8.2.ebuild
+++ b/app-text/calibre/calibre-0.8.6.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.3 2011/05/31 06:14:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.6.ebuild,v 1.1 2011/06/20 19:41:50 zmedico Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.7
@@ -54,16 +54,22 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Fix outdated version constant.
+	sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+		-i src/calibre/constants.py || \
+		die "sed failed to patch constants.py"
+
 	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
 	# calls xdg-* (bug #258938).
-	sed -e "s:'xdg-desktop-menu', 'install':'xdg-desktop-menu', 'install', '--mode', 'user':" \
-		-e "s:xdg-icon-resource install:xdg-icon-resource install --mode user:" \
-		-e "s:xdg-mime install:xdg-mime install --mode user:" \
-		-i src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
+	sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
+		-e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+		-e "s:xdg-icon-resource install:\\0 --mode user:" \
+		-e "s:xdg-mime install:\\0 --mode user:" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
 
 	# Disable unnecessary privilege dropping for bug #287067.
 	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed'ing in the IMAGE path failed"
+		-i setup/install.py || die "sed failed to patch install.py"
 
 	distutils_src_prepare
 }
@@ -80,8 +86,6 @@ src_install() {
 	cp "${T}"/{kbuildsycoca,update-mime-database}
 	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
 
-	# --bindir and --sharedir don't seem to work.
-	# Pass them in anyway so we'll know when they are fixed.
 	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
 	# violation with kbuildsycoca as in bug #287067, comment #13.
 	export -n DISPLAY
@@ -104,29 +108,22 @@ src_install() {
 
 	# Bug #334243 - respect LDFLAGS when building calibre-mount-helper
 	export OVERRIDE_CFLAGS="$CFLAGS $LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
 
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"
+		distutils_src_install \
+		--staging-root="${D}usr" \
+		--staging-libdir="${D}usr/${libdir}"
 
 	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
 		die "failed to fix harcoded \$D in paths"
 
-	# Python modules are no longer installed in
-	# site-packages, so remove empty dirs.
-	find "${D}$(python_get_libdir)" -type d -empty -delete
-
-	# This code may fail if behavior of --root, --bindir or
-	# --sharedir changes in the future.
-	local libdir=$(get_libdir)
-	dodir /usr/${libdir}
-	mv "${D}lib/calibre" "${D}usr/${libdir}/" ||
-		die "failed to move libdir"
-	find "${D}"lib -type d -empty -delete
 	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}"share/calibre/man -type f -print0 | \
+	find "${D}"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
@@ -135,21 +132,11 @@ src_install() {
 				rm -f "${newname}" || die "rm failed"
 			fi
 		done
-	rmdir "${D}"share/calibre/man/* || \
+	rmdir "${D}"usr/share/calibre/man/* || \
 		die "could not remove redundant man subdir(s)"
-	rmdir "${D}"share/calibre/man || \
+	rmdir "${D}"usr/share/calibre/man || \
 		die "could not remove redundant man dir"
 
-	dodir /usr/bin
-	mv "${D}bin/"* "${D}usr/bin/" ||
-		die "failed to move bin dir"
-	find "${D}"bin -type d -empty -delete
-
-	dodir /usr/share
-	mv "${D}share/"* "${D}usr/share/" ||
-		die "failed to move share dir"
-	find "${D}"share -type d -empty -delete
-
 	# The menu entries end up here due to '--mode user' being added to
 	# xdg-* options in src_prepare.
 	dodir /usr/share/mime/packages
@@ -163,9 +150,9 @@ src_install() {
 	domenu "${HOME}"/.local/share/applications/*.desktop ||
 		die "failed to install .desktop menu files"
 
-	dobashcompletion "${D}"etc/bash_completion.d/calibre
-	rm -r "${D}"etc/bash_completion.d
-	find "${D}"etc -type d -empty -delete
+	dobashcompletion "${D}"usr/etc/bash_completion.d/calibre
+	rm -r "${D}"usr/etc/bash_completion.d
+	find "${D}"usr/etc -type d -empty -delete
 
 	python_convert_shebangs -r $(python_get_version) "${D}"
 }