version bump; improvements to book editor and various bug fixes; remove old

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

4 files changed, 14 insertions, 228 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 73749d7e8afa..81096b0740a3 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.320 2014/05/20 14:25:28 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.321 2014/05/23 17:06:22 axs Exp $
+
+*calibre-1.38 (23 May 2014)
+
+  23 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +calibre-1.38.ebuild,
+  -calibre-1.36.ebuild, -calibre-1.37.ebuild:
+  version bump; improvements to book editor and various bug fixes; remove old
 
 *calibre-1.37 (20 May 2014)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7a6b41da9a36..bf403a3bb351 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -11,20 +11,18 @@ DIST calibre-1.2.0.tar.xz 29652528 SHA256 d27fdbe981620aa63f5c70909c63a3a7b747ce
 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
-DIST calibre-1.36.0.tar.xz 34023596 SHA256 4e4f0a6ba851c795e0d7d88fbf08c84a637f245d1aaa5bb13b177da5a6081d57 SHA512 3a22542de829a1b8ddfab9269760ee5a33baf5a2d69fe171d099e244489b3146c1045abf3119182aa7b57c6d0e01f637dc337e6d6a696c61d99544be0935a9cf WHIRLPOOL 737348af7b2a3545b299bf659b8d0256340ec774178eb8a6c72ac672314145c7e53f7180c1785c78e2293b32afaebb243d6d3dc549b405a6837ebe819745a8ae
-DIST calibre-1.37.0.tar.xz 34093504 SHA256 d9168b9c46650052694ea5ab94c346db1760e24f61d18d5c98450e5b2069091d SHA512 77ce7a918b6bd7bc09f4f456b59c9bef556032d13db0bcb937dbb601666c2de933203a7798a3283c6ed6e47b41e3b9ca949c2f63c9c50e7810aacf51a9e9ac41 WHIRLPOOL c70d9ec41105b0099f79da13adbe460299bcf39b736eadcbcb5be27994a332845de967d70c4e70296f8e52bcce7d6440124e1bc5d3a60f1d40d5236b9c442927
+DIST calibre-1.38.0.tar.xz 34185808 SHA256 fb7eebe138d078cc0ebf6b135ccc8800d24e28e246d51d79696896ffcc40671a SHA512 6f4f31fb8722dd7180e5304732acf0e8a42f3886bd2a2ccf17949a2014be2b020dcd04368f360a41f35fd102b3a58502ff8a99202e87fe93aa8353edad327796 WHIRLPOOL fe7768c99df8c66065e9f5e5cdbffbcd9b373a8ac31c3a62fc55ad031af20968bc8e6fac819f96061f236dfa26a738f79294f96cfbfb9466eb77e3ed2a4d22a6
 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.36.ebuild 7636 SHA256 e2a3a4568159471d415e5dec4a56773267bc231b8ae95bf4dc6d40c6671d3339 SHA512 fbd494f2ada5f01d35812f4eb2d1428105cc322280f54092d0ddf87f85057c954bbe2d58903fbecf7f9ae2e88682a287f8398fc088ad0dad6a8e1a183ded6162 WHIRLPOOL 93130fa64eec06ce5c65b47fc5806550a33b2d834b881da65d8bec803e37635213a9be8a8ddc1f6bbb36b8d24dbdea1b67665db345e6c5f884ce5dd342415dbf
