0.8.4 version bump.

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

3 files changed, 176 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 549d761e7bea..9ca3a74126fe 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # 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.152 2011/05/31 06:14:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.153 2011/06/07 09:16:41 zmedico Exp $
+
+*calibre-0.8.4 (07 Jun 2011)
+
+  07 Jun 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.8.4.ebuild:
+  0.8.4 version bump.
 
   31 May 2011; Zac Medico <zmedico@gentoo.org> calibre-0.8.2.ebuild:
   Bug #369021 - Update SRC_URI to point to sourceforge.
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index b9448ec16ea2..22164a0f9bf3 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,13 +2,15 @@
 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
-MISC ChangeLog 24283 RMD160 629c483e0cfd7fe60370baeeff8c4600173357f7 SHA1 9c14b35dc8efa1588a14b83588e235f27fedd40e SHA256 1ecd762dc5e19ea0dbff782a4eb4e2aa7cc4cbac339ebb2bacf34e579c8a11c8
+EBUILD calibre-0.8.4.ebuild 5212 RMD160 8f483ba643cb7050ea796e416608b15d62e00084 SHA1 0a6adafb03dc380a329bfacf1b3fd9cdbcb087a8 SHA256 74257a0da2dc8b7b73c4b0d6bbea29725da976c29fcf32e505a7c7df3643e4d3
+MISC ChangeLog 24406 RMD160 a4dd997c87653cb9fb4cb0a7853772580f289c09 SHA1 23e0196ff3563e568dd0b30fa26bed905d51a54a SHA256 5cdb1f607411a3beda9df403140f058f5ee5b383081ffd742c96cf8f05dd8384
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3khzgACgkQ/ejvha5XGaM7rwCgkkASPZQNbQzPDyPt66p64m/p
-2xMAoJHvnw9qs9mAXy6Xy4re8bRkpdle
-=LL1P
+iEYEARECAAYFAk3t7HkACgkQ/ejvha5XGaNi4QCgu0YKYznG2VfKrpdqKihvPX+o
+1H0AoN+1qS4NUugwO/YbTxnynOyO19UW
+=18Zk
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.4.ebuild b/app-text/calibre/calibre-0.8.4.ebuild
new file mode 100644
index 000000000000..abed6ba8f43a
--- /dev/null
+++ b/app-text/calibre/calibre-0.8.4.ebuild
@@ -0,0 +1,164 @@
+# 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.4.ebuild,v 1.1 2011/06/07 09:16:41 zmedico Exp $
+
+EAPI=3
+PYTHON_DEPEND=2:2.7
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion multilib
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2
+	>=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
+	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssutils-0.9.7_alpha3
+	>=dev-python/dbus-python-0.82.2
+	>=dev-python/imaging-1.1.6
+	>=dev-python/lxml-2.2.1
+	>=dev-python/mechanize-0.1.11
+	>=dev-python/python-dateutil-1.4.1
+	>=dev-python/PyQt4-4.8.2[X,svg,webkit]
+	>=media-gfx/imagemagick-6.5.9
+	>=media-libs/libwmf-0.2.8
+	virtual/libusb:0
+	>=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/reportlab-2.1"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5
+	>=gnome-base/librsvg-2.0.0
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	python_set_active_version 2.7
+}
+
+src_prepare() {
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	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'ing in the IMAGE path failed"
+
+	# 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"
+
+	distutils_src_prepare
+}
+
+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
+	#!${BASH}
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_CONFIG_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
+
+	# 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 \
+		--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"
+
+	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 | \
+		while read -r -d $'\0' ; do
+			if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
+				newname=${REPLY%calibre.bz2}.bz2
+				mv "${REPLY}" "${newname}"
+				doman "${newname}" || die "doman failed"
+				rm -f "${newname}" || die "rm failed"
+			fi
+		done
+	rmdir "${D}"usr/share/calibre/man/* || \
+		die "could not remove redundant man subdir(s)"
+	rmdir "${D}"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/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${D}"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
+
+	python_convert_shebangs -r $(python_get_version) "${D}"
+}
+
+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() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}