Version bump. Adjust location of bash completion. Fixes bug #517636.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0F9C590B7FF324F6!

3 files changed, 242 insertions, 10 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index f398b3d8dfad..143463509665 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.327 2014/07/24 11:05:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.328 2014/07/28 12:14:25 yngwin Exp $
+
+*calibre-1.46 (28 Jul 2014)
+
+  28 Jul 2014; Ben de Groot <yngwin@gentoo.org> +calibre-1.46.ebuild:
+  Version bump. Adjust location of bash completion. Fixes bug #517636.
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
   Remove description for USE="udisks" which is a global USE flag now.
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 4bf0ca9acf46..af43fe206a25 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -12,21 +12,31 @@ DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f
 DIST calibre-1.25.0.tar.xz 32683456 SHA256 cd95f64b721c6e7d0f392a7fce2c177bc8e1dec6a367891b3582e0b74b0e42f8 SHA512 fde5abbff3c4785160aa6286a8a50ae80ebf97a262b6902d6158648ba08c6d030e6031ced168131891d4cc7c291c74b6c3c7ce72be23c62c2dd783f47f0473b4 WHIRLPOOL f3cd373e8dbdfaff2d9e00cb7449916b0c6d2ae4530466ce1e98c8e5cb91e667db2a19952a11d5d35c044d6eb6804fc583d584753bec708560544e75c299aaf0
 DIST calibre-1.29.0.tar.xz 33022868 SHA256 b9cc2081528b72d7082e15efbc75b4edccf3e504d30697886bf23da4fa834faa SHA512 17a1e83c610122ef1bd0e4e0162bd907eec17fe7b012fb5476d3eb3d7e65df6d7b3e609d4b32cd6489fcddbfc55ac521b0e5f88d7cc2b2ccbf5f566e53c2f126 WHIRLPOOL e4501c9ed09b27853158c7485304c30be3cf4e1223ed5950d6d2ad1fb193941ea9a4ba4e1c7b37efe8252439993d51d15efaeadb190e5a3f25fe36455ff7a33b
 DIST calibre-1.43.0.tar.xz 35549180 SHA256 3c4ef17591e033e39ba804d18442f63c3ebc1683da776833d47d8aa2900f724d SHA512 ca3282e77da985bd6117c640f8665e92d664d8749897facb0c419f7427b850fb381e0b10b5c481f8b01434c3fe6faf7dc47c9f99d3bd9a485b3e15be9f045d81 WHIRLPOOL f6039261f9c986c7293b39d03d7aaafb6dabbbf3a9e586dc35b267950cebe9a1f5a5e09b179fdb55e921725a7e8a15ef1eb328d28cf169dde4cb9de972e57b5a
