version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 230 insertions, 17 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index b1a651c15c22..1316c49d9c13 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.323 2014/06/13 02:44:22 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.324 2014/06/13 21:48:24 axs Exp $
+
+*calibre-1.40 (13 Jun 2014)
+
+  13 Jun 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +calibre-1.40.ebuild:
+  version bump
 
 *calibre-1.39 (13 Jun 2014)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 224f3508b462..a1539a1e39f1 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -13,30 +13,20 @@ DIST calibre-1.25.0.tar.xz 32683456 SHA256 cd95f64b721c6e7d0f392a7fce2c177bc8e1d
 DIST calibre-1.29.0.tar.xz 33022868 SHA256 b9cc2081528b72d7082e15efbc75b4edccf3e504d30697886bf23da4fa834faa SHA512 17a1e83c610122ef1bd0e4e0162bd907eec17fe7b012fb5476d3eb3d7e65df6d7b3e609d4b32cd6489fcddbfc55ac521b0e5f88d7cc2b2ccbf5f566e53c2f126 WHIRLPOOL e4501c9ed09b27853158c7485304c30be3cf4e1223ed5950d6d2ad1fb193941ea9a4ba4e1c7b37efe8252439993d51d15efaeadb190e5a3f25fe36455ff7a33b
 DIST calibre-1.38.0.tar.xz 34185808 SHA256 fb7eebe138d078cc0ebf6b135ccc8800d24e28e246d51d79696896ffcc40671a SHA512 6f4f31fb8722dd7180e5304732acf0e8a42f3886bd2a2ccf17949a2014be2b020dcd04368f360a41f35fd102b3a58502ff8a99202e87fe93aa8353edad327796 WHIRLPOOL fe7768c99df8c66065e9f5e5cdbffbcd9b373a8ac31c3a62fc55ad031af20968bc8e6fac819f96061f236dfa26a738f79294f96cfbfb9466eb77e3ed2a4d22a6
 DIST calibre-1.39.0.tar.xz 34446476 SHA256 da5bde637639aa0cec64fd7fb20fbbb825934577bf6731dfab12b6441b9cec9c SHA512 21309eb7b1c953557ebe551d8b5a8de44c9c8479ff5e0b832a7226fc96552824303c5df7f4c3fb63e337ae0487ec0638b02c90e2588af4e0d1439ca8c6485e79 WHIRLPOOL 316be8c60ac4477a5abc1276f91d1106d3b0d44cab1510394dda1f3b0b889e2f9fe943b390a50c7d10d40bab43ad5b625b74ac9358d131a0c4eb148a44fed77c
