0.7.2 version bump. This ebuild includes a workaround for a segfault

that was triggered in libuuid.so with >=util-linux-2.17.1.
Package-Manager: portage-2.2_rc67_p174/cvs/Linux i686

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 5184f874fc29ebb9870ca8e7d62585d15a570e94..51e71cba91b5ef7c1f8e249c4ea46ff54d3dbe9a 100644 (file)
--- 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.89 2010/06/09 01:29:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.90 2010/06/16 02:13:59 zmedico Exp $
+
+*calibre-0.7.2 (16 Jun 2010)
+
+  16 Jun 2010; Zac Medico <zmedico@gentoo.org> +calibre-0.7.2.ebuild:
+  0.7.2 version bump. This ebuild includes a workaround for a segfault
+  that was triggered in libuuid.so with >=util-linux-2.17.1.
 
 *calibre-0.7.1 (09 Jun 2010)
 

diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index de70b99f3bbe64bc7fa5cdd736079ba85e15a4a2..c47e509f2c6a25a679caa8994694a744b8d9fe66 100644 (file)
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -7,18 +7,20 @@ DIST calibre-0.6.11.tar.gz 8771885 RMD160 6cc9155560915a3d74314294514a6a97b077cd
 DIST calibre-0.6.53.tar.gz 12815965 RMD160 754fc3da18a5018c24f56f6ccdc18363295a9ff3 SHA1 0789f3ff1c4892a1368c655566301441d3cea0d0 SHA256 64b3f534228d24a3d591498af6acea50a20a7343fa0f7396a29ab272a87df2b9
 DIST calibre-0.6.55.tar.gz 13029109 RMD160 71747b0cbcf12c78168339fbbe0f77998d3c9c5f SHA1 9fa6000c6f6ce7df1a284200c5c1a8714ee1e8cf SHA256 6b004a1adda25283bedbc8e60215bcd92c4394c59a666ff5f05f0e5808433ebc
 DIST calibre-0.7.1.tar.gz 13635884 RMD160 cc73677ebd7b7a336a1b2013b9b9fe3afea18998 SHA1 dbadf328325295333137f715978c50efe3b7a45a SHA256 8175bb740b798cf7b413191396cb2140f7c3f4926e602e94bde04d253386a139
+DIST calibre-0.7.2.tar.gz 13743469 RMD160 fadf511c70799d279d3070f5821749643f70033a SHA1 274ae35d80a884684c58314669d44017fdf26d48 SHA256 c8edc9b3ce934862135b2b326875a2ef07d9504b7f8ff85cfcd39c0733a3756d
 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.53.ebuild 4532 RMD160 e11dd206d8af2c8d2bd796337aa9206a3529d96a SHA1 0990d287822599ac03d6770416b0bf1c1273ff28 SHA256 3e8ab8d07281780f66b1dd04bb7167ea9e523b0f3f5cd3bd9bc66701a56d469a
 EBUILD calibre-0.6.55.ebuild 4532 RMD160 7413eb37657f2d4b8e9a37a9f1349ada34b38b0b SHA1 2186cf63df6b0d80a47e31b33245c41b903fa71e SHA256 0f852e192347cd4b4cf3f16e303f48feeb07155631b993e72011c224ef62e1fd
 EBUILD calibre-0.7.1.ebuild 4475 RMD160 dc3a6bebb3e43807a75dcee12222ba5fc00bd9a6 SHA1 4d0cb58975c81cfa076f113547a2ce02dde4fdab SHA256 59a3f022ccc970f0c432144d356775e7d4f55400c542f194e4b9a1624210a786
-MISC ChangeLog 14264 RMD160 e3e7cfadc389d1a9345c2b4c9047eba674704709 SHA1 beaf7899d693f18593e08dc41d6d170acbeac799 SHA256 892b949d6bcd5e9666f99aa3915518e39361d38d0c09b56b18a56f24e05d5216
+EBUILD calibre-0.7.2.ebuild 5014 RMD160 dbb7a229e538584f24a6e0392210f0d41a93e543 SHA1 e40a88fd2b2b6d6efa8ddf0f8016e971383a0440 SHA256 8e85ebde743a6e0a90e8a3abdb0c86889542b0dce5b47a2b8aed620922a12047
+MISC ChangeLog 14497 RMD160 bfc1fa95767e5af9f6f4ed280b2cf0ac68e7f3b1 SHA1 47b8101b7b559ec7f62912ca2864ffe97a9b1b42 SHA256 94fbe3ae292cccf82edbac8378c85963ce7313119dcf8d54dbc81ecffe013652
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwO7okACgkQ/ejvha5XGaPhtwCfXjV5oDplhmoCR4Wfmvg/jAMt
-IJcAniWGAe4f0dUYLyfMLVRXvikGY9IW
-=yTbq
+iEYEARECAAYFAkwYM40ACgkQ/ejvha5XGaNVcQCg5KUrJyFF4jowmJrjmIgAziPh
+92sAoO6epF7EHgmyOhs559kg1Ctlf5CX
+=c2VC
 -----END PGP SIGNATURE-----

diff --git a/app-text/calibre/calibre-0.7.2.ebuild b/app-text/calibre/calibre-0.7.2.ebuild
new file mode 100644 (file)
index 0000000..14f85c8
--- /dev/null
+++ b/app-text/calibre/calibre-0.7.2.ebuild
@@ -0,0 +1,156 @@
+# 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.2.ebuild,v 1.1 2010/06/16 02:13:59 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"
+
+       # Sometimes upstream forgets to update the version string.
+       sed -e "s:^__version__   =.*:__version__   = '$PV':" \
+               -i src/calibre/constants.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
+}