NMU: Version bump.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 222 insertions, 12 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 53802c69c70f..4659ef6a3f12 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.306 2013/10/18 11:32:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.307 2013/11/26 18:56:03 mrueg Exp $
+
+*calibre-1.12 (26 Nov 2013)
+
+  26 Nov 2013; Manuel Rüger <mrueg@gentoo.org> +calibre-1.12.ebuild:
+  NMU: Version bump.
 
 *calibre-1.7 (18 Oct 2013)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index ab94c6a2aae7..da2804bca4d3 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX calibre-disable_plugins.patch 1042 SHA256 4921ba7be29d8e2789f3e31d23faa96f308cbf556f2704c001a3dd4dda9dfda2 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629 WHIRLPOOL 8a4870df539bc768b9dcfb28623773d730ba27ef307dac856f4fd9ff682b710a7b33dc93e505cb5d974a95885089c079838a59d579c496ad6a173384eb14bdda
 AUX calibre-no_updates_dialog.patch 891 SHA256 59cbef4d8026241bd198f36728c4dfde6fa063af393788c3126f788730d375a5 SHA512 f7cfa4b0675146275c155897b3bced4899487dcd6e3f5d94719d25dd698b4b74b9bb13477552f0ade3d243a35146e4cda36c46cad8bb74c57dcb549825428117 WHIRLPOOL 138bdd85270076d2a5f8560cbc994bc91bddec2385713c19237fe4db665dbf0bedc62941ec70c39b418c469de2fed036a00bfa9639832f7d435bd6bddad391ef
 AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
 AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b SHA512 c51c7cae899bebe7fb339f9cfd4070caa778f86ce997dce26052e158dac12444d3a72db91fd83528ccad07d9bd9a9e72edca9ba91d1805e91c91a0a6ed32f579 WHIRLPOOL cf91dc9993b0329821a9a7b9b4a5245c8ef7a6a2a407cddae4b7b94aff1698e663e9ba08352b61b48fe34a1e3c83701ac71ac549142fd12795e1828d5d8f779d
+DIST calibre-1.12.0.tar.xz 30941380 SHA256 7a1edbd6aa4e2b7c6fd92f59c47511442baf404bcf8b3840e566f80894f42f1c SHA512 2d229d3bcc0a014f9ff4473399dabc5452acd7992fef339ed9d78a15fa985a83b9d13b3e0aae6ec15b8c3592443d98542608133b2a847ed66fc21ab164c7a466 WHIRLPOOL 4019faf76e9f860eb95aa05fdb2aa84164d91c96bb54b5438539cbfa7730e8f2bfa19b95dc7169dbad3c8c08d145ac68e4ed340cce22726a7d8c4a155ec23db6
 DIST calibre-1.2.0.tar.xz 29652528 SHA256 d27fdbe981620aa63f5c70909c63a3a7b747ced1da2ee7065879f07b8a75ca40 SHA512 11f6550ae9cce8bb4fbe47d2c715376d2ae3e3651e21016409f131db8abae0c7bf7c8c5d1d30ee25d1726ddf44089b13f9b404468700a6f74c40c0ba9fa513bd WHIRLPOOL 3b10a4f52ca8e976ddc3c240a3d5ece937603572a2d70d73afe6599bb99adad7f08d3402320e00e2532bed85b3c06acb734b12ff6c626278f4934f56aa7c5528
 DIST calibre-1.5.0.tar.xz 29689060 SHA256 f6eaf0d44ceb82fd80f5cde19c3be409ce268d28b443824a850f887088fc579e SHA512 b3fd46150caa50f21b29fe9c34d07b2c426cb943829b77285ccc0946ff665d47f339c8c4bdf801777b239a38e7f7e6f790fad692fd005603a99d0fef140abc25 WHIRLPOOL 548e2ea9402a878c37e8060b8e6eed5ee95c67ebf77371507f61c1caf8a34dd808203c4e886318b9195632abc4e3c9da47df584980003d0895df9852c8df4c9e
 DIST calibre-1.7.0.tar.xz 30417136 SHA256 9a6817f81577c6e8ffbaf6557dc48c89200cccf2a3d4e55d18523bf4f37df73c SHA512 67846639007bb5294991004252e2886fe56a7b836a93305c4753705688b3ce3730513fb3707fb0091741b7d372412733437e05c746c41a53ff6beca67f3c5fc7 WHIRLPOOL e2ab646256f11a771a27d5f95d9858f0e0242b07a1ac4762b7f6dc33d104aece2b91bbd571b5d1fcb3c813b5797de70cf772ecae48e245f304a0d590382222ff