+DIST calibre-1.46.0.tar.xz 36580156 SHA256 c2e7a549e29dcc77801b4381478f249643f9d6f986ce2b9a4493076e2b33fcd7 SHA512 ca9b57d95b4f4d0bcadafb2743edf5475928ae567ae05295402920b4cbef6ddbe34a6d0e85181d9f3a980e63aa8e4fd49b2b7912d87f4e26abbc89b9c381d21e WHIRLPOOL 72d65570fdf402bad43ce6b8c1992409ba2c58b4ad443164d0bd43cbf1cfc0b662bef249d1c1a4ba468c02fd4ac6a416607db261e0de0068b3796ccaa5778d4c
 EBUILD calibre-1.2.ebuild 7187 SHA256 0a34e4e0e84b7a7acff0c307c927dbc57706f112adc7e41a1fb67f0f95815542 SHA512 1822a76308a28d231e5ad352f638cc78e92a970bf59b90527856eb9550d43e28c5c3a022f4a459a3729c02306c635c2512f2e8e1b1ae3de5394c53104df1fbf3 WHIRLPOOL b5fd2fc15831bba33106f33723670acadda776b8ee76ff0f9640042b3487d2d6d43d834fa9ec2761952db214b0efe091248eb8933b330e9c5105445b93500329
 EBUILD calibre-1.20.ebuild 6834 SHA256 5275402ba5f44c2731004826962720deb5c4a26076384d31ef0c8b5e58fc690f SHA512 1d065603262e3d167950ae4f2706ae51ac2ca9d846f28e606e0e727aad69174149c5f5b69297190ff5ebf21ade262d5c211d930578e131e77297900869fa0f89 WHIRLPOOL 2d3d333cf381ae43703e7433251229e6f4faed12827b8c0306ca4bf358b452265c338493b981ddc40c27773ed7fce01d18990ab20691d1f507ade8c9049d96f5
 EBUILD calibre-1.25.ebuild 6836 SHA256 27b67ef97435a9a408fcd24523ebe44738d91ac41a89e6c0dcc538e0403ec0d4 SHA512 5f8431f6454000e7288a259e920ce23ff1dc2d2900f0e347b2a6d3b31e7dea5de9a2e7633bb24449fb5c37b7dbb26272fabce6476c2ec17a847d2d4bab2aee1b WHIRLPOOL 96c87701476f88493a9e5dc7331b62c432f1dd94f64ac3f23b99072e1c15bf3cc126439811651edc4af50c641b18826a6f2ce9cd5334916295e0dd664801ca50
 EBUILD calibre-1.29.ebuild 6847 SHA256 78f94d9ccbbddc30af55c595ce1f0ae52e9e243c61010b9537d12819ef8e6406 SHA512 5fd99e4c82bef3173d8b1a1e12540a2302b223f580bc55d61259fcf745acbb63dd739bbf9aad454d5b0556d7c89cb996473510495d466f21a0c8c09afab01012 WHIRLPOOL 3db272cf78503c200ef19b4e026adf43e8c44358c75692bd15ce6d979c194687b232575770784a358d04cb8b8853c8e101ec63cf2488005bf7dba234668e33d7
 EBUILD calibre-1.43.ebuild 7584 SHA256 65f01e629f901ab3784faf34f0621dc3ad05112c3f287c900ec6460ff93701a6 SHA512 9810c2f77c148e9b6fdff7d46adc7705354a92a162783c43cbbc722993961d0155872853c260e4f842ffb42d6fbac4c2bc9d4e6e7579ca683bf578d097382d97 WHIRLPOOL c89b4252083bdec55502a7fd2788c37a7d6531ecd8291fa1bb8d3860be5298ddc62abde5b067f2b85d06f5172329102ceb1700d205498e02f0d042e2ce2fa2ef
