0.6.29 version bump.

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

3 files changed, 152 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 44635f194f5b..b7daa10a78f4 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.66 2009/12/18 02:55:12 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.67 2009/12/23 10:15:18 zmedico Exp $
+
+*calibre-0.6.29 (23 Dec 2009)
+
+  23 Dec 2009; Zac Medico <zmedico@gentoo.org> +calibre-0.6.29.ebuild:
+  0.6.29 version bump.
 
 *calibre-0.6.28 (18 Dec 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 9b4b9742feb2..ae20d042895b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,18 +7,20 @@ DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cd
 DIST calibre-0.6.24.tar.gz 10953557 RMD160 a7833156b635bfd14842b055e3b44debe64e4752 SHA1 8484746cb058d7719225b02a843d29bd7626ffa0 SHA256 5b9c662ad737585b5f861d797d419d3d7f9370fea3cd66f27a7bb40b7f24493a
 DIST calibre-0.6.26.tar.gz 10695063 RMD160 739e08d9838e86cf6b68b163d99aac9607b4657e SHA1 8b47c76efdee5ca8c2ff2d133fd3a767858dd79a SHA256 40deb46e4fc63a0a4cfa314aab5480dcaf5da18197f533323c9e673925beb17b
 DIST calibre-0.6.28.tar.gz 10490028 RMD160 dc0cc36f318b7a50e07496f0a611712632df795e SHA1 6b84883f08f001602f437e3128754999a709b27a SHA256 88d27915eb3d5a6d76756769896d7e3e0939a432e174bacecff6c41d7f57e92d
+DIST calibre-0.6.29.tar.gz 10511676 RMD160 145c59f44f9deb22bb8f056eb146826e210e28e0 SHA1 b3945d7d35bf9c4251b3b32001746df56ec75fd4 SHA256 75e75dea9d1337d4d0e6c2e27abf9366d2b9ee860e703347372f4216856f6acc
 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.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
 EBUILD calibre-0.6.24.ebuild 4098 RMD160 b9c02a9af059fd16d726b08c133f352c092eaae6 SHA1 5ac1a846f0bad759d43cb797eda26b00f9fa0129 SHA256 ae19e0aa8ad96db54eec93891aae96671e2a8f516852461606f729c37f1e6d27
 EBUILD calibre-0.6.26.ebuild 4372 RMD160 5eb2e52dee03af8f3e5b2f4097c89ef9da43042c SHA1 76c54eaf12faf5d602b5738bd9b67ea8473c373c SHA256 d8eb95add36b361f2ed1ee500cacbc401b261498e9dbc6d44b92e0a91f3e40f2
 EBUILD calibre-0.6.28.ebuild 4372 RMD160 cc9de92b95ca3278102df94dd24fdcf16db993af SHA1 9a257b58acd0c98b694126a87fa972d3aa0e4a6b SHA256 e618af262a5f04b7d4390af1901511fa6043c33d41df62c30878c2e82712af13
-MISC ChangeLog 10801 RMD160 35614bc2032d0385de7ab61eed844dc8177fe51c SHA1 fe2b744869220174342796ba1feff71c8e818d98 SHA256 ea47d53a09c56af44ffdaf7da1a077b79d14fbedd0a2914cc29b4abc6e7dfcd4
+EBUILD calibre-0.6.29.ebuild 4372 RMD160 0b13587bbe6a563a839c9e574688fdbd741d3754 SHA1 5cccc254b30aef8beee7237976a506ef69aa89a1 SHA256 0b3abd8fc3dfa8012e8c461f8a96f0eef285630d6dc54f73521e20485ba4c0e2
+MISC ChangeLog 10927 RMD160 d7a98393e8304cf464f1fa205bff4df6c5d10890 SHA1 3c97dc252ac79afa570b9b6b217800cc0b893e37 SHA256 05c9ebe97f21803ebc7b670446749e8626f1a23c2746a5b9ec265f2a9fbabac7
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksq7zcACgkQ/ejvha5XGaNqLQCgmFraeePWEv9fNpQrF6bcba7D
-49cAnRggd6cQFNw3ankf86ft/C4LrE+x
-=xSyw
+iEYEARECAAYFAksx7fQACgkQ/ejvha5XGaPomACeIIbBb8PEHR0ag7JOYgWwHw94
+AewAoOn4b5CAYRNb1Jaqj3yhmKPgmAc2
+=v+s3
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.29.ebuild b/app-text/calibre/calibre-0.6.29.ebuild
new file mode 100644
index 000000000000..d3a78b628f3b
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.29.ebuild
@@ -0,0 +1,140 @@
+# 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.29.ebuild,v 1.1 2009/12/23 10:15:18 zmedico Exp $
+
+EAPI=2
+NEED_PYTHON=2.6
+
+inherit python distutils eutils fdo-mime bash-completion
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://calibre-ebook.googlecode.com/files/$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
+
+	# Bug #295672 - Aavoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export XDG_CONFIG_HOME="$HOME/.config"
+	export CALIBRE_CONFIG_DIRECTORY="$XDG_CONFIG_HOME/calibre"
+	mkdir -p "$XDG_CONFIG_HOME" "$CALIBRE_CONFIG_DIRECTORY"
+
+	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
+}