0.6.14 version bump.

Package-Manager: portage-2.2_rc42_p14468/cvs/Linux i686

3 files changed, 137 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 64906738c00a..0a3058f76d32 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.47 2009/09/08 21:08:05 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.48 2009/10/01 02:19:34 zmedico Exp $
+
+*calibre-0.6.14 (01 Oct 2009)
+
+  01 Oct 2009; Zac Medico <zmedico@gentoo.org> +calibre-0.6.14.ebuild:
+  0.6.14 version bump. Pdf output seems to be broken in this release (at
+  least it doesn't work with pyPdf-1.12), so skip this update if you need to
+  convert to pdf format.
 
 *calibre-0.6.11 (08 Sep 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 103cdc0965c0..5449ba83a8ba 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,16 +5,18 @@ DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635d
 DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c718d SHA1 f3241ce95fb590873427d9a9c0881f336b995aef SHA256 71caa8e0540879b851afc5b10a588279b559ee24f2f7375c10737eafd0b2f24e
 DIST calibre-0.6.10.tar.gz 8732208 RMD160 fba70f63e0adb8a9b54be15a1a9426aebd16113a SHA1 2ca0bfbec0c6af204b1771606a4ff2e8734d4e18 SHA256 737c60a5ef3fe0a7d99d8925621863c9fe50ea562d949537031b720fbf4c3627
 DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
+DIST calibre-0.6.14.tar.gz 10399380 RMD160 aabc8728a360821f35eace0dc8528df3dc6570fd SHA1 6d1e45defc00feefd244b1fe32eb3a1124b5c929 SHA256 fab51417472a5ad5a603d3339e3c3b7b6106d5b18028ed8c070cf526991498f2
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
 EBUILD calibre-0.5.14-r1.ebuild 4260 RMD160 dc4d9465d99914e4336ba4b35cd8257435769f18 SHA1 438b4b4cc28a06a7f5bdbccc70862d6810c95904 SHA256 fcc6677b0a7047ce5f377d0cef1c8927e6c70dc87205542ab942f310f6bf8b4b
 EBUILD calibre-0.6.10.ebuild 4074 RMD160 847f0f754cc948d1ee333d9a32cb308a75dd5e6a SHA1 5e3583fef0460be34784cd9e058dd8dbfaba6c85 SHA256 6ed00ab6f8bd026c88f36c25d417dbca9b8b247e560f1cc955c277861cc4a6af
 EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
-MISC ChangeLog 7704 RMD160 99fe148e33a87d95ee41e4d678f14ac890882493 SHA1 90ba616c5b8256c620bff9b89ea497be45f768c2 SHA256 7a8538b93e10e78edfff70f452bb9e15ef05fac8f892f8dc7e5c99910771c4cb
+EBUILD calibre-0.6.14.ebuild 3950 RMD160 9bb207202fa222d89acd4dfdc75daee7b0321098 SHA1 05fee285e0b643ef2e47cde047f6ba476f5514a3 SHA256 695679223c3b218336287588ebb3befa8a897a385de82557c20784a51d1a4995
+MISC ChangeLog 7982 RMD160 9701d4ebe568d4c12db33cb75e8f896d65665137 SHA1 0097fb9e8a2ec28de907ff1aec9f7795b60de580 SHA256 ab64835b56667be0ac445103ab8d45b79545e18dac7e168982a0829df808153d
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqmx7oACgkQ/ejvha5XGaOKHwCg553g8RD43DGSslkoyq1+ScC8
-/swAn1GX3dIXNBStV+G63l+zKSOi2jpA
-=udOA
+iEYEARECAAYFAkrEEcQACgkQ/ejvha5XGaOH2gCgrEe9BDdakvySSU+duiYs6udY
+HdEAoNWSjbA/byS4ZGr6QnnVQLyll19S
+=4pEQ
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.14.ebuild b/app-text/calibre/calibre-0.6.14.ebuild
new file mode 100644
index 000000000000..7cb7dec5ff47
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.14.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.6.14.ebuild,v 1.1 2009/10/01 02:19:34 zmedico Exp $
+
+EAPI=2
+NEED_PYTHON=2.6
+
+inherit python distutils eutils fdo-mime bash-completion
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre.kovidgoyal.net"
+SRC_URI="http://calibre.kovidgoyal.net/downloads/$P.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE=""
+
+# libusb-compat is untested
+SHARED_DEPEND=">=dev-lang/python-2.6[sqlite]
+	>=dev-python/setuptools-0.6_rc5
+	>=dev-python/imaging-1.1.6
+	dev-libs/libusb:0
+	>=dev-python/PyQt4-4.5[X,svg,webkit]
+	>=dev-python/mechanize-0.1.11
+	>=media-gfx/imagemagick-6.3.5
+	>=x11-misc/xdg-utils-1.0.2
+	>=dev-python/dbus-python-0.82.2
+	>=dev-python/lxml-2.1.5
+	>=dev-python/python-dateutil-1.4.1
+	>=dev-python/beautifulsoup-3.0.5
+	>=dev-python/dnspython-1.6.0
+	>=sys-apps/help2man-1.36.4
+	>=dev-python/pyPdf-1.12
+	|| ( app-text/podofo >=app-text/pdftk-1.12 )
+	>=dev-python/cherrypy-3.0.2-r1
+	>=dev-python/cssutils-0.9.6_alpha4
+	>=dev-python/odfpy-0.7"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1"
+
+DEPEND="$SHARED_DEPEND
+	dev-python/setuptools
+	>=gnome-base/librsvg-2.0.0
+	>=x11-misc/xdg-utils-1.0.2-r2
+	sys-apps/help2man"
+
+S=$WORKDIR/$PN
+
+src_prepare() {
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s:'xdg-desktop-menu', 'install':'xdg-desktop-menu', 'install', '--mode', 'user':" \
+		-e "s:xdg-icon-resource install:xdg-icon-resource install --mode user:" \
+		-e "s:xdg-mime install:xdg-mime install --mode user:" \
+		-e "s:old_udev = '/etc:old_udev = '${D}etc:" \
+		-i src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
+	distutils_src_prepare
+}
+
+src_install() {
+	# --bindir and --sharedir don't seem to work.
+	# Pass them in anyway so we'll know when they are fixed.
+	PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		distutils_src_install --bindir="${D}usr/bin" --sharedir="${D}usr/share"
+
+	grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+	sed -e "s:/usr/lib/calibre:$(python_get_sitedir):g" -i "${D}bin/"* ||
+		die "Failed to fix hardcoded /usr/lib/calibre paths"
+
+	# This code should fail once --bindir and --sharedir are fixed.
+	dodir /usr/bin
+	mv "${D}bin/"* "${D}usr/bin/" ||
+		die "failed to move bin dir"
+	find "${D}"bin -type d -empty -delete
+
+	dodir /usr/share
+	mv "${D}share/"* "${D}usr/share/" ||
+		die "failed to move share dir"
+	find "${D}"share -type d -empty -delete
+
+	dodir $(python_get_sitedir)
+	mv "${D}lib/calibre/"* "${D}$(python_get_sitedir)"/ ||
+		die "failed to move python modules"
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	mv "$HOME"/.local/share/mime/packages/* "$D"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "$HOME"/.local/share/icons/* "$D"usr/share/icons/ ||
+		die "failed to install icon files"
+	domenu "$HOME"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	dobashcompletion "$D"etc/bash_completion.d/calibre
+	rm -r "${D}"etc/bash_completion.d
+	find "${D}"etc -type d -empty -delete
+
+	# Removing junk.
+	# Bundled python modules:     Module       | Package
+	#                             ----------------------------
+	#                             cherrypy     | cherrypy
+	#                             cssutils     | cssutils
+	#                             encutils     | cssutils
+	#                             odf          | odfpy
+	#                             pyPdf        | pyPdf
+	rm -r "${D}$(python_get_sitedir)/"{cherrypy,cssutils,encutils,odf,pyPdf}
+
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}