-MISC ChangeLog 52177 SHA256 75e8bacc2652d3efefa9d4d0ac0024a3c125e7d0dfe74ac8363fbaeb190a7945 SHA512 a87b8209df66bb7a82c077591b03a53c35c5987009eacac5fede1a44368f9d714ebeaab8542f3132e9fa74c3b63b700fbac41bd5ce81d262968a0d33c181ba0f WHIRLPOOL 2f27550a7a51ca1a056af237c51556bc4b96035b1c621ef3d4a63c7ab599273693696b7efdb9797ffad5d2b3e5fc637982087718738c25f3c737301f8464fd6f
+EBUILD calibre-1.46.ebuild 7601 SHA256 44eb78635d153752cb10480df1386eca5cb89d3c85ccd5d4f963d2c070a24cad SHA512 c7948f188144c33d7cf1bd6bcb7d535d96af0b0a58cacd63f20d0b2fbcd9bc6751fd9e499fa2df198db14e3d549d1d2e874986b433fd9b3da46a8b0907f64284 WHIRLPOOL bb88adc6e32b706cad069fda54f7e1f4ba5070305289ab36d3df00690f35ada922a94567d45f810693a51cdc826726306e9fc8e0c5b17ae2ff656fb6833187f4
+MISC ChangeLog 52345 SHA256 870626af9118da92d008501d5e7ea4d3a90ddf76b2ad6dd1c53220aa33283e8f SHA512 6c3c04b4e4086ce6d02f0c571ddeca66c84bad48af8461b2c19dba776b24cfc7c9f4e63bc327f7fa5a9fead30ecf4b38549a54d98b19a1f91151339ffef38066 WHIRLPOOL be0f042b942aaec80a201f0cf859097a4a73d03737b22ffbf1395378a20097b5ae4a286507e9bee6ea9ed4472f1fbb4f6c5d91aa91f40d627c9795e04c53fd14
 MISC metadata.xml 341 SHA256 796a5a95967784ec0e9295b5745962d2a20dd678fd7425e6bd6414b9b1fbae33 SHA512 0fa9fd10e81ff337e7e7d9a55d492f4cbcee79fd1771497214c39c0c2491759ba0ce7f62a1aade44e2165617da40111d0ba3a3802b679db66f60e66bff70e2ca WHIRLPOOL bd14a2fa77fbf2f7e3e30725ef299809e11696d5779ea80d8252efcd64e79bad7db9c331f8617ce220cfeaa6136e932130db85aeecf35412f99d9957cf3e9f08
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQEcBAEBCAAGBQJT0OiQAAoJEEdUh39IaPFNltgH/jjpZ/XeXrX7/PBZ2z50Pbvq
-8/I9nOFznkWkrylN+7G9L+lwEgvM/ZGVEiB9+deHlGgZVkneJjve5S3rWHP7gx2+
-EVkMQ8jiw65/j8kBGmUvWTGm78gE8BjNz2CLbdmu+QFUASUKbD0TXKRoOtTt95RJ
-WLOgCjHhKVSzWO4ZZXthYC/3fAkwz5yt7E8d7EnqIimU4Tgc2DmAZmEGiO32JTBH
-ER7f4fj1WTufwMk9lyYO4Rz4Rzdfs1HshU4JEZdf4DbYiRm+t972jCSwGNjK1yWB
-NcZJeWQKSEpa8kWeehYOppcrDTUuxFDB4z4snBJUqg6AlBf/xMlGo0BgPAxAwEk=
-=mQzU
+iQJ8BAEBCABmBQJT1j6pXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2sTwQAIgt5qcg8tkJOuCO1fNw8SbQ
+4roVRKOMUy8zxegVLfSHy4+H079JZ9XkHSonBl3fs142ohRFGlQ0NYujmBUX0SF6
+kb5sTgmORhR+oKB+InB7kM+1TwYmY97GRCceYHIeo0ZVns29BdN/1Z9lIw+hIvta
+XWXDNXTojS7LM0WfkLoeM/gjBnMGBPZFY+t62v11fYF86ELl6UdwzdlQZbAoWmgm
+SwjRtkXR5iv0WuC/292J5KsBPEVH+aSvUWJsn1U5sLazsvQ7J87PRHoNxT7oFZI8
+EJkhF/9Rejn+9HCjxoHFYHq2sxJgAUuVwz+S6T3PRClh60NczUY/4tu80j7mpDRf
+K/uliwACmBOZ4y8QBbcMY0+dIcuTI3/fFbqQq5py9ba045JAsXIM2VCov2rKYw3p
+OlpDA8Apq//QJlHWrM+IQlNJZwOumVYbA2hVOoDBV8kP5ZQrJbuY5asaiVDmZG9Q
+8uXu2T4RNBhJE2zIZwdc0UYswswSCiJqboTjy0GUHJsgQB8R4I2bYZgz/3kcCVJ1
+pMiULDs33qEIP42RPacg5khUawe7lL+6RFaQ8LN+8ClBsjeVUfffOb5Z2UsZTdfs
+TQ6t6gBos5zp182R3NDlAHCZP/Ngx+1OjvnxyiCSxizIOnzDftkRDYNMA/WLaXor
+PkrHEhi6zJIRzqdFJjHA
+=maIU
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.46.ebuild b/app-text/calibre/calibre-1.46.ebuild
new file mode 100644
index 000000000000..8c60022477a8
--- /dev/null
+++ b/app-text/calibre/calibre-1.46.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.46.ebuild,v 1.1 2014/07/28 12:14:25 yngwin Exp $
+
+EAPI=5
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
+SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="+udisks"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)]
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
+	>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
+	dev-python/netifaces[python_targets_python2_7(-)]
+	>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
+	>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
+	>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
+	>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
+	>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
+	>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
+	>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
+	>=dev-python/PyQt4-4.9.6[X,svg,webkit,python_targets_python2_7(-)]
+	dev-qt/qtdbus:4=
+	dev-qt/qtsvg:4=
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	>=media-libs/freetype-2:=
+	>=media-libs/libwmf-0.2.8
+	>=media-libs/libmtp-1.1.5:=
+	virtual/libusb:1=
+	virtual/python-imaging[python_targets_python2_7(-)]
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5"
+
+S=${WORKDIR}/${PN}
+
+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'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|PreserveMIMEDefaults():||" \
+		-e "s|xdg-icon-resource install|\\0 --mode user|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-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 failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py || die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
+	epatch \
+		"${FILESDIR}/${PN}-1.34-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+}
+
+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}"
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${EPREFIX}"/usr/bin/python2.7 setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--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"
+
+	# 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/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /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"
+
+	dobashcomp "${ED}"usr/share/bash-completion/completions/calibre
+	rm -r "${ED}"usr/share/bash-completion
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	while read -r -d $'\0' ; do
+		local shebang=$(head -n1 "$REPLY")
+		if [[ ${shebang} == "#!"*python* ]] ; then
+			sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
+				die "sed failed"
+		fi
+	done < <(find "${ED}" -type f -print0)
+
+	einfo "Compiling python modules"
+	"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
+		-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}