summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-11-14 19:33:56 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-11-14 19:33:56 +0000
commitdddb0f20f4188f4419fe40967f185de30c56742e (patch)
treee0620caf5712ba097954cdcaa114fb551f1fc08a /app-text/calibre
parentStable on x86. Closing bug#439090. (diff)
downloadhistorical-dddb0f20f4188f4419fe40967f185de30c56742e.tar.gz
historical-dddb0f20f4188f4419fe40967f185de30c56742e.tar.bz2
historical-dddb0f20f4188f4419fe40967f185de30c56742e.zip
Stabilise latest and bit redux the versions.
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64 Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/ChangeLog6
-rw-r--r--app-text/calibre/Manifest24
-rw-r--r--app-text/calibre/calibre-0.9.1.ebuild183
-rw-r--r--app-text/calibre/calibre-0.9.5.ebuild184
-rw-r--r--app-text/calibre/calibre-0.9.6.ebuild4
5 files changed, 22 insertions, 379 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 62dfb179af77..2fc5134297c4 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-text/calibre
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.241 2012/11/12 08:14:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.242 2012/11/14 19:33:51 scarabeus Exp $
+
+ 14 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.9.1.ebuild,
+ -calibre-0.9.5.ebuild, calibre-0.9.6.ebuild:
+ Stabilise latest and bit redux the versions.
*calibre-0.9.6 (12 Nov 2012)
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index ca830ac055b1..a6ee0a2d42de 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,18 +3,24 @@ Hash: SHA256
AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b SHA512 c51c7cae899bebe7fb339f9cfd4070caa778f86ce997dce26052e158dac12444d3a72db91fd83528ccad07d9bd9a9e72edca9ba91d1805e91c91a0a6ed32f579 WHIRLPOOL cf91dc9993b0329821a9a7b9b4a5245c8ef7a6a2a407cddae4b7b94aff1698e663e9ba08352b61b48fe34a1e3c83701ac71ac549142fd12795e1828d5d8f779d
-DIST calibre-0.9.1.tar.xz 27084512 SHA256 c4d32577133769dd8db7a75d1293c2762a8dd876f1203557d33be7a61fed89b3 SHA512 7d770a1e1793a7110c59995c12497092e214662bf47a2196feab296c147f538a0dc19617919cdb8606fb43fb10668f7c8d7009ff1a96f9221a36ab0b363877f5 WHIRLPOOL c51914f30995a0b740e2a67bf77893ac676310c37844175f1aaff717bbc4b24dedd70183bf84d0742a470a302ce8f6965cffd4d39b1ee71ce263a46552a90add
-DIST calibre-0.9.5.tar.xz 27361044 SHA256 91d5b534b7e662f9650b56e6f028dc850b06b85620633d0ff4ad9c541248a46e SHA512 e7524da565c1aa1777844a4ce419a630a89ce02657c36038a28812763337b5d23c8ac52c23f33be14fd006f10218e48ce652b99ba9815126aefc99ce60ea1fad WHIRLPOOL aecd4472d9e970a68e0a4940630a91ad6fb03514cb8e0d39a10a87e37fef4610a45e381d1e36b874e0e519f3ecb7fe54be245d8f2ddad4f22c6279e5c4d75722
DIST calibre-0.9.6.tar.xz 27346664 SHA256 d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f SHA512 6bbacc8ed9af318bdfc09807937ec5e3e2d99a9b1d408cbf4dd4976926b415736928a16ee8d712ae1b93e98ab612841123bb370440c78db9c350ebd6503f8e58 WHIRLPOOL 306662c0b7dae93ec0d5c63903e02fc6a9cdf6427290bd366464dca7c618f602380fec9767a23baafaf1257135f333553c345356bf06560785c0664f9d74cf36
-EBUILD calibre-0.9.1.ebuild 6072 SHA256 e1c343641bb6019308e998a48d723ad64370cee77ecf1f6d17662f8a4fd1a659 SHA512 2bdf16f40b0e8ccc4b469016f2c1679fbee6eb0740b9b86c4c54a2ee4978e634b1a5e4a3f89f7f0af0ea079058481ccdbfc94aca2674577127692fa3f94bb346 WHIRLPOOL d566b3cf5339a7f07239993440d0c784fff05d02ff8dc229d17780ade98d48c516916a805c898fba1e9c1bceca39199a7a2f5e2f32be05b8423c6d578b04261c
-EBUILD calibre-0.9.5.ebuild 6099 SHA256 15392d36ed5d3c78d1ff77777497a270829f611cbf45ece5f596e3b0293da77e SHA512 084df97a04f0c463f87ce75e8d78211a0d6fe8c0ec426e9519394ad29ebdbf7b9f6badb3f6317ed7beb610e34cf58dd47a82001c2f5de77f2eaa0536d20b135c WHIRLPOOL 2a4ed7548b2aff1e01d18c4c2221f9e69af5eca072fc9b97d1a0fd3763bbdb546f955566f36bc8394a9eb42d32641e62c3e22ed770d84db3c84191c20cb8c7f4
-EBUILD calibre-0.9.6.ebuild 6099 SHA256 4d5756ca08b865388ff5883795d803af10bcceb0df8f7901dcca3212a578199b SHA512 f627f9636b9b6d8b90ab4fe16b12f3dae2c9015d4f017aaf899a9c0ce966e4cce188407a24c905c119677a0a19f7f928051631c2405de24362fba3bc46713aa0 WHIRLPOOL 8607320ecf1a68271abc74e16420ad0c5b234c4d70b057e91d5aac4ca82feacfd21d8cb134f77aa4345aaace3ab548eff9c2e0426a301e048e4d49bb2a93abd0
-MISC ChangeLog 38634 SHA256 732efb3fba52193d3114af16648ad4b4d9918fd7027d3cfbad5a838e6a8a06b3 SHA512 03cbc3c97e1633791ae4f9890391fdcad8ae8cff85dd12409915785cd770ad5b64c2be2fb62c0085e415114c7eebc7444511228e6c4395c1284239468c7884ef WHIRLPOOL c18b80a6211726237c0790a0120f3ea98dc52c9170df177392807a3e4f76276a0eb479598105ddf9b7d7db5b7371bbcd94827eba05c399fd47d3c37c62afe54c
+EBUILD calibre-0.9.6.ebuild 6099 SHA256 444f92291d01b04fbfef7b194ffabb957829e82e9243cdd15d9fff436f882bf4 SHA512 72bf4c23053ffa2232ba5b018c33cee2873e8b5800f7e83c337fd2783cf2ca8c83ec7836418721d6e6ceedcc04df253698b1211eb36d01cc6c548d4810025aab WHIRLPOOL 012816435ec5430ae9abb935abb0b1b60762e9f469b224a4ea7591256367f5d37ce3b471466f4130f8da5ad68d9b492e1995a09d556d841826a749f5a059dec2
+MISC ChangeLog 38809 SHA256 468136226ee399033c15fbdc2683044ec21ed779723ed5c7f1cbd95877d94265 SHA512 7c4c250c15a5092c058ebf7fffb62c2a6d8bbdbc04ce613d5dc910786e7c36f79a822b6f5c21362bbb3b6fac1555b349fc1586ef11495b8602678c3d4b6eb5d2 WHIRLPOOL 3d559fe3de3b0afd13cbf57d3390d5bc303f094639daace5c525b142f9e53fe3c40db27491ad3df7a9458f7aea9d5b3022f95bf9ff326b3617bf0e26b420e8de
MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlCgr+QACgkQ/ejvha5XGaPylACfUFCkgmLtYSq0btE4vjxR0L/S
-1PsAn3qcCZ0WvtuShUVxuTM4FYvC1ASl
-=6xZv
+iQIcBAEBCAAGBQJQo/IhAAoJEOSiRoyO7jvoLuAP/Rk1G1jnjpyeiU/urKcJq1yC
++o4NVvTX9xBIXMZ/gYwkKR57pHFCsWX9UXt0pRG+EyHm96jJovrnfsDBBdOaOyDq
+HvL6C9CV7qaTH/uALyMGoWGBCOz8PtJA3V/lZmPTgi5meaC3rjLKuyrhqjfCtHEC
+JYC9rGYlaDAPnXtf0YVaNNBzSGTQDLsQeHHluqN/qtkH6X+wt2XQbLFDVDv1n72N
+3ugmFcmmERkj3FEvBZmVV3w5ToPyBPat+nL53YtNzO7qb534fK4pKEfHK9OXtWkk
+uUdy8DD2ZMhx+1uMUz2YmYfFTYtb6vxkOAwJ/8KUsH23MTfxeMnJ4LFXVWvkDsaa
+T+75SvEdHIVIwPM5rw7fXkH8vtuA0eaq3o/4DO2R/E+hn6SdtEiNKC2rQq/2uwCu
+8Vv2NATdfW5FW6G+4tS34dZkoNHpzyaqGmiXYTQ7YH+vtKjeWeY/6jEKrH83Oeb0
+ECuVnVoDlZtbiVziPGZrGa6c6Z00NpT5XLPYpiLK1fQYNGpDXOpfax7I2JoQ5quQ
+x8SYTEq7E8gmPuA+Lqd5EFdVM7XuObZx85o+Klz4cYKXkzxXxkak1OQjmEE7F0We
+Nf/NnsjlJPw9q/RPjAERdswDh8lokM8Q8qOYuhmUea3zXWSJIhf8YOpeqsRzev9W
+TacqzhKO4cgoM9qMZMVu
+=SaQE
-----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.1.ebuild b/app-text/calibre/calibre-0.9.1.ebuild
deleted file mode 100644
index 6774666758df..000000000000
--- a/app-text/calibre/calibre-0.9.1.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.1.ebuild,v 1.6 2012/10/26 08:28:12 zmedico Exp $
-
-EAPI=4
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python eutils fdo-mime bash-completion-r1 multilib
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
- >=app-text/podofo-0.8.2
- >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)]
- >=dev-libs/chmlib-0.40
- >=dev-libs/icu-4.4
- >=dev-python/beautifulsoup-3.0.5:python-2
- dev-python/netifaces
- dev-python/python-dateutil
- >=dev-python/dnspython-1.6.0
- >=dev-python/cssselect-0.7.1
- >=dev-python/cssutils-0.9.9
- >=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.9.1[X,svg,webkit]
- media-fonts/liberation-fonts
- >=media-gfx/imagemagick-6.5.9[jpeg,png]
- >=media-libs/libwmf-0.2.8
- >=media-libs/libmtp-1.1.4
- virtual/libusb:1
- x11-libs/qt-dbus:4
- x11-libs/qt-svg:4
- >=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
- udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-0.6_rc5"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- python_set_active_version 2.7
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|PreserveMIMEDefaults():||" \
- -e "s|xdg-icon-resource install|\\0 --mode user|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|xdg-mime install|\\0 --mode user|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # 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 failed to patch install.py"
-
- sed -e "/^ self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/extensions.py || die "sed failed to patch extensions.py"
-}
-
-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}
-
- # 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 #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANGUAGE
-
- # 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" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- dodir "$(python_get_sitedir)" # for init_calibre.py
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- python setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}usr" \
- --staging-libdir="${ED}usr/${libdir}" || die
-
- grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
- die "failed to fix harcoded \$D in paths"
-
- # Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
- # due to bug #389515 (instead, calibre now calls udisks via dbus).
- rm "${ED}usr/bin/calibre-mount-helper" || die
-
- # 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/* "${ED}"usr/share/mime/packages/ ||
- die "failed to register mime types"
- dodir /usr/share/icons
- mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
- die "failed to install icon files"
-
- domenu "${HOME}"/.local/share/applications/*.desktop ||
- die "failed to install .desktop menu files"
-
- dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
- rm -r "${ED}"usr/etc/bash_completion.d
- find "${ED}"usr/etc -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- python_convert_shebangs -r $(python_get_version) "${ED}"
-
- newinitd "${FILESDIR}"/calibre-server.init calibre-server
- newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/calibre-0.9.5.ebuild b/app-text/calibre/calibre-0.9.5.ebuild
deleted file mode 100644
index 55da1e0e5221..000000000000
--- a/app-text/calibre/calibre-0.9.5.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.5.ebuild,v 1.1 2012/11/02 07:21:59 zmedico Exp $
-
-EAPI=4
-PYTHON_DEPEND=2:2.7
-PYTHON_USE_WITH="ssl sqlite"
-
-inherit python eutils fdo-mime bash-completion-r1 multilib
-
-DESCRIPTION="Ebook management application."
-HOMEPAGE="http://calibre-ebook.com/"
-SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-
-KEYWORDS="~amd64 ~x86"
-
-SLOT="0"
-
-IUSE="+udisks"
-
-COMMON_DEPEND="
- >=app-text/podofo-0.8.2
- >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)]
- >=dev-libs/chmlib-0.40
- >=dev-libs/icu-4.4
- >=dev-python/beautifulsoup-3.0.5:python-2
- dev-python/netifaces
- dev-python/python-dateutil
- >=dev-python/dnspython-1.6.0
- >=dev-python/cssselect-0.7.1
- >=dev-python/cssutils-0.9.9
- >=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.9.1[X,svg,webkit]
- media-fonts/liberation-fonts
- >=media-gfx/imagemagick-6.5.9[jpeg,png]
- >=media-libs/freetype-2
- >=media-libs/libwmf-0.2.8
- >=media-libs/libmtp-1.1.4
- virtual/libusb:1
- x11-libs/qt-dbus:4
- x11-libs/qt-svg:4
- >=x11-misc/xdg-utils-1.0.2-r2"
-
-RDEPEND="${COMMON_DEPEND}
- udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-python/setuptools-0.6_rc5"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- python_set_active_version 2.7
- python_pkg_setup
-}
-
-src_prepare() {
- # Fix outdated version constant.
- #sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
- # -i src/calibre/constants.py || \
- # die "sed failed to patch constants.py"
-
- # Avoid sandbox violation in /usr/share/gnome/apps when linux.py
- # calls xdg-* (bug #258938).
- sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
- -e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
- -e "s|PreserveMIMEDefaults():||" \
- -e "s|xdg-icon-resource install|\\0 --mode user|" \
- -e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
- -e "s|xdg-mime install|\\0 --mode user|" \
- -i src/calibre/linux.py || die "sed failed to patch linux.py"
-
- # 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 failed to patch install.py"
-
- sed -e "/^ self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
- -i setup/extensions.py || die "sed failed to patch extensions.py"
-}
-
-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}
-
- # 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 #352625 - Some LANGUAGE values can trigger the following ValueError:
- # File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
- # return _parse_localename(localename)
- # File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
- # raise ValueError, 'unknown locale: %s' % localename
- #ValueError: unknown locale: 46
- export -n LANGUAGE
-
- # 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" OVERRIDE_LDFLAGS="$LDFLAGS"
- local libdir=$(get_libdir)
- [[ -n $libdir ]] || die "get_libdir returned an empty string"
-
- dodir "$(python_get_sitedir)" # for init_calibre.py
- PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- python setup.py install \
- --root="${D}" \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/${libdir}" \
- --staging-root="${ED}usr" \
- --staging-libdir="${ED}usr/${libdir}" || die
-
- grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
- die "failed to fix harcoded \$D in paths"
-
- # Remove dummy calibre-mount-helper which is unused since calibre-0.8.25
- # due to bug #389515 (instead, calibre now calls udisks via dbus).
- rm "${ED}usr/bin/calibre-mount-helper" || die
-
- # 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/* "${ED}"usr/share/mime/packages/ ||
- die "failed to register mime types"
- dodir /usr/share/icons
- mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
- die "failed to install icon files"
-
- domenu "${HOME}"/.local/share/applications/*.desktop ||
- die "failed to install .desktop menu files"
-
- dobashcomp "${ED}"usr/etc/bash_completion.d/calibre
- rm -r "${ED}"usr/etc/bash_completion.d
- find "${ED}"usr/etc -type d -empty -delete
-
- cd "${ED}"/usr/share/calibre/fonts/liberation || die
- local x
- for x in * ; do
- [[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
- ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
- done
-
- python_convert_shebangs -r $(python_get_version) "${ED}"
-
- newinitd "${FILESDIR}"/calibre-server.init calibre-server
- newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- python_mod_optimize /usr/$(get_libdir)/${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup /usr/$(get_libdir)/${PN}
-}
diff --git a/app-text/calibre/calibre-0.9.6.ebuild b/app-text/calibre/calibre-0.9.6.ebuild
index 41ef2e71dc30..fb9131c9dceb 100644
--- a/app-text/calibre/calibre-0.9.6.ebuild
+++ b/app-text/calibre/calibre-0.9.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.6.ebuild,v 1.1 2012/11/12 08:14:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.6.ebuild,v 1.2 2012/11/14 19:33:51 scarabeus Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
@@ -14,7 +14,7 @@ SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"