version bump, remove old

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

5 files changed, 15 insertions, 447 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 1cc9065c20f5..d64918e8d247 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.325 2014/06/14 07:01:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.326 2014/07/08 14:29:24 axs Exp $
+
+*calibre-1.43 (08 Jul 2014)
+
+  08 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> +calibre-1.43.ebuild,
+  -calibre-1.38.ebuild, -calibre-1.39.ebuild, -calibre-1.40.ebuild:
+  version bump, remove old
 
   14 Jun 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 9818b3f38ef3..dcc78662ab6f 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -11,22 +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.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
+DIST calibre-1.43.0.tar.xz 35549180 SHA256 3c4ef17591e033e39ba804d18442f63c3ebc1683da776833d47d8aa2900f724d SHA512 ca3282e77da985bd6117c640f8665e92d664d8749897facb0c419f7427b850fb381e0b10b5c481f8b01434c3fe6faf7dc47c9f99d3bd9a485b3e15be9f045d81 WHIRLPOOL f6039261f9c986c7293b39d03d7aaafb6dabbbf3a9e586dc35b267950cebe9a1f5a5e09b179fdb55e921725a7e8a15ef1eb328d28cf169dde4cb9de972e57b5a
 EBUILD calibre-1.2.ebuild 7187 SHA256 0a34e4e0e84b7a7acff0c307c927dbc57706f112adc7e41a1fb67f0f95815542 SHA512 1822a76308a28d231e5ad352f638cc78e92a970bf59b90527856eb9550d43e28c5c3a022f4a459a3729c02306c635c2512f2e8e1b1ae3de5394c53104df1fbf3 WHIRLPOOL b5fd2fc15831bba33106f33723670acadda776b8ee76ff0f9640042b3487d2d6d43d834fa9ec2761952db214b0efe091248eb8933b330e9c5105445b93500329
 EBUILD calibre-1.20.ebuild 6834 SHA256 5275402ba5f44c2731004826962720deb5c4a26076384d31ef0c8b5e58fc690f SHA512 1d065603262e3d167950ae4f2706ae51ac2ca9d846f28e606e0e727aad69174149c5f5b69297190ff5ebf21ade262d5c211d930578e131e77297900869fa0f89 WHIRLPOOL 2d3d333cf381ae43703e7433251229e6f4faed12827b8c0306ca4bf358b452265c338493b981ddc40c27773ed7fce01d18990ab20691d1f507ade8c9049d96f5
 EBUILD calibre-1.25.ebuild 6836 SHA256 27b67ef97435a9a408fcd24523ebe44738d91ac41a89e6c0dcc538e0403ec0d4 SHA512 5f8431f6454000e7288a259e920ce23ff1dc2d2900f0e347b2a6d3b31e7dea5de9a2e7633bb24449fb5c37b7dbb26272fabce6476c2ec17a847d2d4bab2aee1b WHIRLPOOL 96c87701476f88493a9e5dc7331b62c432f1dd94f64ac3f23b99072e1c15bf3cc126439811651edc4af50c641b18826a6f2ce9cd5334916295e0dd664801ca50
 EBUILD calibre-1.29.ebuild 6847 SHA256 78f94d9ccbbddc30af55c595ce1f0ae52e9e243c61010b9537d12819ef8e6406 SHA512 5fd99e4c82bef3173d8b1a1e12540a2302b223f580bc55d61259fcf745acbb63dd739bbf9aad454d5b0556d7c89cb996473510495d466f21a0c8c09afab01012 WHIRLPOOL 3db272cf78503c200ef19b4e026adf43e8c44358c75692bd15ce6d979c194687b232575770784a358d04cb8b8853c8e101ec63cf2488005bf7dba234668e33d7
