0.6.19 version bump.

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

3 files changed, 145 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 4f8489ca2f70..3d65ff7cdbca 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # 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.55 2009/10/14 05:49:11 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.56 2009/10/23 03:04:31 zmedico Exp $
+
+*calibre-0.6.19 (23 Oct 2009)
+
+  23 Oct 2009; Zac Medico <zmedico@gentoo.org> +calibre-0.6.19.ebuild:
+  0.6.19 version bump.
 
 *calibre-0.6.17 (14 Oct 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 2b8411bce146..c919a1814773 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,18 +7,20 @@ DIST calibre-0.6.10.tar.gz 8732208 RMD160 fba70f63e0adb8a9b54be15a1a9426aebd1611
 DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
 DIST calibre-0.6.16.tar.gz 10407623 RMD160 de9f0505c67c857eb46ee3d1cd2b22de59118dee SHA1 cf547413f396e938dc608a9044d674a3566c614b SHA256 e7980051237c49c059d392e3858247762d2a655ba579204c4cd38f76aee54644
 DIST calibre-0.6.17.tar.gz 10514520 RMD160 8c909fdb9bac7335c9f61cfd81f8540fc319dc7e SHA1 7ebfa4e5ddce1445377ef8074ed00bebc377e952 SHA256 696215c12c228c3c399f6fcf483dad4c4d73c2355cb79b673e580d2abc5a3712
+DIST calibre-0.6.19.tar.gz 10472722 RMD160 6439bbae71e032b55953f754964a54bf93110659 SHA1 8ad8deaa6855a6f3e1246f6b1c91c55ad2bcd3f6 SHA256 919fd116d4bdf0daf7d7f70e81159f067466bcb3770b0fb78fd8f76daa339e57
 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
 EBUILD calibre-0.6.16-r1.ebuild 4058 RMD160 de2c737de1d42978f7629d15eae84e86cc8c2fe9 SHA1 c00f42cdf24f99d38b2fb26dd694eab006441ad1 SHA256 2df605da145d5d39ceea8d41452efcf5a72f531b34c7dde142e685b47e7dc346
 EBUILD calibre-0.6.17.ebuild 4098 RMD160 37f64272c64a95f803a1516224bbcda0d592e073 SHA1 bb36a2fe3af1931cf7241561c846b63fb13b73ed SHA256 3b4b6af07c93bf81fa043bef5bc03a69f8c437d7ea5cca0985160d7c7131c4bd
-MISC ChangeLog 9179 RMD160 f2df622f79aa6fb35a1ff2a0057ba1a244710b00 SHA1 2da2824a2ff2e15b61ac0b61ab3456fcbd8586b2 SHA256 b8646f8e037e61d376fc7108c1c2dec4f410f94132f771d404e2870ba39f2781
+EBUILD calibre-0.6.19.ebuild 4098 RMD160 35cb9b81123dd42be87df2a23a3c95c55d22ac68 SHA1 250d211441cd8f9b40e20abf71fb96ec008f1cd7 SHA256 7307e6669a8583b6cd450e79d2e179ca831f5291b0d6d62ebd39c27c47634ed5
+MISC ChangeLog 9305 RMD160 852a30c92981603d2d55d6d17c12f5d6f7e19b66 SHA1 a5df184b1f99464349da14c96c0c0535dc1f8579 SHA256 b97bf5b751776551d9540f5f95967e5ea073d34edaeb749bc9e4b878f666bf0e
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrVZlYACgkQ/ejvha5XGaMwogCfVc+jL6nbuQXhq2QknyO4455s
-CLgAoKF8LgazOfspSnPWhzCc9IXSBYnm
-=NDB9
+iEYEARECAAYFAkrhHVoACgkQ/ejvha5XGaOrcACgq3MSlu7obSLY6yI18F/OvUUd
+LCMAnjX5PJiZoXv8Z4NXGv6OzsPYYjXW
+=0D1S
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.19.ebuild b/app-text/calibre/calibre-0.6.19.ebuild
new file mode 100644
index 000000000000..0c540769a3de
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.19.ebuild
@@ -0,0 +1,133 @@
+# 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.19.ebuild,v 1.1 2009/10/23 03:04:31 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.1.12: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
+	>=virtual/poppler-0.12.0
+	>=sys-apps/help2man-1.36.4
+	app-text/podofo"
+
+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"
+
+	# 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'ing in the IMAGE path failed"
+
+	distutils_src_prepare
+}
+
+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}
+
+	# --bindir and --sharedir don't seem to work.
+	# Pass them in anyway so we'll know when they are fixed.
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+	PATH=${T}:${PATH} 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"
+
+	# Python modules are no longer installed in
+	# site-packages, so remove empty dirs.
+	find "${D}$(python_get_libdir)" -type d -empty -delete
+
+	# This code may fail if behavior of --root, --bindir or
+	# --sharedir changes in the future.
+	dodir /usr/lib
+	mv "${D}lib/calibre" "${D}usr/lib/" ||
+		die "failed to move lib dir"
+	find "${D}"lib -type d -empty -delete
+
+	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
+
+	# 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/* "$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
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}