From: Zac Medico Date: Mon, 26 Apr 2010 06:06:21 +0000 (+0000) Subject: 0.6.49 version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a6e987d36368dea80ec1ab6c4474d0010919d88;p=gentoo.git 0.6.49 version bump. Package-Manager: portage-2.2_rc67_p75/cvs/Linux i686 --- diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog index b01682870d00..39f5c759b4e5 100644 --- 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.83 2010/04/12 00:26:11 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.84 2010/04/26 06:06:21 zmedico Exp $ + +*calibre-0.6.49 (26 Apr 2010) + + 26 Apr 2010; Zac Medico +calibre-0.6.49.ebuild: + 0.6.49 version bump. 12 Apr 2010; Zac Medico calibre-0.6.47.ebuild: Bug #314229 - Fix deps to pull in graphicsmagick instead of imagemagick if diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest index 45473de171b8..00fbca87f0e7 100644 --- 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.44.tar.gz 11873986 RMD160 547d49f7be8b059be995bd2366a83745ad681281 SHA1 03f1217ec12efc1f76fbc2a6d49cefd1291e3782 SHA256 00117e38062c76f675b0b978cd862c957482abe18e56f82de9557128405b125e DIST calibre-0.6.45.tar.gz 12085471 RMD160 1fb0fd8672c047a01673f1115c79c937e1bc2217 SHA1 63aee33b8e4cd611bf2ba9a4ccd04ec89a4cbb9a SHA256 10255cf23c6cf38ad8cb60f66af1080a62a9ba3a374e58a71ebf5c4624acf898 DIST calibre-0.6.47.tar.gz 12403618 RMD160 87637a53fea0c72ec0b9549ed957f206170b2f88 SHA1 8b046f7336a81ad47d099301124c5accd16d1d40 SHA256 118b2954d313e011d745f5bf8451f30c7a6b14441917da115504fbc529ce459b +DIST calibre-0.6.49.tar.gz 12649757 RMD160 6b655cf18d01596cca57ed6697f113fdf60258e5 SHA1 a9266d2e67144209276c9a7509f0fadcca5a09e9 SHA256 b6a2bcab23f5bf6ce3b9187c0565447ba028eb6a9b7d698f77febdb1be094391 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.44.ebuild 4525 RMD160 bc77cbc495ca788432093043fb866e2c9e803481 SHA1 b73d734297b3a8a128d1f48fd2651ff39a8801b1 SHA256 e16691dde420f2a3489c75ad733a7cf987d3b8f88e53ae27b63e66322c9d2338 EBUILD calibre-0.6.45.ebuild 4525 RMD160 2776962e1c24fefb5cf78324a21498a63715a845 SHA1 d983e131d255757cda42c22c4bd50ab587c19046 SHA256 30b751855485566756d099350c43274116f0ae603d3bbb9454a56fe69a81e213 EBUILD calibre-0.6.47.ebuild 4532 RMD160 a868cbca3d42a9fc22a4ada4be25f4f13416ff48 SHA1 df4fb65b8e3a8202840d80f5c8524aae4d1e140f SHA256 9e7a24ced47353ab6e998c94ddf997a66cf2e75b066c6ae28229e13541896765 -MISC ChangeLog 13221 RMD160 a4318cb1fc86d0407faadb7470351900485acbe3 SHA1 69a6a64ac9078a6e14aada889bc94a478f679315 SHA256 84fb554f37fd91679b9174e16f12c6a2511e27f64fc8f70e11ee011bb6ae10d4 +EBUILD calibre-0.6.49.ebuild 4532 RMD160 2439bd56651a318ad714349e6be1900aa7bc5249 SHA1 26543e119e3dd5e0b087b8fe146467a0e5c8623f SHA256 b1de607b212185f3c93b9fe330db340ca8fd04f2a7fd006317e6f5f06296ad1f +MISC ChangeLog 13347 RMD160 6df5726132b883e35f5264e6a5c73ea9f80b28ef SHA1 0a7db50b478924a9e66ee35a1650a6e3af2e5443 SHA256 8862736fc83d7c2b0653304cc4b2700afcfd7bc9619f6d7e59e572514175583c MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvCaJYACgkQ/ejvha5XGaNsewCglEkG5k5+nuqNXZYtyIbgYXbs -GukAn3MRVIMlWju3AZu2KeQQ8rT9K1TD -=uApM +iEYEARECAAYFAkvVLWYACgkQ/ejvha5XGaPwlgCfRaiC6PmS0FsCI4/gAdlPUiIA ++AUAoLz2LNz9H6unlqww3z1rJZsDx3VQ +=m+U3 -----END PGP SIGNATURE----- diff --git a/app-text/calibre/calibre-0.6.49.ebuild b/app-text/calibre/calibre-0.6.49.ebuild new file mode 100644 index 000000000000..14f8078e1644 --- /dev/null +++ b/app-text/calibre/calibre-0.6.49.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.49.ebuild,v 1.1 2010/04/26 06:06:21 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 +}