version bump, with slight sed change submitted by Mikhail in bug #504868

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

3 files changed, 236 insertions, 15 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index f21de749523f..fcb316fc2608 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # 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.312 2014/03/04 20:18:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.313 2014/03/21 10:52:39 yngwin Exp $
+
+*calibre-1.29 (21 Mar 2014)
+
+  21 Mar 2014; Ben de Groot <yngwin@gentoo.org> +calibre-1.29.ebuild,
+  calibre-1.20.ebuild, calibre-1.25.ebuild:
+  version bump, with slight sed change submitted by Mikhail in bug #504868
 
   04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> calibre-1.20.ebuild:
   Stable for x86, wrt bug #502198
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 3a9ea64a3605..d3ec4aed6082 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -9,25 +9,29 @@ AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a
 DIST calibre-1.2.0.tar.xz 29652528 SHA256 d27fdbe981620aa63f5c70909c63a3a7b747ced1da2ee7065879f07b8a75ca40 SHA512 11f6550ae9cce8bb4fbe47d2c715376d2ae3e3651e21016409f131db8abae0c7bf7c8c5d1d30ee25d1726ddf44089b13f9b404468700a6f74c40c0ba9fa513bd WHIRLPOOL 3b10a4f52ca8e976ddc3c240a3d5ece937603572a2d70d73afe6599bb99adad7f08d3402320e00e2532bed85b3c06acb734b12ff6c626278f4934f56aa7c5528
 DIST calibre-1.20.0.tar.xz 32430560 SHA256 475e09b1be4b9977240cbbe6743ab79da4b1f1afe3fe6015d212d868e8f2fac4 SHA512 84ac25080cf4948398b79f9a1af688cca9cf9a5a9200b2aad649f5fda1cd0556be4ade0c8b09ea6ffcc95654eac0aaaa5b8f8ed6ea9830174bc150e64de85e31 WHIRLPOOL 61b6ecde2e3f8679c1afea95dcd152a94ce03522c06dff34b406a5705f6255243f0565fbb5f9bef3ac96d7127190bd1b4363233fa24fafcd0412e061201f6fe8
 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
 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
-MISC ChangeLog 49558 SHA256 7edb5e34f35e05fe88cc05499a7196e9379b130423ab9a3afd9107c91355c80a SHA512 02515012ea15728f4e3bdd5a65102c8cd177a83a8b0eac50a0d35eccafa9f727125e7f7fab1119b29fe708bbe51cdaccf501c319fc9a966d06b374586089f064 WHIRLPOOL 0815767929e6a3b8ac32edc0a43db91861e6343d3f54cf12e0592c34ab75fb7416c5f86fe6a04cda0993e161aaabc0589d1b2a7b5d16d1512ed3167d276b84ec
+EBUILD calibre-1.29.ebuild 6845 SHA256 8b62380e75238694b459a4ab9d40139229a3dd1a09b2018dc8bb6315248ad362 SHA512 67f7d77a509be8d1bfbe1ce04a6e9959f259dd7da71f1023548806ff229ebcb23f95e55fc27e6e41c76aa0d51c3816433fe85f7ec83d82bdeb33c3ec6114aa5f WHIRLPOOL 1158539fadd0fc494c2eaefc496269b77a1d4043bd8d8bdb2a6dd269c4fbb4fe458ae564c22c8df29b362b167ee6956290fdd986182078466f1e41424cc7c299
+MISC ChangeLog 49780 SHA256 6c99deca96b0171eef7262e284a4f6ba611f8561eda9a85b8cf4aaef13f8a5ea SHA512 b2e91015a888c95a9d0fe3701ee01ba3928e0d922ee8dcdba2dea8915dd1371e4e6ab550d98903df9033cacce2dcaa118d74646b29aec919434595087973d67f WHIRLPOOL bb27dd96d1740d77d253ae271787daff0c4aa88c578efd28115f9a5c62969308891dce19947e3b5a27367c431eea944dc5bd17f411d295cf736b7b778d20d3c7
 MISC metadata.xml 429 SHA256 100c8c263832c35d7b5b9bdc471c1d229687435468fe2d7156883bfa91b3ff5a SHA512 319266006a9d488ec03d14a54b9e1534179d78777405abed00c44130917873e2a7a6ddcd2b45ad09ebd5e9a34eeff87c9d1c212f40df4596548e669f7f3cd260 WHIRLPOOL c3fbe4c5f938c028e2f371f1e43a268bbb48c104746a58683e54456fe470a35c1d9271cd1a3215b8ab3ff87d06b214c4932a8a1a20c9d903711ae651523544ae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTFjUXAAoJELp701BxlEWf0ecQAKjjq89aP4woVYUo9BOjf20D
