version bump, p.masked until qt5 is unmasked in the tree

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

3 files changed, 239 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 87b63d2ed8cb..3222c224c07b 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.332 2014/10/16 20:49:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.333 2014/10/24 21:26:21 axs Exp $
+
+*calibre-2.7.0 (24 Oct 2014)
+
+  24 Oct 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +calibre-2.7.0.ebuild:
+  version bump, p.masked until qt5 is unmasked in the tree
 
   16 Oct 2014; Zac Medico <zmedico@gentoo.org> calibre-1.2.ebuild,
   calibre-1.20.ebuild, calibre-1.25.ebuild, calibre-1.29.ebuild,
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 5ea28473fc46..825bf2818211 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -14,6 +14,7 @@ DIST calibre-1.29.0.tar.xz 33022868 SHA256 b9cc2081528b72d7082e15efbc75b4edccf3e
 DIST calibre-1.43.0.tar.xz 35549180 SHA256 3c4ef17591e033e39ba804d18442f63c3ebc1683da776833d47d8aa2900f724d SHA512 ca3282e77da985bd6117c640f8665e92d664d8749897facb0c419f7427b850fb381e0b10b5c481f8b01434c3fe6faf7dc47c9f99d3bd9a485b3e15be9f045d81 WHIRLPOOL f6039261f9c986c7293b39d03d7aaafb6dabbbf3a9e586dc35b267950cebe9a1f5a5e09b179fdb55e921725a7e8a15ef1eb328d28cf169dde4cb9de972e57b5a
 DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2 SHA512 c6131422891bed0615644336ad1dfc52803ff28d7d33994bea4a34f70655d12ab6b638432156665132805a900324742c41f8d5b7963f24eee4b68359fc433ece WHIRLPOOL dac2b04e195206d7956d7bdb5f45b37cd1e7a873db542d26bd0802d886fb9111aba1e603a795d03a2bf3b55d8cdb92671e11dfdc9fdcdc0707e280a380548f0b
 DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9
+DIST calibre-2.7.0.tar.xz 35548068 SHA256 4100ffc390a4c852a267c959b94d0c6d9606fb2a70f03b120826b99e59bb1e49 SHA512 9fbc9bf6a2bb72e17656b8f09690d6078dd8aa455c6c70b68b421ec24631f80e48928ba1820bd69f18caa29ef0b76d0f34b7910bd8e747003ebab930ea8654dd WHIRLPOOL d913898d024d6e36a04ffc7ddeafa1df6e6db793458a675db7f2880e6202891cd6c897fd3f51fd58f5031a0eb276bcc16f27ce13d90819b73e435279e1b5aa9d
 EBUILD calibre-1.2.ebuild 7216 SHA256 627f78a4880d9899c90524d3cc692f45c6d124704602c746fd637e4e2a6229e2 SHA512 4ce7cc4889e254fef24c6b3c3e510d1a4d2d24b1ceeb696a6ddae338cf7b1ceff21138f552bdf715a2f20d1df7fd6f8d59d614b21b0c494e3a09171f42505c8d WHIRLPOOL e53728b654c34d6ced29918ca1de0cc32c992672fa7608eef6d9315f4f7d1f984faf05bc6750aa5c33458a9fedb60726419445b4d9b4dbe73c0190c7d7ecefb9
 EBUILD calibre-1.20.ebuild 6864 SHA256 f72bad654047edc0d438edbef206230658563b4b4aede88779d34470f40d37ba SHA512 7448c04c3d4ab79da6a25f103ec13f980dae3b65bddd81c71a5d2a369816282e506f89c77b4fccf218f0dad3af4393fa928b90be4eb03c3abc57be4c07e3a98a WHIRLPOOL d9626f4350c65a84974acc361ff3194674c1a8e21d88e3fb7c3e59462dc93e6a73d0fcfb5d77e72952a0ea1e10f7bcaf74e01c7c0de3eabe494d06c690f2801d
 EBUILD calibre-1.25.ebuild 6866 SHA256 7e91b8f0d570a31b6ad5de2ef50e00938176a456618f7c6d4c649fcc7c3dc860 SHA512 2f430589e3718fd15b78bacea51c70ec7dbcd4ad9ef40b51de9b7b6b6f77cff7a3db3bca65b7cb368288758bfefc9b2db0009c43d61d9e8a2713b3bc15d1d5e3 WHIRLPOOL c3c38ac9a840ffe6ef2e40fd400f42f85a4e054c565b06e11e4e55a28bf05e56381828d136c709bc78b568b4e3d82d0ed914d43732da9ef9595628aa23d664af
