diff options
| -rw-r--r-- | app-text/calibre/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/calibre/Manifest | 10 | ||||
| -rw-r--r-- | app-text/calibre/calibre-0.7.17.ebuild | 151 |
3 files changed, 164 insertions, 5 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index 6361e97a991d..0651a8e3df33 100644 --- a/app-text/calibre/ChangeLog +++ b/app-text/calibre/ChangeLog @@ -1,6 +1,12 @@ # 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.99 2010/08/30 01:37:34 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.100 2010/09/07 01:26:54 zmedico Exp $ + +*calibre-0.7.17 (07 Sep 2010) + + 07 Sep 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.17.ebuild: + 0.7.17 version bump. This should also fix bug #336287 (sandbox violation + from xdg-icon-resource in XDG_DATA_HOME). 30 Aug 2010; Zac Medico <zmedico@gentoo.org> -calibre-0.7.2.ebuild, -calibre-0.7.3.ebuild, -calibre-0.7.4.ebuild, -calibre-0.7.5.ebuild, diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index ac9edbe0f591..cf619af9d760 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.12.tar.gz 14940946 RMD160 076e42f900e27661c20f69a2a5d0751f213ce9ed SHA1 997ccfb20ba9d478a33fd9926527bf9f0351956d SHA256 8f5a2edf099a7a2fc1b7bca94837aa39adfac6d6717ea24ad400cd38ebf16bc5 DIST calibre-0.7.13.tar.gz 15065746 RMD160 08091d4abdf4ca82e3600738c9576efb076bd91b SHA1 f5e069566ead27655833d3efb6d234f50be176c3 SHA256 20ad2927afcd7048910370096cfab6dbe6f0c3f7019a26ee04a46dc7eae98307 DIST calibre-0.7.16.tar.gz 15515129 RMD160 3c8739dec84fc5c01adb52dbfb12c2ef9c5d7e08 SHA1 c63c55f1b2991991fc98a3e5f0d610a836768522 SHA256 54019a96733313f78bc8b31cce0db36256ff272d4862e1dac455d891ee9c8e11 +DIST calibre-0.7.17.tar.gz 15586988 RMD160 6648621cbed11afbf55760649cd8178bac70c412 SHA1 45c176c9a69c89d666c69826985ddd180ffaa778 SHA256 dec609ff55d95a57b99bbee9065d60fa202a0783e784dc8031b6228a5b60b237 EBUILD calibre-0.6.55.ebuild 4532 RMD160 7413eb37657f2d4b8e9a37a9f1349ada34b38b0b SHA1 2186cf63df6b0d80a47e31b33245c41b903fa71e SHA256 0f852e192347cd4b4cf3f16e303f48feeb07155631b993e72011c224ef62e1fd EBUILD calibre-0.7.12.ebuild 4826 RMD160 8a329c888130e380b4345d1aa61e7e605ca3053b SHA1 c1fbdfb32b2e629ab28bbeb0adb14270d09e076d SHA256 f4e59a77d74a337cf61af6825783087f25c7d826e9cfde5dd49fdc0f448ef74e EBUILD calibre-0.7.13.ebuild 4826 RMD160 4a5a36069a1496b081264a185471fac59e7ca849 SHA1 284600936ac1f5a92f1b6dbdc9cc3d4d442cfba6 SHA256 4124da52eb8a55822bf3756e40f2a6afc8d955c5ee5e28251338240471f0b619 EBUILD calibre-0.7.16.ebuild 4587 RMD160 d0b02d3c85a81abbb245a2871520f7d4a97c9294 SHA1 4f08997dafa85a6dd3ab87d0c789793dba03a9e6 SHA256 e2d79256f7899e757fe42b8b680f4b393f3128129aefdcf739d4df5cb03f18cf -MISC ChangeLog 15758 RMD160 90d1c31d09b036e2b8b8707fc51fc753e8653086 SHA1 4ccf2ae63fc08c3bad4f0758893fa9e5b5b5f198 SHA256 1cdb28fd75eeac5600a962b64313c10600bd6d07c1157c84f43f821cc59a37c3 +EBUILD calibre-0.7.17.ebuild 4661 RMD160 2597c4006c1f2626d44a99eb39df6dfe2bb82f04 SHA1 764e2039ac282968737f40a72959de44cb310389 SHA256 9f7535897b4aafd13f558cbb9a10ed0c43a0b03d44b969ff89d85f1197be8260 +MISC ChangeLog 15981 RMD160 5124aafe508430239ddcbb9890afe89eb28a8fb1 SHA1 484138481ae6ee23868c035d6363db6ce550e4c7 SHA256 d4df6428a54cc948cafd66e9744abc48ccdbeecb2e2610f18062b54dc2a14d8e MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkx7CvwACgkQ/ejvha5XGaPjNgCgi0fMprByohggr/pnjKiWd0A+ -EFcAoIJ84Tq53fuw8N7PuJzi9oQC1zDN -=iolm +iEYEARECAAYFAkyFlO0ACgkQ/ejvha5XGaObXwCfcLj+NF+yIPgaZrdqBTi5i+zb +jh0AoJ7mvMgMAu0/3NsAHogntg/YCPen +=w1F+ -----END PGP SIGNATURE----- diff --git a/app-text/calibre/calibre-0.7.17.ebuild b/app-text/calibre/calibre-0.7.17.ebuild new file mode 100644 index 000000000000..1e65c82186f1 --- /dev/null +++ b/app-text/calibre/calibre-0.7.17.ebuild @@ -0,0 +1,151 @@ +# 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.17.ebuild,v 1.1 2010/09/07 01:26:54 zmedico Exp $ + +EAPI=3 +PYTHON_DEPEND=2:2.6 +PYTHON_USE_WITH=sqlite + +inherit python distutils eutils fdo-mime bash-completion + +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.7 + >=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. + 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 + + 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 +} |