+EBUILD calibre-1.12.ebuild 6831 SHA256 2a363bcc138dbb2dff812f063ddd2ca3a66d3510fc5576036224fc4dcfb11b25 SHA512 bc833e425bca1ceca9620abb32a8419ff7e268aa6387bbfe7acbd2a2313b6398adb56f24d6528897a3218d7b03d7b99f33e70b95204f861718b4e1f634b283b5 WHIRLPOOL fb5dc83c3e5816c7bc54af00678cfc2b6a1725d1cc46c27045a799efc6a7f0b5ee847b60a0bdae8fde175e2dd26ba0c0246addb0f52e61ba9ae43f833c4c41a6
 EBUILD calibre-1.2.ebuild 7188 SHA256 90113b51d09bd3ab231eeceae07d4aae5f8ebd37ceac16525ec51184f39c294c SHA512 3fea7182ff45399da37eafa5e1b8ec9d86bbdd21e1e2a4559d12cedd8028f23313662b9f7b833dfd51f34b13f6320f5db040bca681ce580ef890b1c84a8c18c2 WHIRLPOOL 381ae7dc0ea326d08d94ef3016147d639755c645d928b4830dd8dc655e3dd3eec5cfe71b517831a63fcc48e688cf1eff0e95af0b38e51efac9b9f9b7ca1248b2
 EBUILD calibre-1.5.ebuild 6832 SHA256 36c1527bf5b7c7f1dfb3169a4b5a0df10add8b079b4294446878d45acda06a7e SHA512 d41ef1c8c81a51f79f9f8b1c62c003c9826553cfb66655931e45ec5609dab4d4da18e130331aa4b2648b621ace50f441bcd4392d752fb38c3e97c41a2d768185 WHIRLPOOL 82343a0a1668d5984e766f69bf7dc929133b1e4838ebca563fa97846b1251e59f1a21000881eaaf33f91e27c9dd807ea6dc9628ea983ed5e89168804e26abf7f
 EBUILD calibre-1.7.ebuild 6832 SHA256 294e29a81b49aaf638ab444b87193b37ffb41d10d281602b522b470948e67363 SHA512 607bc3131e82678342d7c55ae3926d0f20c41824250de1821dfad6b555f1f4bed86b94fc804b0f81fb83776691446d01e6a21f62ca3b55b268efc0640e2a24ff WHIRLPOOL 4c5801dc67c06a4ffe63d0bbc9f23b1a3bb5e108988b9c0da620971f7efe81a2752422dd6a56de5720d7fd729ad009cac4ad44e994c3457d017f7c7a9ee9a9fb
-MISC ChangeLog 48657 SHA256 932699b2ff1bab801a6646ee8ec530087ec3680be05197a96bb921f1f982c793 SHA512 0ea8e60b8684a5ed5138beff59fb99c07ee1fb1adaa8bcdd1675f44fda29375a45eca8a6c4601522b998cbc18da0c61e27d3113df5b0b53778065462eaf8e3fb WHIRLPOOL 25f7a312402403c9efd453fd93171053ec6805b218c23cdc62f1c3184228a0942c9a2abd3364a690821d7dc2e47b744b36c41055d8957016b7b2f47c1d2912da
+MISC ChangeLog 48776 SHA256 92c4fb715c84642a6c451fcb689136c9ed4118fdbbcf7ed2851e1fca7e75a731 SHA512 cb44a575adfba200cd4706a30d2557eac44b864c13f198f73b8f22b63e15532cdf0a762a703ef2ca624f2e17fd0a017d75548d453c2ac2d6cb50999338787dc0 WHIRLPOOL e5e6abec4d349b2a2b0a919273e2d51e873f23a5552803aa1b4c02b6bf626df4794e38edc47ba6a2676b9186a15f9c5ec19cd7d55ff157a4387d01d945f7f4d0
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlJhHEoACgkQ/ejvha5XGaMoBQCfeBBVLtb44inmuwNd+tbj0g9R
-oyIAoIgY0pkvYoyT88FyXkBNOkUwuIMB
-=1qUg
------END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.12.ebuild b/app-text/calibre/calibre-1.12.ebuild
new file mode 100644
index 000000000000..c5787191b37c
--- /dev/null
+++ b/app-text/calibre/calibre-1.12.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.12.ebuild,v 1.1 2013/11/26 18:56:03 mrueg 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"
+
+COMMON_DEPEND="
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.12.3-r3:=[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
+	>=dev-python/beautifulsoup-3.0.5:python-2
+	dev-python/netifaces
+	dev-python/python-dateutil
+	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssselect-0.7.1
+	>=dev-python/cssutils-0.9.9
+	>=dev-python/dbus-python-0.82.2
+	virtual/python-imaging
+	>=dev-python/lxml-2.2.1
+	>=dev-python/mechanize-0.1.11
+	>=dev-python/python-dateutil-1.4.1
+	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
+	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.4:=
+	virtual/libusb:1=
+	dev-qt/qtdbus:4=
+	dev-qt/qtsvg:4=
+	>=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"
+
+	# 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
+	epatch \
+		"${FILESDIR}/${PN}-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
+}