0.6.25 version bump.

Package-Manager: portage-2.1.7.10/cvs/Linux i686

3 files changed, 142 insertions, 12 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index d93efd582d3d..2facec68e9fe 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.61 2009/11/19 07:42:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.62 2009/12/03 05:37:33 zmedico Exp $
+
+*calibre-0.6.25 (03 Dec 2009)
+
+  03 Dec 2009; Zac Medico <zmedico@gentoo.org> +calibre-0.6.25.ebuild:
+  0.6.25 version bump.
 
 *calibre-0.6.24 (19 Nov 2009)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index ecab4c368323..15d3e902b5c1 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST calibre-0.4.77.tar.bz2 4054837 RMD160 24c64276b2413ac8e0974f8f0caa535e8635df3c SHA1 30e39484987a606fb875c6b4afa8785fed0aa4b3 SHA256 4075d8d20713d2e5e299bc3ff51fd541474dff8576c9a6d12f4159c094d73dab
 DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c718d SHA1 f3241ce95fb590873427d9a9c0881f336b995aef SHA256 71caa8e0540879b851afc5b10a588279b559ee24f2f7375c10737eafd0b2f24e
 DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
@@ -8,6 +5,7 @@ DIST calibre-0.6.20.tar.gz 10769762 RMD160 dcbd6805fa8f84653d7b87e9dc5c717db5392
 DIST calibre-0.6.21.tar.gz 10904005 RMD160 7239a3f1ec503ef9b41e09daf74b0e4201245cd4 SHA1 5551735127437e48c9441e6297e31d6d904442bc SHA256 bd398a7026a8c744ec261a665f3eb3f963567943735ddb732e8708f07d857efe
 DIST calibre-0.6.23.tar.gz 10947634 RMD160 77f6465a058fdde68a46565d206f1f77bc3a92f2 SHA1 add0ef6c13f7ea89ce58e9bcc2052bce5af7c660 SHA256 de3ca34a236d289473e380c7b0546052bed011b56ae453c6876de53966ba6a6d
 DIST calibre-0.6.24.tar.gz 10953557 RMD160 a7833156b635bfd14842b055e3b44debe64e4752 SHA1 8484746cb058d7719225b02a843d29bd7626ffa0 SHA256 5b9c662ad737585b5f861d797d419d3d7f9370fea3cd66f27a7bb40b7f24493a
+DIST calibre-0.6.25.tar.gz 11043986 RMD160 e6c015f04128181c934f00334957c9275eaec771 SHA1 abf68483d1e244776776f24bbb5109f315247023 SHA256 49bcdc8a5f233a4a242bc0c9a1a05d211e6177fe3303fd2e963150876cdf0072
 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
@@ -15,12 +13,6 @@ EBUILD calibre-0.6.20.ebuild 4098 RMD160 a5b2b13b50722f26bf425f6d705c409323b1a9f
 EBUILD calibre-0.6.21.ebuild 4098 RMD160 2a7aae20595b33eca2904d966adaaaa3b3ffb796 SHA1 837514cb4260064486bc75de0b034cb579dc992f SHA256 02e542aa82c967709bfe92806caf4191fb25fa681664002c2db642e04ed4029a
 EBUILD calibre-0.6.23.ebuild 4098 RMD160 8d4067abc7ce731e116b4b87d5ae5e9b5c83e071 SHA1 3b8c2fb418974ed88c118196229129d9a7f3a822 SHA256 eb5af9414c9e7ac8373d934ffd060a2413c116b32bd75f1b88befe87d075d1e6
 EBUILD calibre-0.6.24.ebuild 4098 RMD160 b9c02a9af059fd16d726b08c133f352c092eaae6 SHA1 5ac1a846f0bad759d43cb797eda26b00f9fa0129 SHA256 ae19e0aa8ad96db54eec93891aae96671e2a8f516852461606f729c37f1e6d27
-MISC ChangeLog 9981 RMD160 4bdb7686552f32ff57ba6597777b029a488b5db4 SHA1 c566f8e0580f8625bf5621a3e9305c544d5e65c2 SHA256 8008088dbce66479e3520a16ca2ca8a64584b1a31dab330bb60b8ba55901c83a
+EBUILD calibre-0.6.25.ebuild 4096 RMD160 fcd6e6627cb08fdb6b77391ddb4fe3eddd1be6f7 SHA1 c1a40680a35b4d09f77f24348475c42111cb86c8 SHA256 bf8fbaa7d8d4785f89f4691ca2a25611023d4e3ae020fd3c1e1739656dfbe51a
+MISC ChangeLog 10107 RMD160 2c3d9973350b4eac4cbe5e8cd5ec653c7b2e01dc SHA1 72745d817ece6492bbcd360e3c7164dd62423758 SHA256 0ca146c2fa9eb158d66a2d17952320d5a8c8e1e400cc665e06f9f90ce9cb5e81
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksE9vgACgkQ/ejvha5XGaNo+QCeOWJBqOSm1wmnjS5ogUlG9gsn
-yKAAn0twxS74yBZhdXdLjBS7nPlb8F45
-=vGF1
------END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.6.25.ebuild b/app-text/calibre/calibre-0.6.25.ebuild
new file mode 100644
index 000000000000..4a450ab8fd74
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.25.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.25.ebuild,v 1.1 2009/12/03 05:37:33 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
+	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
+}