0.7.46 version bump.

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

3 files changed, 189 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 43c4591936b1..51454890da94 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.131 2011/02/14 02:56:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.132 2011/02/19 09:34:09 zmedico Exp $
+
+*calibre-0.7.46 (19 Feb 2011)
+
+  19 Feb 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.7.46.ebuild:
+  0.7.46 version bump.
 
 *calibre-0.7.45 (14 Feb 2011)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index fe14cca107a0..c7b995a7f12c 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,15 +4,17 @@ Hash: SHA1
 DIST calibre-0.7.43.tar.gz 21183728 RMD160 54a47a1b19882bcb6862239f10077a48665abf4f SHA1 a8fc10f74b9124bc5b6c09f2c4d5f12058b0886c SHA256 f0ee5f1e44ad855b1603f793efdc914f0964eb9c37bde1c29758397276272e3e
 DIST calibre-0.7.44.tar.gz 21496194 RMD160 d9d0f5db8a2aae5231b7dfc0793355f872482dae SHA1 a4392faa0bc0363b8b31e4ecd0c046cdb108198c SHA256 d83ee9edaab364fd80e6f5c2e68c5e0073cd084a372ca479534b8c9d09101ebb
 DIST calibre-0.7.45.tar.gz 21646602 RMD160 e646af52110304df73be319c13de7edf24877491 SHA1 69179e5ac47520770c5d4d499dfbfeb56dc5f849 SHA256 e3ac02b93d1be421bc16f1cfa56cbfbd23949a894d39f39aeb92e73a27ae71e7
+DIST calibre-0.7.46.tar.gz 25612716 RMD160 3e334bf692cd4c3ea0939491ca735dc42b282a44 SHA1 d4997b2ef904eb88015567da4a252611b41a9c07 SHA256 e16dac922573fc75f47f313bb5344b27724342f8af4aebd4394d248c81c64088
 EBUILD calibre-0.7.43.ebuild 5690 RMD160 b25eb095bd83649c174045dadc32d1c33f58baa7 SHA1 ecc97113ba5203d0409dcacd59d15a4f035d3f4a SHA256 7308e485105ed9669b1081475e4e4e952cfaebb88bc4d974884c6400cf831bae
 EBUILD calibre-0.7.44.ebuild 5697 RMD160 6f572ed7f8e4b616cc7e3a52b50601a7f8a4151f SHA1 3e92f7d4ba1b47dbea4ee89547c288e6ee85f105 SHA256 54d59daa580add1fd2bee101a4098e5d2b9b0632d8317800a9d4468b445df825
 EBUILD calibre-0.7.45.ebuild 5697 RMD160 ace504f7fd633ac3d4e39034c034028ff0429ec9 SHA1 86e5ce64d9a992879b11b9e9ba532ebcc56dc341 SHA256 033a02d2cfc99a6981d9dab0badc7c3ebe8ffa176c8d1db7bc3b377e2710fe94
-MISC ChangeLog 20888 RMD160 d0e1f37e46f160af8556c03b8f5487d936deaf4f SHA1 6984676ae0c99e6c2f6d1de9f690cde18f133a38 SHA256 1765799bb77619f18b3d415791da47a2ee9636f65d977f61bc3ecc35ca7e5dc9
+EBUILD calibre-0.7.46.ebuild 5697 RMD160 9394d7e6b2d166c3c006ec60b3bcf9b4431288bf SHA1 ef07304fec87a9350291ee982ebbda1991fc9ae1 SHA256 d962d2cfe401fbbbb3d99072332256e0845cbe87160446b3530f1abe9b4bf4c3
+MISC ChangeLog 21014 RMD160 fb8a77020d3294a6d4b825e3fab124b678cc64ab SHA1 0d91a38df446e80d7600806a4f2ffe577802cd47 SHA256 56a9b6655fc1f523dd113d4a8e607edcd6d1bc50069eace3beb10888d9db4f05
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1YmeEACgkQ/ejvha5XGaOL/ACgyicZMLDGiUpHVdj8csnb93gY
-/RcAoNhYIhekiy6IQIqnx5kyLOGmsBe1
-=SniT
+iEYEARECAAYFAk1fjpYACgkQ/ejvha5XGaNziACfWk3GJLdIObQ/+4qIv8QZFN99
+8PcAoMCQuLInL7LG/hIMZgJS/yAT7y6C
+=9ajD
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.7.46.ebuild b/app-text/calibre/calibre-0.7.46.ebuild
new file mode 100644
index 000000000000..a19737343e8d
--- /dev/null
+++ b/app-text/calibre/calibre-0.7.46.ebuild
@@ -0,0 +1,177 @@
+# 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.7.46.ebuild,v 1.1 2011/02/19 09:34:09 zmedico Exp $
+
+EAPI=3
+PYTHON_DEPEND=2:2.6
+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://calibre-ebook.googlecode.com/files/$P.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE=""
+
+SHARED_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.7[X,svg,webkit]
+	|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
+	>=media-libs/libwmf-0.2.8
+	virtual/libusb:0
+	>=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1"
+
+DEPEND="$SHARED_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
+}
+
+src_prepare() {
+	# 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"
+
+	# 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}
+
+	# --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
+
+	# 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"
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"
+
+	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 | \
+		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}"share/calibre/man/* || \
+		die "could not remove redundant man subdir(s)"
+	rmdir "${D}"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
+	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"etc/bash_completion.d/calibre
+	rm -r "${D}"etc/bash_completion.d
+	find "${D}"etc -type d -empty -delete
+
+	python_convert_shebangs -r 2 "$D"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}