-4VqNJlgJ5Q2XHFBNBKpXurEJ2zif6+CTqdLkLSh+1Vu9QsOvI6mnBGc8tFmfrad6
-N8zBQKfC3R466OUHGelw7tnrZsCcWAkZ2huzl1iZOQ9Il4hlLYRW9OXs8qNgjmUb
-aTQVFNxxHTCLb2/VZZWjwTYFRlZjIopsmFr1UM5xkPYk1oqnDSHu+YcdphCEJ8S9
-sKqSEoJL+SRlgGJY6gBSwxEonuQeHWuutz5G3Itqb8ApaAo3kgGSJs3lN0DGjhS6
-hZYv5UTw7TFe26Mry0UaRqCIjvSu6bcN1NkWVotwKsIUeYCYDhHyKxJAjUvUCn5i
-eJ/VJks+Z5GRnPTDfJUFv3FbDIBe3a0XGpe+uI1LtDfC2Ok08cpUKgjZ6W2zeHcb
-UZIvCGJmG5/paw5l9r6R2LGsezon3vpKqwOr61JF0zUUROuPLw/IR9ueoWV0GbsL
-nQvKtw4NHTkQsq0C189RZPgJBMzTgqHwWDo43P0E/IHtLAuX3q6MtqcOVAofOo0l
-tLhexiOHNQkNjLjV8vOQGkI3UzfGwZN08iwaGktbqmwY4w9Em2di8+Vku4ZuEr/w
-2r5vU0zgg3ENwmx3eCvkXHVyaS2m7dDMuTUQ2EeNpsBkT+WupgSlacHwxfO6JqdJ
-7WrfaO04ZNahdf2+4mYw
-=S5EJ
+iQJ8BAEBCABmBQJTLBn/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2z8kP/RkoSLflthkrO6uzKN4b30p6
+zokdPkuu/sFAWmiQsxZODf06vjQmaMbKel/IPSCMB2B2n3uPe6NOMRLHUisPpGY2
+h/gdSP5ul+xMeD9XcAb6LN8GcJqM+73WhMTru5YZtUMYtdDdVTrAB3smKzMAqJEq
+rWEzgTolAjnNKiHbpNtx5vvlowAprZJig3boIQIsyFc+sMtsiCIPzEglGtke1fKa
+wIvMwEJgmJqno1MH4ltOyahOFXs6ajlBadY5VrbpD4P5SmJdyTtfUH2TtI1M8VWH
+uu/WVDz1oGmogSkIbcBXQCq9n5xmgNf60zTlCi/1TbD7CsfewZ7fbhpGIL5Z0hVZ
+kAcOgcBW8ZXnHpbH+Wo7Li+2JyQwTTuTHEBs3PliBMyQWkXmuafrSx2MPOEjuMSP
+6UmyIq+q4F9UX2nQ2eEtq8Xur1uFCyGMl3Ug/g1LG0fpVXlDiQy5xbxOQIIsFilM
+QReM3BiRLff3GYdPAMSzHjC6Ph3SKpOZQPm0t94g344PzgbfoK1S2Jb0l6S08FCP
+vdHwKRbI72G5sZmjmuQIux3mcsRMP7il2aEJUpBpIBVCbHu1f6CgKsgCiiIyl2kx
+mZdiF1pu52QPQZK/Q3DBIUUOHBM9505iM7XJFYPtm/9TZvWgNiG0+tN1RRfZvFSD
+AWKs1iy7tuj4EyqzvCKF
+=zxvQ
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.29.ebuild b/app-text/calibre/calibre-1.29.ebuild
new file mode 100644
index 000000000000..8cfd2d657637
--- /dev/null
+++ b/app-text/calibre/calibre-1.29.ebuild
@@ -0,0 +1,211 @@
+# 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.29.ebuild,v 1.1 2014/03/21 10:52:39 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 ~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
+	>=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]
+	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.4:=
+	virtual/libusb:1=
+	virtual/python-imaging
+	>=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}-1.20-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
+}