@@ -21,12 +22,13 @@ EBUILD calibre-1.29.ebuild 6877 SHA256 d90780aff0f34bed24447028ed0893c184f28bb92
 EBUILD calibre-1.43.ebuild 7618 SHA256 dcbdc08725e1aa2d7cf2f59b534dc769716c325b34b6aa28ea0f01e70a4a91b4 SHA512 a1ab94dc6e09500c48f2c536e8cc1d67c5756c0d8628a947b0388e9a8182365941b47dc8633f9a5b017e6a105eb90179dea6423881021ef4ca113c9187fc27e8 WHIRLPOOL 4497c9ff4d73bc5364b0f425462e1f0deb7e44b6a8d4952cc1314ae42fa81ecde9d9e647296ddeacf6a3703c058ba9ce26abbe7110709dbd85880d51ac23a623
 EBUILD calibre-1.47.ebuild 7928 SHA256 ade95436b733ff6f03bca9389d3c42b45c5786ee62dcf8d3360e0c39adf1fb44 SHA512 13f53ba909b309368b413d16f125e44cb2a9ac0e927b19ba6e898b24f77768a4f862e442846ab4570410a4cc01b4e6a308aa85905b3bfe1ce2eb8d814a38344c WHIRLPOOL 74c4ee4e9cad8936ecd39e8fb3fcbba46c19dc59ab3629165682c51f5eea833885226a798e3949decbd308d5e63a5c937902b2c79215e72592c2ca9f411609cb
 EBUILD calibre-1.48.ebuild 7928 SHA256 294a160ad70a49273d2a4a6bbb814426d81cbe5a826616a2810da1dccffc0455 SHA512 31c71cb9f1e05e1f645fdd98080175f0ad9bebab3b5c6482c3216694e3112a2804f4f17308f2a5e2f851c74c5aa690f449a1bf8f8717b441a738dce5e60e2923 WHIRLPOOL 141115e28c2ad2c273edbd54a5113aac5677efcf3738a20e565b4fa051b1161e4ac8278fbf026677681fdc387a6b2c8543991455a97e5179cdf8f47f8bb2406c
-MISC ChangeLog 53017 SHA256 3b350ffb15c3463600a999e501e04e2032491e853cea23d80e5cbfbeb28f28bd SHA512 5c1649b616b6d27092af428ab305f00c6c7822725921aca8006d107cc3c08ff39e81b87eda48da2d1379ef5486ccf20d38b3fc2082844fb70e4338c257e1814d WHIRLPOOL 19bb58510677b950148b42de432589306c76c7a42746adfd110f9183c1678dc8ea173d31d6a11f8ac24dca4a3573c4678fcae82eefac9ea2f161d597c5b71640
+EBUILD calibre-2.7.0.ebuild 7885 SHA256 37b95a846898f4456dcb855e32b69882e6c5bf455b0e32e646ecf0bd7b0cc796 SHA512 43ffc977a8c79a8180a2f8b520c7a7564d7625ea80ccf767c523b65d0eaf867d4caa8c162a8a03015e57086cc3a55fd416d43c8ae502317cfcac0caaded9f5ab WHIRLPOOL 9b9de3fc99f5d8428597851c05e328052cd11b60dda11b1db5f55a372446033a2f1a16bdcd2e686f911cbf8faf67315af5d8b7fec4f183b33dd2dc0a49176f6e
+MISC ChangeLog 53183 SHA256 ec7caabe8756490d9d2da67227adae67b496b42f9bd93cc22458799bb26ec224 SHA512 da509a08cac6964c2387c5ad0dfec4d13b2a60a24c5f8ea516134f5548cb7687a67ad27f523c93f90d82752a70d721dd013c2eb322d167b2452c959e90937473 WHIRLPOOL ced9de028c5268b501fa343b69ce0d577507459336aae17ce699dfe6e3431f69016e67c2b304051c9db6c3f2a2a5433d24e3126bfd0ae71d3203b8a279d113b3
 MISC metadata.xml 341 SHA256 796a5a95967784ec0e9295b5745962d2a20dd678fd7425e6bd6414b9b1fbae33 SHA512 0fa9fd10e81ff337e7e7d9a55d492f4cbcee79fd1771497214c39c0c2491759ba0ce7f62a1aade44e2165617da40111d0ba3a3802b679db66f60e66bff70e2ca WHIRLPOOL bd14a2fa77fbf2f7e3e30725ef299809e11696d5779ea80d8252efcd64e79bad7db9c331f8617ce220cfeaa6136e932130db85aeecf35412f99d9957cf3e9f08
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRAL3EACgkQ/ejvha5XGaO3KQCeLDgfQPetyvUuD6Grhf19mS6m
-LrgAoNviTyTnXugZsQe50bAPkZyalWwp
-=UZjl
+iF4EAREIAAYFAlRKxAwACgkQ2ugaI38ACPCT/gD+I83Ab4T2FtIhGEENb4RqoIkW
+C++dHBOz385PY3CPUlABALDBOS+wS7yMDMhtYg6JhS0LeNnTo4rr1Rq8QbTXj6Pm
+=c8ov
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-2.7.0.ebuild b/app-text/calibre/calibre-2.7.0.ebuild
new file mode 100644
index 000000000000..c20e055321c5
--- /dev/null
+++ b/app-text/calibre/calibre-2.7.0.ebuild
@@ -0,0 +1,227 @@
+# 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-2.7.0.ebuild,v 1.1 2014/10/24 21:26:21 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 ~x86"
+SLOT="0"
+IUSE="+udisks"
+
+# Note, dropped dep on 	>=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] as #1, its qt5 now, and
+# 2, because repoman blew up when it was there, and my installed copy doesnt seem to link to it.
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
+	>=dev-libs/chmlib-0.40:=
+	>=dev-libs/icu-4.4:=
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.5:=
+	sys-libs/zlib
+	udisks? ( virtual/libudev )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=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/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
+	media-fonts/liberation-fonts
+	>=media-libs/libwmf-0.2.8
+	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
+	>=virtual/podofo-build-0.8.2"
+
+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}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database}
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database}
+
+	export QMAKE="/usr/lib/qt5/bin/qmake"
+
+	# 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_DATA_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"
+
+	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
+}