0.7.5 version bump.

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

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 6fae02dec2f37a6d5c7a466356b50a9a9fd29f77..4a10d8318147b36f9c210aa5c2279c713ec23d00 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.93 2010/06/22 18:18:06 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.94 2010/06/26 23:50:42 zmedico Exp $
+
+*calibre-0.7.5 (26 Jun 2010)
+
+  26 Jun 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.5.ebuild:
+  0.7.5 version bump.
 
 *calibre-0.7.4 (22 Jun 2010)
 

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 68a8a9d6f4b6f349eafab369ac1c7ac3a5a20ece..e81c3f1fda8b0e9c13e2c4f93c8e3ac19c6859eb 100644 (file)
--- 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.2.tar.gz 13743469 RMD160 fadf511c70799d279d3070f5821749643f70033a SHA1 274ae35d80a884684c58314669d44017fdf26d48 SHA256 c8edc9b3ce934862135b2b326875a2ef07d9504b7f8ff85cfcd39c0733a3756d
 DIST calibre-0.7.3.tar.gz 14347488 RMD160 acad387e7fb7f1f1883025b44fe1e17c81ab48bd SHA1 03276f89e349ab3f149894e516723c220e4ab229 SHA256 40801dff0dc6543a59cad353d83a043b5318463c282ad1d309a7b6518614a52e
 DIST calibre-0.7.4.tar.gz 14360823 RMD160 f5a4f5e09c93ffc149259fa19276a96d52e6aed1 SHA1 37c352c3a1d881efeba1b309fe45bf3a993f57f1 SHA256 bec64d5a28df0c7541cc2ba1a6127d2ef88c1ab2cdeb47891585472a9ec1ad66
+DIST calibre-0.7.5.tar.gz 14689455 RMD160 037bf4a08ec925146da3d126985822b4235e0b89 SHA1 fac884e72b658b154121bc751b37ba03a1ac3876 SHA256 e5e3bc77377c38a0e24d61faa0ee058fe3c9664104bc68b612af2c7084933208
 EBUILD calibre-0.6.55.ebuild 4532 RMD160 7413eb37657f2d4b8e9a37a9f1349ada34b38b0b SHA1 2186cf63df6b0d80a47e31b33245c41b903fa71e SHA256 0f852e192347cd4b4cf3f16e303f48feeb07155631b993e72011c224ef62e1fd
 EBUILD calibre-0.7.2.ebuild 5014 RMD160 dbb7a229e538584f24a6e0392210f0d41a93e543 SHA1 e40a88fd2b2b6d6efa8ddf0f8016e971383a0440 SHA256 8e85ebde743a6e0a90e8a3abdb0c86889542b0dce5b47a2b8aed620922a12047
 EBUILD calibre-0.7.3.ebuild 4825 RMD160 e5a4bc34756bb8ea067718d86355203b78635ba0 SHA1 0dd1476b4f48d35c51984d02bdc94a40dbbd6913 SHA256 439936599f5aff23ab10d6a7d43923eb2acbcec05e69adfd65d8edd71cfd20f0
 EBUILD calibre-0.7.4.ebuild 4825 RMD160 b53f8bfb3bc9fa101d375aceaa98c1924b3a7d51 SHA1 f8e5b64b4b64e679e6f3ec1a51c8ffbe2e5c4e8e SHA256 a84767ac4a44beb341819e6045510db65a40bf231bed106fde02b1f7a5432ae8
-MISC ChangeLog 14940 RMD160 fb35cb4c8e5768e0eb88cbb57295fe367bfbd129 SHA1 b3178320d246043c153fcb3d20a4c0c7853cfb85 SHA256 0a3e8e8dfd469f16345103ca98bee0cf865c9be718ae3e074b085e4a60a87bca
+EBUILD calibre-0.7.5.ebuild 4825 RMD160 bc8dcb41d86ee64ca71936c88fc6d75295275847 SHA1 cfaa59ad05499b9e9e1ca029d17fdfb6ed6c1cca SHA256 cb4be7418a1e5464d90f3019aac5aaf0535525163829493b4964c2a7dfb1fad0
+MISC ChangeLog 15063 RMD160 741c3f175f3445dd3d1777be985fd8df7f26fefa SHA1 e6dfc16bc1a0c1b10f91906b8115fc561ef466ad SHA256 f9bdfcfde9c4ffed21356e21ac9cb7bc2f98a61f5913d5bd3e1b1382251e1223
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwg/pEACgkQ/ejvha5XGaMSIACgrwjSXMDqzdQxw1CycWD3CBX6
-dy4An04dQLj3fBUvByFABTZbBDRkfOd6
-=/kqk
+iEYEARECAAYFAkwmko4ACgkQ/ejvha5XGaNOowCeKMagycnK+1X764UNf29CED6y
+1rkAnj81NsjhXjAstauEU/cmPwTwUzaU
+=1tpP
 -----END PGP SIGNATURE-----

diff --git a/app-text/calibre/calibre-0.7.5.ebuild b/app-text/calibre/calibre-0.7.5.ebuild
new file mode 100644 (file)
index 0000000..7cded90
--- /dev/null
+++ b/app-text/calibre/calibre-0.7.5.ebuild
@@ -0,0 +1,152 @@
+# 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.5.ebuild,v 1.1 2010/06/26 23:50:42 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.1.5
+       >=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.3.8 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"
+
+       # Avoid segfault in uuid.uuid4() for bug #315345.
+       local installation_uuid=$(python -c 'import sys, uuid; sys.stdout.write(str(uuid.uuid4()))')
+       [[ -n $installation_uuid ]] || die "failed to generate installation_uuid"
+       sed -e "s:str(uuid.uuid4()):'$installation_uuid':" \
+               -i src/calibre/utils/config.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
+}