From d0caa7078a0aeb9cc615e17f992b5d7ff9d7f4ce Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 16 Aug 2011 11:12:39 +0000 Subject: 0.8.14 version bump. Package-Manager: portage-2.2.0_alpha51/cvs/Linux i686 --- app-text/calibre/ChangeLog | 10 +- app-text/calibre/Manifest | 12 +-- app-text/calibre/calibre-0.8.10.ebuild | 169 --------------------------------- app-text/calibre/calibre-0.8.14.ebuild | 169 +++++++++++++++++++++++++++++++++ 4 files changed, 184 insertions(+), 176 deletions(-) delete mode 100644 app-text/calibre/calibre-0.8.10.ebuild create mode 100644 app-text/calibre/calibre-0.8.14.ebuild (limited to 'app-text') diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index 406baafb9981..c034f2f18853 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,14 @@ # 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.157 2011/08/03 19:25:06 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.158 2011/08/16 11:12:39 zmedico Exp $ + +*calibre-0.8.14 (16 Aug 2011) + + 16 Aug 2011; Zac Medico +calibre-0.8.14.ebuild: + 0.8.14 version bump. + + 16 Aug 2011; Zac Medico -calibre-0.8.10.ebuild: + Remove old version. *calibre-0.8.12 (03 Aug 2011) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 160c056df8ce..1b53fe11d209 100644 --- a/app-text/calibre/Manifest +++ b/app-text/calibre/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST calibre-0.8.10.tar.gz 29345577 RMD160 820a45d5fdbd0dc25105b162a7c02172d359ccef SHA1 c0ae98d76a0fedd9d5397b97c3e84f1e519f4a9a SHA256 b1d76f826fa25963623e4d2702c7d42c1fe302a0d0ec7e69ec23adf76fa61f32 DIST calibre-0.8.12.tar.gz 29558765 RMD160 d20e129c75799315250ad40c9d5ec23e68679ed3 SHA1 d64b660640f80cfe9a23e5983b202d6eb235b103 SHA256 2994853b79d0d4399299c6da46947d0e35e7324c8f2a536f3260ec0e2673f418 -EBUILD calibre-0.8.10.ebuild 5381 RMD160 eea0061a685cfd4bcdd8627def66aa12ac2078f5 SHA1 871fb343e24f8d72eca2bd327188efe63a7bd0d4 SHA256 10e0ce773576a085f6e309ef4aeddc63454e8389d33b9298ebe689c65a4a331d +DIST calibre-0.8.14.tar.gz 29055568 RMD160 f1112537c65a73d9661e7db9e983928214e8641f SHA1 46de2de350e67c63c9338590a9e9b7b4274a5f16 SHA256 ec46f80512f66130dcdcdef5feaa6ca9d523d68283904cfa23eaa1908f457ea0 EBUILD calibre-0.8.12.ebuild 5381 RMD160 fa9814ddc578b35cda7ffcbb5d8ecb6088d4e948 SHA1 18143a8f49aa08b59da01b629f59f0a3fdf5b000 SHA256 6f3bf653b5ec506557260d30e4b4920640c6dd4bde8742c2f0d6e1c2e70d01cb -MISC ChangeLog 25228 RMD160 53f85a4f629bcfab23b1343d3e328d8ac267fe25 SHA1 b85e247fcde2f66cabaa5dd5bb96f7be3c4cd961 SHA256 1fac97befee061f70eda83f7737608a43940f7e717b242b3e2724715404af3c7 +EBUILD calibre-0.8.14.ebuild 5381 RMD160 1a8a799862671c1f5104936e784414ed539a2627 SHA1 3d60696e4d19654a2b7b194b97daf728737fa4ea SHA256 f356b458d81c6755c7e4aadb299ad9d926e9f9e63dd2a1cd7534a6a34bb54bdc +MISC ChangeLog 25448 RMD160 40125394f550464f05a66ce90b283c063ca6e2bc SHA1 3dca86074b98e7bb9272614a2043ee062ce504b3 SHA256 b4e5c9ec1cf84e4a1148d1ff8458fe437fa55d70f868c1c4d47fb12a4084ad72 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk45oJgACgkQ/ejvha5XGaPj5ACfbW1aIycEVs1qHSHGkVP+idwx -zwoAn34407Iu+LM03/ukvxlYRnMwyZ7W -=BXaT +iEYEARECAAYFAk5KUK4ACgkQ/ejvha5XGaOWHQCfVane8kG4HaOGZs79wesL3yeR +/dgAoLPJPt6R/6bXtRX8kUoF587kKYqn +=x3F6 -----END PGP SIGNATURE----- diff --git a/app-text/calibre/calibre-0.8.10.ebuild b/app-text/calibre/calibre-0.8.10.ebuild deleted file mode 100644 index 5672de63cd86..000000000000 --- a/app-text/calibre/calibre-0.8.10.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# 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.10.ebuild,v 1.1 2011/07/17 20:18:50 zmedico Exp $ - -EAPI=3 -PYTHON_DEPEND=2:2.7 -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://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" - -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 -} - -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 \ - --staging-root="${D}usr" \ - --staging-libdir="${D}usr/${libdir}" - - grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i || - die "failed to fix harcoded \$D in paths" - - 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" - - find "${D}"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}" || die "doman failed" - rm -f "${newname}" || die "rm failed" - fi - done - rmdir "${D}"usr/share/calibre/man/* || \ - die "could not remove redundant man subdir(s)" - rmdir "${D}"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/* "${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}"usr/etc/bash_completion.d/calibre - rm -r "${D}"usr/etc/bash_completion.d - find "${D}"usr/etc -type d -empty -delete - - python_convert_shebangs -r $(python_get_version) "${D}" -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - python_mod_optimize /usr/$(get_libdir)/${PN} - bash-completion_pkg_postinst -} - -pkg_postrm() { - python_mod_cleanup /usr/$(get_libdir)/${PN} -} diff --git a/app-text/calibre/calibre-0.8.14.ebuild b/app-text/calibre/calibre-0.8.14.ebuild new file mode 100644 index 000000000000..80e18acfe9a0 --- /dev/null +++ b/app-text/calibre/calibre-0.8.14.ebuild @@ -0,0 +1,169 @@ +# 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.14.ebuild,v 1.1 2011/08/16 11:12:39 zmedico Exp $ + +EAPI=3 +PYTHON_DEPEND=2:2.7 +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://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" + +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 +} + +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 \ + --staging-root="${D}usr" \ + --staging-libdir="${D}usr/${libdir}" + + grep -rlZ "${D}" "${D}" | xargs -0 sed -e "s:${D}:/:g" -i || + die "failed to fix harcoded \$D in paths" + + 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" + + find "${D}"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}" || die "doman failed" + rm -f "${newname}" || die "rm failed" + fi + done + rmdir "${D}"usr/share/calibre/man/* || \ + die "could not remove redundant man subdir(s)" + rmdir "${D}"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/* "${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}"usr/etc/bash_completion.d/calibre + rm -r "${D}"usr/etc/bash_completion.d + find "${D}"usr/etc -type d -empty -delete + + python_convert_shebangs -r $(python_get_version) "${D}" +} + +pkg_postinst() { + fdo-mime_desktop_database_update + fdo-mime_mime_database_update + python_mod_optimize /usr/$(get_libdir)/${PN} + bash-completion_pkg_postinst +} + +pkg_postrm() { + python_mod_cleanup /usr/$(get_libdir)/${PN} +} -- cgit v1.2.3-65-gdbad