0.7.28 version bump.

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

3 files changed, 167 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index bf7a4fed59db..b36e7ee929b9 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.112 2010/11/09 03:34:42 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.113 2010/11/13 04:43:20 zmedico Exp $
+
+*calibre-0.7.28 (13 Nov 2010)
+
+  13 Nov 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.28.ebuild:
+  0.7.28 version bump.
 
 *calibre-0.7.27 (09 Nov 2010)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 77634150e961..674f34b0742f 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.25.tar.gz 17919262 RMD160 668be340fb7c9285437343108144079ed49ff346 SHA1 fd5de8c94b0618130f5667f49e17ec6032d2a310 SHA256 c615cbb248d64df874be0a69dbb1bfa5ca032706d90d0de060c7c57cfdaa8486
 DIST calibre-0.7.26.tar.gz 17936949 RMD160 3b6956b6a9367587b84e86c6d09bd90b49e949be SHA1 95a15b262203ba2be267b7bc7ad49c2ca18e3862 SHA256 86ea528594f560bcd8bfc52281ba83a22d337a8db0551e6f3fd518da69bb21d0
 DIST calibre-0.7.27.tar.gz 18019601 RMD160 5327af3a80c0c22167561aaa223e8d9b6437cf96 SHA1 24d4903ac572650477d71d9ce80b0cd6a6bbee68 SHA256 b5da45261036d55db1f6cd84098ca0893e565e6ab0001206ec2c4a9b7d4d7f46
+DIST calibre-0.7.28.tar.gz 18392586 RMD160 745165a8286d16322e6f2727d533843101d5ad0c SHA1 2c6a1134adb478843dd652a7b208b85c99233cfb SHA256 1e28ddd1c099c873c7a90687d8a37076eed8757481ca94df4f30383a8f45f4b5
 EBUILD calibre-0.6.55.ebuild 4532 RMD160 7413eb37657f2d4b8e9a37a9f1349ada34b38b0b SHA1 2186cf63df6b0d80a47e31b33245c41b903fa71e SHA256 0f852e192347cd4b4cf3f16e303f48feeb07155631b993e72011c224ef62e1fd
 EBUILD calibre-0.7.25.ebuild 4663 RMD160 2eb1fea7d81343c1a05e943c5c5a1eb2f9fe85d8 SHA1 d86602d4caaabf09fbc14567240db58a98b5255b SHA256 57d09c557e7ee2e9387b24237b185e51d3a6da83b0437c853ad742ab6f133c0f
 EBUILD calibre-0.7.26.ebuild 4860 RMD160 20ff31dbb8f0d2d6b28dae64ee799da8ec8410d1 SHA1 5ea254fe17c4f245d1649b84f273e505ce642dba SHA256 dd5f0a30fa745cfbcac57ac3d410beb20f5c4b48f6a89606dc46f36f41a81911
 EBUILD calibre-0.7.27.ebuild 4860 RMD160 669571480fd9769f6b950e78c8f39c974ccf3115 SHA1 28bc326526d9c63d517a7c5e1046de7eb9ab3ff0 SHA256 b68ccbf5e46519a8a9cd99cc9117121ee87569290af1b5a862897438eee70695
-MISC ChangeLog 17850 RMD160 ec650f87040b89dfdbc6f4e10e6cd6011e2df4d4 SHA1 7e70a03a762a385fa19dae33b1b554801b8ef8ab SHA256 d5d01d4c59c5cb4ced754b0a827e81a5af3aef91296947b81e5ce84f91bb9a7e
+EBUILD calibre-0.7.28.ebuild 4860 RMD160 1db67c18d3d3a4fc6068eb74bbde469a4f540ae0 SHA1 ee164afce516c53f041b7c997fa7c9b396dcefc2 SHA256 55f04294b967feffa3a238fe8162720bf81b34bb000a028cf0ec603c68d27ca6
+MISC ChangeLog 17976 RMD160 36235edeeafc59edfa45c7016873f39fe13ce9bf SHA1 cf52dbca1dd8947191a87f08e4801b36455917b0 SHA256 417aabb4ce90beb1a10f5cf044613df2671675c393c29fcbe093aebc59ec7bdb
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzYwVoACgkQ/ejvha5XGaO5JQCdEDrWCbMbdMsCgIr0Nu11oXoC
-+1AAnRTPuKmU5Y361ZgwVryP+4UX6Pey
-=EFX4
+iEYEARECAAYFAkzeF3kACgkQ/ejvha5XGaOgawCgh1JQzCPFqhKemRlZ1sDBYhAV
+QJUAoJFpwWe1htSuuiCbI4n9rGc/JYnd
+=m+vj
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.7.28.ebuild b/app-text/calibre/calibre-0.7.28.ebuild
new file mode 100644
index 000000000000..27b165d58446
--- /dev/null
+++ b/app-text/calibre/calibre-0.7.28.ebuild
@@ -0,0 +1,155 @@
+# 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.28.ebuild,v 1.1 2010/11/13 04:43:20 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-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
+}