-EBUILD calibre-1.38.ebuild 7588 SHA256 102b881702345d0e0a0ebf048b341338acf4f6e93fd1e4fb9a42fdee818cf05e SHA512 9b92060997d0ee6048ce006554e442ca673b93a67c67c97d0cefefc98e4e670cd647569494f4bd9e5ab92cb8de279feb414db25bb48c6f79b91387e46781e8b5 WHIRLPOOL eb4ebd69d554e576ec7083a9d6db941f76b735f3e51c6a71b1cf0abc14e31c324de94ab2746ea27ccafaf83b894087780d69c848a40070eb72d165a030d3a91b
-EBUILD calibre-1.39.ebuild 7588 SHA256 5e0c0989b983555e2a08d8f06be4465549b6a9591566ffb2530f466f58d2f488 SHA512 945f464b9b442e7509d9da3661bed5892c3968869b57846accd8607bf6e11ffec8db73d201c23b70494d6e3be51da4eee1bcf4a79e94f081a3c7a0d189655d1e WHIRLPOOL dad012c05a1e83d4cf068b20cf2fb1eb029d13cdda2554afb47b535774e54c4545d77465bd44635d56eb0c060b7afb442e832b807d5b8915b5c0049c810b5c4e
-EBUILD calibre-1.40.ebuild 7588 SHA256 832d91e3067597e5b2086b4e9602881016f80501e0c48302ff59a093b7827eff SHA512 696d49fe998b74e52fb37f94a6f37ca0b73e879a9c12219835604617bfac1c61bcc37f1d5e5ce4cdc9ce7f688fc3e7eb582545a22f43dabd978d11d7ea86f04e WHIRLPOOL 2eb0eceec697abfa9794d7182e33e068bb45098be05459c074562359dc6e0578bbea67774d0902e61a2a301967ece327e810ed3afdd18895976514231fdb3d8d
-MISC ChangeLog 51832 SHA256 cda2185ce096c6db5770fb6e281991162683b6d50d60a55eab42417e4d1dbc39 SHA512 a654e577aea6b72bd9b82128252f417a151f3065998fe84155813041b8043c3e3a2f72d99c99877f2ba93c672cb5160d0ea067f70ac6feda859bddff6b999be9 WHIRLPOOL bb7f1afa71b0a76b3cdff372156e38c9191bf096d27cf5d9882a3249018ddc78117488cac22aac535f682e83ef84de45856e91d6692a05d9d3a41e80d0cde767
+EBUILD calibre-1.43.ebuild 7584 SHA256 65f01e629f901ab3784faf34f0621dc3ad05112c3f287c900ec6460ff93701a6 SHA512 9810c2f77c148e9b6fdff7d46adc7705354a92a162783c43cbbc722993961d0155872853c260e4f842ffb42d6fbac4c2bc9d4e6e7579ca683bf578d097382d97 WHIRLPOOL c89b4252083bdec55502a7fd2788c37a7d6531ecd8291fa1bb8d3860be5298ddc62abde5b067f2b85d06f5172329102ceb1700d205498e02f0d042e2ce2fa2ef
+MISC ChangeLog 52032 SHA256 7aa7d84d2284907a804474bae94234a8a6a1dc2edc98d8ffd94390f2e7c92177 SHA512 2218dc95e50b2c446148c59fd6145cee36235ef5fda45fdce73939813e303a5a61312ca1582f1707c60e83837a796a997ca8d28869e739bf198692113bd3b35e WHIRLPOOL f0d8723b533975e2f01a48162f668fa20e6ead455e20a708c5ba8e49f66224a2fba3a90500e31664a074314ccf4e8cc433ceb78b30c9b5a71e2c9577d1fbff32
 MISC metadata.xml 494 SHA256 8636a504a39b901333bfb9aa1c1322dde87ddc3fa6c6da3a7b95abcf25d61786 SHA512 c8e1bf8c46e3b3285df1cffa1324042a82d6a40dfbe5384d018386e661c446204bfbf24b21d7afe893ceb1e1de07719b84ad2af3345c04e4419141f8e789ca2c WHIRLPOOL 7d89476c21141740f9b27f947b722bd64004b6e705fe6ee35237f94ef318f626e49a5adad5ac0ab86d015913c3663d4bb80d9a9f4014bb3e139623eb0938179a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOb80EACgkQ/ejvha5XGaPp3ACgy+m93wCA57b/08LkR/gxPm8N
-U+kAoJWtsMoCBoq7UO0LwbeyNtGlN/q0
-=0JQr
+iF4EAREIAAYFAlO8AEEACgkQ2ugaI38ACPBQWwD/Qp2Jnz1zwm80m7PQGgjG+iho
+khS9Q+eEJq/Pcvp5vAkA/0XNXYRtodtMBL9zasR6gJqSH29Nhg4y+IrsB9Lfq9nh
+=ySOh
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.39.ebuild b/app-text/calibre/calibre-1.39.ebuild
deleted file mode 100644
index fa3de48133b5..000000000000
--- a/app-text/calibre/calibre-1.39.ebuild
+++ /dev/null
@@ -1,217 +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.39.ebuild,v 1.2 2014/06/14 07:01:17 zmedico 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/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.40.ebuild b/app-text/calibre/calibre-1.40.ebuild
deleted file mode 100644
index 4e9a8e54eda2..000000000000
--- a/app-text/calibre/calibre-1.40.ebuild
+++ /dev/null
@@ -1,217 +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.40.ebuild,v 1.2 2014/06/14 07:01:17 zmedico 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/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.38.ebuild b/app-text/calibre/calibre-1.43.ebuild
index 434d2b14e9c3..822636abef5c 100644
--- a/app-text/calibre/calibre-1.38.ebuild
+++ b/app-text/calibre/calibre-1.43.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.38.ebuild,v 1.3 2014/06/14 07:01:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.43.ebuild,v 1.1 2014/07/08 14:29:24 axs Exp $
 
 EAPI=5