0.6.51 version bump.

Package-Manager: portage-2.2_rc67_p98/cvs/Linux i686

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 54d8875ef14da2067468851e73b8d7e582cfd176..f8d928fc26eac25a674fff4a2a48ba4c564a506f 100644 (file)
--- 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.85 2010/04/30 22:36:56 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.86 2010/05/04 21:44:22 zmedico Exp $
+
+*calibre-0.6.51 (04 May 2010)
+
+  04 May 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.6.51.ebuild:
+  0.6.51 version bump.
 
 *calibre-0.6.50 (30 Apr 2010)
 

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 8a2186e0be33279e099b1c3247c24725caf7a5ec..c7c6670674d370b4458de9ba5dd8834989b04173 100644 (file)
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,17 +6,19 @@ DIST calibre-0.5.14.tar.gz 7693491 RMD160 175e473e74e036ad245db35a08e700e92d8c71
 DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cdb9 SHA1 1068e8935318201fc0de7e52a72317c825e7817f SHA256 de71128ea76f468e56201d9940e550b61fe2691d96f1943f1905870d32907b8a
 DIST calibre-0.6.49.tar.gz 12649757 RMD160 6b655cf18d01596cca57ed6697f113fdf60258e5 SHA1 a9266d2e67144209276c9a7509f0fadcca5a09e9 SHA256 b6a2bcab23f5bf6ce3b9187c0565447ba028eb6a9b7d698f77febdb1be094391
 DIST calibre-0.6.50.tar.gz 12723139 RMD160 e90fd42de25e677631955c268e768f65cfd00da4 SHA1 8fb35aff1dee970e4b8322eeae57745176124d05 SHA256 ce36120b9c1994be8e1e3c12a80670c60313ac05b27d71d2be0313b4ffa6b1c6
+DIST calibre-0.6.51.tar.gz 12723093 RMD160 6e394024a226eabda45f953419d74dcd0ba639b9 SHA1 62dd11c638daf644c7f03610a0d514b29f8b2f30 SHA256 8d4c4e7cc2f7e4b215bad10782e1c68f6750da40742f579ba67c9791a3c12671
 EBUILD calibre-0.4.77.ebuild 2282 RMD160 3d0daa0c5740299d302be542de93b42aba01a7b5 SHA1 609941ba89bf2274b2ad776c316140563d0c7366 SHA256 76479992561158d6d7eaa7ebe117b430b8836bbe774f84ab58a7ce037b4604e3
 EBUILD calibre-0.5.14-r1.ebuild 4260 RMD160 dc4d9465d99914e4336ba4b35cd8257435769f18 SHA1 438b4b4cc28a06a7f5bdbccc70862d6810c95904 SHA256 fcc6677b0a7047ce5f377d0cef1c8927e6c70dc87205542ab942f310f6bf8b4b
 EBUILD calibre-0.6.11.ebuild 4074 RMD160 c9951c75216bddc46887edddab6c93b444c8b06c SHA1 0fa086e34ec29fe3847838ff41d1674153af96ae SHA256 f65bb03f0a5ffa3d6b896083e69f9805c3d290c0a04b8c5ff46a38b17c1ecc6b
 EBUILD calibre-0.6.49.ebuild 4532 RMD160 2439bd56651a318ad714349e6be1900aa7bc5249 SHA1 26543e119e3dd5e0b087b8fe146467a0e5c8623f SHA256 b1de607b212185f3c93b9fe330db340ca8fd04f2a7fd006317e6f5f06296ad1f
 EBUILD calibre-0.6.50.ebuild 4532 RMD160 f65c561479f11088464da476a811664c43ec282f SHA1 01110348d933900552ee036e38ae7cf30bc71a8c SHA256 192a6b4b011efb9a7377b1aacf255080277a6364508a98a83bde657dd7cfbfec
-MISC ChangeLog 13618 RMD160 0fc52f2ce39cdc29c0bf2e4e60f9b88652e9892d SHA1 1490c44a1284482980fc8f0ba52b4eac0e11d98b SHA256 1ddafc76b248fcfb66dd84871812f69f0e3def22b673f6af82d79473c67196d6
+EBUILD calibre-0.6.51.ebuild 4532 RMD160 fc10a898639b20c3fbb8bb1cb04b6d722367e144 SHA1 797bb27537f7f96dfdd277dae8dff675f2de22ef SHA256 ebb766a34706133427464d5821f44a826cd243984e2f32534aff17b848d59309
+MISC ChangeLog 13744 RMD160 a908608b47aa0b4e6d127d40dad9c8139b7c2028 SHA1 2a0a1da6142936cc5a1bcfa7a54add91262929fd SHA256 1bef6024bf1450d8e57750d374906f764c00b8b0b1cf01e9ec3b102f3341c49c
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvbW5oACgkQ/ejvha5XGaNjEwCgoYpf4H/zhOgcSOeLDuJqeuSl
-5mEAn1BnChdH6NG0Mz2OgjZkyNx3kq68
-=Ke5s
+iEYEARECAAYFAkvglTsACgkQ/ejvha5XGaPHyQCg1SAN52zeicLuZauaxg5yUP6W
+jLsAoLsqHODeosxqsp4W5eSk0WlvOOON
+=JExk
 -----END PGP SIGNATURE-----

diff --git a/app-text/calibre/calibre-0.6.51.ebuild b/app-text/calibre/calibre-0.6.51.ebuild
new file mode 100644 (file)
index 0000000..1054c93
--- /dev/null
+++ b/app-text/calibre/calibre-0.6.51.ebuild
@@ -0,0 +1,147 @@
+# 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.6.51.ebuild,v 1.1 2010/05/04 21:44:22 zmedico Exp $
+
+EAPI=2
+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=">=dev-python/cssutils-0.9.7_alpha2
+       >=dev-python/setuptools-0.6_rc5
+       >=dev-python/imaging-1.1.6
+       >=dev-libs/chmlib-0.40
+       virtual/libusb:0
+       >=dev-python/PyQt4-4.5[X,svg,webkit]
+       >=dev-python/mechanize-0.1.11
+       || ( >=media-gfx/imagemagick-6.3.5 media-gfx/graphicsmagick[imagemagick] )
+       >=x11-misc/xdg-utils-1.0.2
+       >=dev-python/dbus-python-0.82.2
+       >=dev-python/lxml-2.1.5
+       >=dev-python/python-dateutil-1.4.1
+       >=dev-python/beautifulsoup-3.0.5
+       >=dev-python/dnspython-1.6.0
+       >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers]
+       >=sys-apps/help2man-1.36.4
+       app-text/podofo"
+
+RDEPEND="$SHARED_DEPEND
+       >=dev-python/reportlab-2.1"
+
+DEPEND="$SHARED_DEPEND
+       dev-python/setuptools
+       >=gnome-base/librsvg-2.0.0
+       >=x11-misc/xdg-utils-1.0.2-r2
+       sys-apps/help2man"
+
+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:" \
+               -e "s:old_udev = '/etc:old_udev = '${D}etc:" \
+               -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 - Aavoid sandbox violation in ~/.config by forcing
+       # variables to point to our fake temporary $HOME.
+       export XDG_CONFIG_HOME="$HOME/.config"
+       export CALIBRE_CONFIG_DIRECTORY="$XDG_CONFIG_HOME/calibre"
+       mkdir -p "$XDG_CONFIG_HOME" "$CALIBRE_CONFIG_DIRECTORY"
+
+       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
+}