+DIST calibre-1.40.0.tar.xz 34457004 SHA256 f8a504dac1192dc04e22b8ae7187bc9cb46f56774c32328455ff01849e70ea36 SHA512 ce9b2f9641ad96d18701724e2bbd853455bbd1029301a86f94fbeda018312ab7fcaf27b5f03159e24f85a4b02288a793b6e98a11abfd4065c49e5ca1eb9b3061 WHIRLPOOL 32f8656d35c597d226bb23b00ea62c3c5bb6eaaf67361f176c5cc376c1c62850f9682c20c29725ff3ac1c69eff98dad236e746ce942a6a360f2ff7c9986b1dcf
 EBUILD calibre-1.2.ebuild 7188 SHA256 90113b51d09bd3ab231eeceae07d4aae5f8ebd37ceac16525ec51184f39c294c SHA512 3fea7182ff45399da37eafa5e1b8ec9d86bbdd21e1e2a4559d12cedd8028f23313662b9f7b833dfd51f34b13f6320f5db040bca681ce580ef890b1c84a8c18c2 WHIRLPOOL 381ae7dc0ea326d08d94ef3016147d639755c645d928b4830dd8dc655e3dd3eec5cfe71b517831a63fcc48e688cf1eff0e95af0b38e51efac9b9f9b7ca1248b2
 EBUILD calibre-1.20.ebuild 6829 SHA256 97305bb462ce1af08b20a77ff1a27432e52c3d8f05e84c267649badf4a2c59cc SHA512 bec3b0e1bebe234f5bac4782e3c35d0237d6cd5561f3897c049a2c7e0d7e9c1a181897eb1741609cd1386a2594d579142f3a0e6b6045183163d5b0009c5a6b4d WHIRLPOOL 538238eebdf55ad11e3c6e72154e999bf90d17fcb916daf1c3cf0a37f3d3604e16f267707114b99bab1d884c1fe9e790354b02f1c940c72b713459a844eda3e0
 EBUILD calibre-1.25.ebuild 6834 SHA256 fccd4b963ae6a6a2a687566bba722f877f0f5b9b19203420ef181e13c4256cb1 SHA512 197844df92e82346747a6189d04d1a0df4c111c7549bc524ef6dfde7db08dc52147840e1340c738e0c58d81f281f3540c94159cfdb50e2c15dbf8bd1274a8995 WHIRLPOOL a77d7de048579c1d539c9af8583860fea880e21416b40f91591d7aaf7d10a2ed13580b52252a959d8d658f4de45669ee2512d209d7563956ee081c5d9376d644
 EBUILD calibre-1.29.ebuild 6845 SHA256 8b62380e75238694b459a4ab9d40139229a3dd1a09b2018dc8bb6315248ad362 SHA512 67f7d77a509be8d1bfbe1ce04a6e9959f259dd7da71f1023548806ff229ebcb23f95e55fc27e6e41c76aa0d51c3816433fe85f7ec83d82bdeb33c3ec6114aa5f WHIRLPOOL 1158539fadd0fc494c2eaefc496269b77a1d4043bd8d8bdb2a6dd269c4fbb4fe458ae564c22c8df29b362b167ee6956290fdd986182078466f1e41424cc7c299
 EBUILD calibre-1.38.ebuild 7643 SHA256 d11b98dee616140e76d632bbc8240f87c5c236911ca1fe378fbeb99b9a597a81 SHA512 acceb8c64c0131535bf1b3ec1ec999ffe21962ca27a6cff60c6900e806dd047f2858015c743801bbd95fb3622664985b112823430bd79a3752b7583ca9032f36 WHIRLPOOL 0e287832947e7e571582d8b443a02585253ed4d7e168bdaf73044595890d6e7c9b301749626496bdeb31383fd99de323218fef11da0aa09073d30ea09b65880c
 EBUILD calibre-1.39.ebuild 7644 SHA256 b23e2077c1c3a71b203a41d38ff28f0c067dd0020ebcee03ce0ebfe72b9f51e7 SHA512 1a2ac88dadcd9840bbf48b473e4513b7c9a6409bd9da0c43662cbf1de90738a146b990d3b91dc796d8db583daa416383b8c43ea976244b4bacd0cc92eb5be24f WHIRLPOOL 02db0e8ddc728bdad21b78b134baaad385d2e636bc6c6a91cd6cbf970aa51dc306bfb251e83df299731ade06a149e76f600d97e567ca61596155af63fade2b38
