0.8.26 version bump and remove old.

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

3 files changed, 184 insertions, 5 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 988904fe7371..bf3f789b8759 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.167 2011/11/06 20:48:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.168 2011/11/12 17:24:16 zmedico Exp $
+
+*calibre-0.8.26 (12 Nov 2011)
+
+  12 Nov 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.8.26.ebuild:
+  0.8.26 version bump and remove old.
 
 *calibre-0.8.25 (06 Nov 2011)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 0e21136e5e0c..a29aa78a039f 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,15 +3,17 @@ Hash: SHA1
 
 DIST calibre-0.8.24.tar.gz 37687726 RMD160 28d4c3e200318fd4b24a9f9881777bb331fcc542 SHA1 367ba8617c682f135381d0d842744425aafd77bd SHA256 875ddcbccff4671b4e395d6692ca9950cdb2602029f1f1d458ff69e5ed0d10e8
 DIST calibre-0.8.25.tar.gz 37734837 RMD160 a286f18a7f6275cc448522f7ae393c557e7ede0b SHA1 2a9beef5544e7b7d211abb9d248a978a76af9376 SHA256 529ab5a9c404ea28f332562714f55d4e45a299930f00086f0e4e168571f048b1
+DIST calibre-0.8.26.tar.gz 37784724 RMD160 b1700bb3c395d51fd942893a8f25737a01ed7eb4 SHA1 0840c720935968d6349768a26239193d5b5a0720 SHA256 59e713e126ddb5739bfe33acf52581ccad944a9f05c3e1d3d0b3958b4762f91a
 DIST calibre-mount-helper-debian-20100617 413 RMD160 296ef6fec523a300e2b941a086d77d014bed8f94 SHA1 ae3f96b5eb7f831c24f6f7f8100c950edce68ee4 SHA256 1cdbd23edfea0b08f7bd089e3302ca9601737aac18537406f0408b449aea32d1
 EBUILD calibre-0.8.24-r1.ebuild 5767 RMD160 80de7ec14bb462814d055d2d106d7e17e4bdbb64 SHA1 97fc4abc96d20c7917cad455d97ca478a6d76489 SHA256 ece2db5769fecc4a467160c31d0b04d3c253641027521038b0f3be246d6e5c6b
 EBUILD calibre-0.8.25.ebuild 5476 RMD160 e1ad95cc46e5da380cd2d7043ae31922e337d5e7 SHA1 af56d6d037ee0e0cca48a2a2dc6b2b99f86b756b SHA256 7bea483549851ef01b28fc8eabb7c65df7cd236b3c07b791d99f3930234a1b1e
-MISC ChangeLog 27258 RMD160 305bbef72779b741c5558e097bb0d57ccd79504d SHA1 db72c621c053fd8819a3c2418316ef090e22b0ed SHA256 b44e44f66b96daa7133756e221885842d9c82e29c081ec1fe0182f50b05ff5e5
+EBUILD calibre-0.8.26.ebuild 5476 RMD160 9efe08b8cc9f3f11982bad314fcbdbe2748f7f77 SHA1 ccc7eae55e9f1e4ffe9b191e9e5f82e790f05569 SHA256 d0d19be33e3aa63aa10efeae542a25cdc40a7c6b90c879bb022b9e3c77dd6613
+MISC ChangeLog 27399 RMD160 efd9ee3444868700c32f30c06a690bf209c2a604 SHA1 e10eace536a0f4eb08b700c0bc511ac4c19c06d7 SHA256 ea9837ca8ba4d7ea1f10c93b121d11a046d183b24a9cd0f094456b0267d38a82
 MISC metadata.xml 208 RMD160 745680e46bfd88253fa371a757ae549c24cb4163 SHA1 875f477c578d5f232290883c8f3306facd9ebec4 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk628qQACgkQ/ejvha5XGaPJSwCeLoKhJHhxLrCZDp0c+yUhdziS
-7Q4An2JYk0cu0X/g1+M8rPJF0yXj+Gy4
-=MN9m
+iEYEARECAAYFAk6+q8cACgkQ/ejvha5XGaMRdACbBnH6rTU+Ja2wdPTvTT3ZMdOA
+aSUAn29zehjulu1DuSTuM5EvBKC3BVNL
+=KnAc
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.26.ebuild b/app-text/calibre/calibre-0.8.26.ebuild
new file mode 100644
index 000000000000..619c1843fb7a
--- /dev/null
+++ b/app-text/calibre/calibre-0.8.26.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.26.ebuild,v 1.1 2011/11/12 17:24:16 zmedico Exp $
+
+EAPI=4
+PYTHON_DEPEND=2:2.7
+PYTHON_USE_WITH=sqlite
+
+inherit python distutils eutils fdo-mime bash-completion-r1 multilib
+
+DESCRIPTION="Ebook management application."
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="0"
+
+IUSE=""
+
+COMMON_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:python-2
+	>=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.8.2[X,svg,webkit]
+	>=media-gfx/imagemagick-6.5.9
+	>=media-libs/libwmf-0.2.8
+	virtual/libusb:0
+	>=x11-misc/xdg-utils-1.0.2"
+
+RDEPEND="${COMMON_DEPEND}
+	>=dev-python/reportlab-2.1
+	sys-fs/udisks"
+
+DEPEND="${COMMON_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.7
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
+		-e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+		-e "s:xdg-icon-resource install:\\0 --mode user:" \
+		-e "s:xdg-mime install:\\0 --mode user:" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# 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 failed to patch install.py"
+
+	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}
+
+	# 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 #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# 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"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		distutils_src_install \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}"
+
+	grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
+		die "failed to fix harcoded \$D in paths"
+
+	# Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
+	# due to bug #389515 (instead, calibre now calls udisks via dbus).
+	rm "${ED}usr/bin/calibre-mount-helper" || die
+
+	find "${ED}"usr/share/calibre/man -type f -print0 | \
+		while read -r -d $'\0' ; do
+			if [[ ${REPLY} = *.[0-9]calibre.bz2 ]] ; then
+				newname=${REPLY%calibre.bz2}.bz2
+				mv "${REPLY}" "${newname}"
+				doman "${newname}"
+				rm -f "${newname}" || die "rm failed"
+			fi
+		done
+	rmdir "${ED}"usr/share/calibre/man/* || \
+		die "could not remove redundant man subdir(s)"
+	rmdir "${ED}"usr/share/calibre/man || \
+		die "could not remove redundant man dir"
+
+	# 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/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
+	rm -r "${ED}"usr/etc/bash_completion.d
+	find "${ED}"usr/etc -type d -empty -delete
+
+	python_convert_shebangs -r $(python_get_version) "${ED}"
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}