-EBUILD calibre-1.37.ebuild 7636 SHA256 8d77b6a15d7eca7fc9100a8f9432e25ad731b2aa331577b1686e6af0ef896424 SHA512 8556f4344f96f133f7cc7545480559892711606504ff63bbcc94c63a6510d99073c6d2af901cc596cb4f3b1304ecf3a9ad158e4be301320388b95ef07d92b5d5 WHIRLPOOL 7a9ec0300ae58e93bde6af6904a8eccdc33378fc04eac10afa4d27cc04dbe968827a8efaae46fc2343c5303b85303604c242860da38a859fe554b4adf6ff220a
-MISC ChangeLog 50991 SHA256 53c2e239bcd430b132f3284ff97400562bfe7b971c0983f26d0cc9a000534154 SHA512 51431ebf82fdc13ab3a4cf19a836db961ef03ea97413713d54637ff64c9fe1673b65033e5bdecf7158d88d658a2d5de7b144af983b6971f6c296489c1d979b1e WHIRLPOOL 7f6097458a794673c53b3629e4c22e5b0bc03bf5cf8da476d263f5adfa364d031672a72e31f8967b0cd4a2ba89dff230f749587e46d5c7adb1f089b7c7c6ab87
+EBUILD calibre-1.38.ebuild 7636 SHA256 70e80b68e1639a13dae7ba4794a876218577d174656a8326f9b2b555157458f2 SHA512 9f330896d3da01f25ee0856a8300014b790976344cc9cd653242c300e165411c69511c9615948dc6ae6ae99dcd5bb71c374be8db15302e1a390e5067d14db11f WHIRLPOOL 14f3c21f5443fd6268401fb59ecfdfca31d1793668f51086d550e250fbda09762654213ddd1812e9f9c0e0d82c8e12cecf351b8653e84b04767c631adcc20ab4
+MISC ChangeLog 51224 SHA256 7a1565b909f02a4c8ab25e81532efd8181b8ffafa4d8e9b0d114ea497866176f SHA512 4b7be30d52f2392f202df0d82f6ba4880a470f6deae13e229b887c09aedbf077d3877007fd48cb36487cf00a9fa73ebca80102410badf948536d1e2f82d41d91 WHIRLPOOL 46f9231e7becc985a2fc7ab3a5a25f460c76d5232a09e3725d0d924a5f148e24a75812344dda36dc3ec68792264161e101ca164854580eab4233e227b67e293a
 MISC metadata.xml 494 SHA256 8636a504a39b901333bfb9aa1c1322dde87ddc3fa6c6da3a7b95abcf25d61786 SHA512 c8e1bf8c46e3b3285df1cffa1324042a82d6a40dfbe5384d018386e661c446204bfbf24b21d7afe893ceb1e1de07719b84ad2af3345c04e4419141f8e789ca2c WHIRLPOOL 7d89476c21141740f9b27f947b722bd64004b6e705fe6ee35237f94ef318f626e49a5adad5ac0ab86d015913c3663d4bb80d9a9f4014bb3e139623eb0938179a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlN7ZdwACgkQ2ugaI38ACPBoPAD/W4qJOW6dLWCfOtoJsJlYXZyF
-biot5O/9jiOAytqMqgABAKBN+zAugAItLwgQF+0RuubCfmAcniN/nlVV1qwzCTfR
-=jVWL
+iF4EAREIAAYFAlN/gBQACgkQ2ugaI38ACPBy/QD+JaHGbPewBuDiAsYgPiNlTWcB
+/lI+ekzMym2OHVV89LoA/27k+tBNYFgjgtZ9pz1IcU00XXpTM7KZJoEv5gJKPSGR
+=F5Gt
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.37.ebuild b/app-text/calibre/calibre-1.37.ebuild
deleted file mode 100644
index 46c7ddd72f95..000000000000
--- a/app-text/calibre/calibre-1.37.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# 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.37.ebuild,v 1.1 2014/05/20 14:25:28 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"
-
-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
-}
diff --git a/app-text/calibre/calibre-1.36.ebuild b/app-text/calibre/calibre-1.38.ebuild
index bb40392c0228..22cd9b3727fd 100644
--- a/app-text/calibre/calibre-1.36.ebuild
+++ b/app-text/calibre/calibre-1.38.ebuild
@@ -1,6 +1,6 @@
 # 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.36.ebuild,v 1.1 2014/05/13 14:54:59 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.38.ebuild,v 1.1 2014/05/23 17:06:22 axs Exp $
 
 EAPI=5