-MISC ChangeLog 51432 SHA256 8ac3dc8ebf20b83a94308113999e6dc50182673f1c97e9a68405e5741265ae32 SHA512 78e28893fa4f16390fb5ab43d8f0bcebb0420f8e8fdff90944d5c1c434acbc60562994462856db4639bcb4c479b3c8ec7ab48b5831d06e8be350958f2b3c3ce6 WHIRLPOOL 846f8268026348ec5ef72738aa4758f828ca85d8f6f6c4c1184c5932a3f86ca790a0d06155f896f55eca915f30fcaa52b2a2b17ea677e9f69ee53ef9c7915aa0
+EBUILD calibre-1.40.ebuild 7641 SHA256 67b9e9c94eb0241b1b93d8119f086e904fd596c02c045dce34a9f3529b07d0bd SHA512 2630980fb9594977b9812cb2acdf4d560defba59cc981ee7184be73fc4fe85331b47ada05cf9fe3b4f9602a1dc25547c754d762e33001554393e8179463ce6d9 WHIRLPOOL 9f289c30aa581fba938c2ccf61402689eb0d551b48448f4380a55abadb78252c78f7416127a85be2506d09b407a331160b366e49da03049e15d9e87723b28835
+MISC ChangeLog 51553 SHA256 755f7f3bc24f7ab7cf9de6ce36f19b2c6bd8c765a59b1cf6b355a43854e6581f SHA512 19805b8539d2445bbbe6eb98f1238e291268c6c89421a62e430c4c697676a4a66f8e90e81940734bd6838a1bd10e0f245b7107af71a986c7eae0a55991b87408 WHIRLPOOL 936e3247637ae3ee392163a66d3df141cfff807bbd5f11a00f5fd89af879ee469ac7385142c3504638b307424ae48e765536d26fdb0805264c645bd4b85d1243
 MISC metadata.xml 494 SHA256 8636a504a39b901333bfb9aa1c1322dde87ddc3fa6c6da3a7b95abcf25d61786 SHA512 c8e1bf8c46e3b3285df1cffa1324042a82d6a40dfbe5384d018386e661c446204bfbf24b21d7afe893ceb1e1de07719b84ad2af3345c04e4419141f8e789ca2c WHIRLPOOL 7d89476c21141740f9b27f947b722bd64004b6e705fe6ee35237f94ef318f626e49a5adad5ac0ab86d015913c3663d4bb80d9a9f4014bb3e139623eb0938179a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTmmWZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2me4P/3vLuiRaJbpjIdTvZppFFEfJ
-poJccqhNbKVriE5m8jUzRic2XVfePzkTNEoby7QaZMmXX79TgF1GLQwVKHvIGc8p
-DJauv0KCnb3S0zbh8n/02A9e4MUjsTEAb5eVYDfOVW/e2x4xHoT2auZI67WBYED7
-a9voFbdbvXvdO9spV6LvDcPFg16rIjy76XcdOV+5YEiC8z1qX8avDq6bx/SIKc98
-HbldLi3kIXOLrpthZOxbGg6TRXwEy8mMEzKPjH+IRcO9INWYUSBcIrPXbcbT0MFo
-i5IBPHH7r0zrQefHH6o4ZHaxpgtJ2cfnCR3nPei1vGfqxoPCFr2OIxly+JdZzjC/
-yPamxM3E3C3hCNao7AYiup1jQAmfbUqUC4aXtTMGzS002wGDUF7dz0sJVUeE0x33
-NiJX51lUh5I6ayhAS3w8v2INxBRe2kgjTPKPHXhmkzUEdrZ0FLyTHu9HIV5nqDk4
-Eb//OQK+b/NY+WcVwAkbXa5sjLTIPNpPcwGdAdNN6FAf6M9iOlKLa9n32srgVcZ9
-N73rk9XpimnXLfbt7/wdUM2aHuZIFOwf4ZUXZIoX2K/+q0erJu8AvQ3DndcwARN7
-dMmXR8SPS1uSVNJ+1ZwzWGKckSmo9UYXLZ1rtleSJlbNHJbyslOUOlgqoh5c5dYs
-t0tUV3bIeRiaf2Y/N4wK
-=ttvP
+iF4EAREIAAYFAlObcZ8ACgkQ2ugaI38ACPC/GgD/bJDdng96YQb/legtJPWUPSJx
+2zYkI1hAyZxMz6Qy+CMA/3OlqEymCCmXyrlj6+mpUgr3PRjXiHrzhBgqTyYb09wl
+=elsx
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.40.ebuild b/app-text/calibre/calibre-1.40.ebuild
new file mode 100644
index 000000000000..4c0754f9f8da
--- /dev/null
+++ b/app-text/calibre/calibre-1.40.ebuild
@@ -0,0 +1,218 @@
+# 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.40.ebuild,v 1.1 2014/06/13 21:48:24 axs 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/python-dateutil[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/etc/bash_completion.d/calibre
+	rm -r "${ED}"usr/etc/bash_completion.d
+	find "${ED}"usr/etc -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
+}