From fd74551238bd955c5e9f97d9335d4476b22ae470 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 5 Dec 2011 18:49:21 +0000 Subject: 0.8.29 version bump and remove old. Package-Manager: portage-2.2.0_alpha79_p22/cvs/Linux i686 --- app-text/calibre/ChangeLog | 8 +- app-text/calibre/Manifest | 12 +-- app-text/calibre/calibre-0.8.27.ebuild | 172 --------------------------------- app-text/calibre/calibre-0.8.29.ebuild | 172 +++++++++++++++++++++++++++++++++ 4 files changed, 185 insertions(+), 179 deletions(-) delete mode 100644 app-text/calibre/calibre-0.8.27.ebuild create mode 100644 app-text/calibre/calibre-0.8.29.ebuild (limited to 'app-text') diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index d1b10f3d7972..8d7958d19532 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,12 @@ # 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.172 2011/11/25 16:43:10 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.173 2011/12/05 18:49:21 zmedico Exp $ + +*calibre-0.8.29 (05 Dec 2011) + + 05 Dec 2011; Zac Medico +calibre-0.8.29.ebuild, + -calibre-0.8.27.ebuild: + 0.8.29 version bump and remove old. *calibre-0.8.28 (25 Nov 2011) diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 1731abc42d5a..449e0960fee8 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.27.tar.gz 37872270 RMD160 b3bd6b0fae2fbd5c8a445cbe359553f6d958e234 SHA1 378b656c68e3776dcbf95c7db93b6e71cd6fb229 SHA256 deb44cdacb7a1a671b302b1f5949735a6224cd1fb8295dbeb92c060051f7a06f DIST calibre-0.8.28.tar.gz 37964835 RMD160 712440222f16a4b3d76a604879c5347a7d08c64b SHA1 bd5d10fdb5cdab3bb529b394d9a125d7a9ee32f4 SHA256 4074ef490fa4f01904112accb60d6c7eb94aa6f2cc50309f37fd9c67e5276386 -EBUILD calibre-0.8.27.ebuild 5495 RMD160 2a2286d2ce02d55d4522ae840afaa3a511ec5b18 SHA1 25568685951dd8e7610c803820d03fed1d195754 SHA256 eeeaec1c766d42fa64ccf830cfb8a9f2fecffed33df715752133ea9c7631e17b +DIST calibre-0.8.29.tar.gz 38118963 RMD160 ae0e4f1a3d1b3e0230a939028e6f20d86ea136f6 SHA1 c211880d2c7e7bc9113be5e94dad24b33d5bfb5e SHA256 e41cb49da4251097a1b4d4a6b62ac192c4753bad96d127632774f034254ac580 EBUILD calibre-0.8.28.ebuild 5495 RMD160 86fcf4a0305f0516b8444d4a86e1fee6d508bfc7 SHA1 167d17f2cb4380f0d760c9a98a0843d26867513e SHA256 cb929ab50ef5d22e62d2ebb96e78f27d436ed5e47fdbffc29a63dc3b054cf6db -MISC ChangeLog 27995 RMD160 c5478bc3c259c3973b78dfc7d6ac4322e1a9f2a9 SHA1 91562e7ba2b5bcf6b2a1c6ccc683c3908e49f95a SHA256 6e6883a7c871a6baa78041681656d7fe6d5353a0e2ac84b9d21d31c4b31858e1 +EBUILD calibre-0.8.29.ebuild 5495 RMD160 0a5c8ac2a4ba3ee2fdb3fe4809a985f228f49f7b SHA1 c667f631fd3b8cc2d68e14d49e5f6248955c9cb2 SHA256 4249f6e4776570deddb57e3e330dfe5c0e3a9c7a97ef58e244c54a9426abadfc +MISC ChangeLog 28162 RMD160 ac9ef3e44008daabf3b5ac6df49d37a2bd40f6eb SHA1 ec1ce9dfaa9a5b9bb281284d4f6bb61f3b154c1a SHA256 7fd9e15739b25f63298bfe7b30df6f5ddde4e93db7fb826ae68ed7cfb4e7fa6f MISC metadata.xml 340 RMD160 87b372ab564a33c6eb65bc2656e39cafe431ee97 SHA1 3b79f0e21800238651f138d5e1f7101bb80c8f5a SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7PxaQACgkQ/ejvha5XGaPoFwCg1pC2d37jAWm58B2DM9FmLJbv -6a0AoOEmn/C1GZMepYmUtTv58yfu0oZF -=22j+ +iEYEARECAAYFAk7dEjcACgkQ/ejvha5XGaNmtwCfaFVvUzKiVIjVvsZXxAzx58Hn +T20AmgNlNdGGnkcTWviv1mpUmhGIJOYK +=2OiM -----END PGP SIGNATURE----- diff --git a/app-text/calibre/calibre-0.8.27.ebuild b/app-text/calibre/calibre-0.8.27.ebuild deleted file mode 100644 index e43cc6baaaff..000000000000 --- a/app-text/calibre/calibre-0.8.27.ebuild +++ /dev/null @@ -1,172 +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.27.ebuild,v 1.1 2011/11/20 06:17:49 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="+udisks" - -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 - udisks? ( 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} -} diff --git a/app-text/calibre/calibre-0.8.29.ebuild b/app-text/calibre/calibre-0.8.29.ebuild new file mode 100644 index 000000000000..cfc6991918fc --- /dev/null +++ b/app-text/calibre/calibre-0.8.29.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.29.ebuild,v 1.1 2011/12/05 18:49:21 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="+udisks" + +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 + udisks? ( 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} +} -- cgit v1.2.3-65-gdbad