0.7.33 version bump.

Package-Manager: portage-2.2.0_alpha8_p2/cvs/Linux i686

3 files changed, 168 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 08360253c763..0e2ccc7681a4 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.117 2010/12/06 06:30:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.118 2010/12/14 05:22:39 zmedico Exp $
+
+*calibre-0.7.33 (14 Dec 2010)
+
+  14 Dec 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.33.ebuild:
+  0.7.33 version bump.
 
 *calibre-0.7.32 (06 Dec 2010)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 88fae06e126b..212592a61bdc 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,16 +5,18 @@ DIST calibre-0.6.55.tar.gz 13029109 RMD160 71747b0cbcf12c78168339fbbe0f77998d3c9
 DIST calibre-0.7.29.tar.gz 18705589 RMD160 cfcd11c2023116ae2b8ae93465fde25dcde14ce2 SHA1 f8424e5c44e60dfaa49cbbba0124c5c77ef8fb91 SHA256 319cc598282f1a615a55f293aa632f8e89fa6c9efd82d5dcc3099e5bc3e7ce78
 DIST calibre-0.7.31.tar.gz 18825441 RMD160 76239a00d7597d0790e4552db9d5fc9305160564 SHA1 4985ade1b720d9ee0650750e0ce35a431d9686e5 SHA256 a1e684e3a12c9ca56f213ccf855398b18c6d439d403940ce30c392864534f803
 DIST calibre-0.7.32.tar.gz 18908633 RMD160 83662ecbf2204b6bb6037ee5835a2272c99baa8f SHA1 61355b14ce18a5c13e2606bc418ed3f1537a23d3 SHA256 607a56440d71b3e296c675c856250d8c621316dc1059183e55a00e8957c339ca
+DIST calibre-0.7.33.tar.gz 18932536 RMD160 2032f7d00baa6335a7c92f2f90a136ab66df2c90 SHA1 5302e362daa93a751a1be40153d95ed944e5a533 SHA256 c5fe1ad730da2e46769eb297890e993f3bf7ee234128c0a8b8faa3cc843c7ea7
 EBUILD calibre-0.6.55.ebuild 4532 RMD160 7413eb37657f2d4b8e9a37a9f1349ada34b38b0b SHA1 2186cf63df6b0d80a47e31b33245c41b903fa71e SHA256 0f852e192347cd4b4cf3f16e303f48feeb07155631b993e72011c224ef62e1fd
 EBUILD calibre-0.7.29.ebuild 4860 RMD160 f9ef13feae6bf2feed4ea35c499138e2cfada74f SHA1 95df08e78121f094633b1b71a47071452c693b2c SHA256 fea7d3ecc965293bd1b1702bb6c5da52b1dcfa64d2430ccea7ac81c8cc447ffb
 EBUILD calibre-0.7.31.ebuild 4860 RMD160 461eae391534f9e9f0c31d254d329d676a7be6e4 SHA1 592685c90389c19b47628c61001679e3f0da77c5 SHA256 70fcf323b8edf31212ee14bd3b7d365e6692ae47873daec2a96abbf30469bb66
 EBUILD calibre-0.7.32.ebuild 4860 RMD160 d7768c2380b0348c976328bebf2229784df0a87e SHA1 6321147da56416f6048d126b993dc2951d42cc93 SHA256 81055d65ec4c520088eaba36f4ec265396f96495123207ded3c2631a5e52b9d1
-MISC ChangeLog 18596 RMD160 c9f4ff1b9a728e9471bcd92b40170c93626899c9 SHA1 4106edc3b5de8e22b3d33d97d1190d4b92bcbdda SHA256 2f25db43cbeb912684351931c699164022f99c6b6701a65c218e04d5c892f779
+EBUILD calibre-0.7.33.ebuild 4880 RMD160 7a5e0f3d75194b1ea7902bd7faea4613c4783975 SHA1 2ae77175f0a2d528bbca1201ab3cb11febd1a9bc SHA256 6caefd8013a59f12adf6c63d7975d80dc8080ced038854f287f69e4132321000
+MISC ChangeLog 18722 RMD160 df2466ef3688e499db4b795f6151f7e0a86bd3e6 SHA1 e25e2b1b530d1200848ef0177a8ddcdad413dc4a SHA256 a5190c934a3283faa5715b2ffeb183a2ab164906d1af71cafbcdea979e3b89d1
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkz8gxIACgkQ/ejvha5XGaP0GACfVccM1HcSMTAayNztMWJ4N7x6
-BAsAoNJlGN4TycGO56l1arayb7YtRvBR
-=Exma
+iEYEARECAAYFAk0G/xkACgkQ/ejvha5XGaMUFwCfUqngTFcD1gJJ5uE6a/6aAVT4
+GOAAoMUULr2Gjxfxn3+iMOy0kC2Xpy1M
+=U8CH
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.7.33.ebuild b/app-text/calibre/calibre-0.7.33.ebuild
new file mode 100644
index 000000000000..b164113a04c5
--- /dev/null
+++ b/app-text/calibre/calibre-0.7.33.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.33.ebuild,v 1.1 2010/12/14 05:22:39 zmedico Exp $
+
+EAPI=3
+PYTHON_DEPEND=2:2.6
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion multilib
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://calibre-ebook.com/downloads/$P.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE=""
+
+SHARED_DEPEND="
+	>=app-text/podofo-0.8.2
+	>=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
+	>=dev-libs/chmlib-0.40
+	>=dev-libs/icu-4.4
+	>=dev-python/beautifulsoup-3.0.5
+	>=dev-python/dnspython-1.6.0
+	>=dev-python/cssutils-0.9.7_alpha3
+	>=dev-python/dbus-python-0.82.2
+	>=dev-python/imaging-1.1.6
+	>=dev-python/lxml-2.2.1
+	>=dev-python/mechanize-0.1.11
+	>=dev-python/python-dateutil-1.4.1
+	>=dev-python/PyQt4-4.7[X,svg,webkit]
+	|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
+	>=media-libs/libwmf-0.2.8
+	>=sys-apps/help2man-1.36.4
+	virtual/libusb:0
+	>=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="$SHARED_DEPEND
+	>=dev-python/reportlab-2.1"
+
+DEPEND="$SHARED_DEPEND
+	>=dev-python/setuptools-0.6_rc5
+	>=gnome-base/librsvg-2.0.0
+	>=x11-misc/xdg-utils-1.0.2-r2"
+
+S=$WORKDIR/$PN
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+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:" \
+		-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
+
+	# 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"
+
+	# Bug #334243 - respect LDFLAGS when building calibre-mount-helper
+	export OVERRIDE_CFLAGS="$CFLAGS $LDFLAGS"
+
+	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.
+	local libdir=$(get_libdir)
+	dodir /usr/$libdir
+	mv "${D}lib/calibre" "${D}usr/$libdir/" ||
+		die "failed to move libdir"
+	find "${D}"lib -type d -empty -delete
+	grep -rlZ "/usr/lib/calibre" "${D}" | \
+		xargs -0 sed -e "s:/usr/lib/calibre:/usr/$libdir/calibre:g" -i ||
+		die "failed to fix harcoded libdir paths"
+
+	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
+
+	python_convert_shebangs -r 2 "$D"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+}