From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 77FA21381F3 for ; Sat, 8 Jun 2013 15:34:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F726E098A; Sat, 8 Jun 2013 15:34:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3664E098A for ; Sat, 8 Jun 2013 15:34:46 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7F9C33E445 for ; Sat, 8 Jun 2013 15:34:45 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2304) id 4786B21710; Sat, 8 Jun 2013 15:34:44 +0000 (UTC) From: "Mike Gilbert (floppym)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, floppym@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.9.33.ebuild calibre-0.9.34-r1.ebuild calibre-0.9.27.ebuild ChangeLog calibre-0.9.34.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: calibre-0.9.33.ebuild calibre-0.9.34-r1.ebuild calibre-0.9.27.ebuild ChangeLog calibre-0.9.34.ebuild X-VCS-Directories: app-text/calibre X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130608153444.4786B21710@flycatcher.gentoo.org> Date: Sat, 8 Jun 2013 15:34:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 37254f25-0fae-4d11-95f9-492f1bcf1876 X-Archives-Hash: 8c83c811015131647955b9c2bfece54d floppym 13/06/08 15:34:44 Modified: calibre-0.9.33.ebuild calibre-0.9.27.ebuild ChangeLog Added: calibre-0.9.34-r1.ebuild Removed: calibre-0.9.34.ebuild Log: Fix PIL import for Pillow compat. Revert imaging dep change in ebuild which do not apply this fix. (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) Revision Changes Path 1.3 app-text/calibre/calibre-0.9.33.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild?r1=1.2&r2=1.3 Index: calibre-0.9.33.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- calibre-0.9.33.ebuild 5 Jun 2013 10:59:15 -0000 1.2 +++ calibre-0.9.33.ebuild 8 Jun 2013 15:34:44 -0000 1.3 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild,v 1.2 2013/06/05 10:59:15 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild,v 1.3 2013/06/08 15:34:44 floppym Exp $ EAPI=5 @@ -53,7 +53,7 @@ >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 - virtual/python-imaging + dev-python/imaging >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 1.8 app-text/calibre/calibre-0.9.27.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild?r1=1.7&r2=1.8 Index: calibre-0.9.27.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- calibre-0.9.27.ebuild 5 Jun 2013 10:59:15 -0000 1.7 +++ calibre-0.9.27.ebuild 8 Jun 2013 15:34:44 -0000 1.8 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.7 2013/06/05 10:59:15 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.8 2013/06/08 15:34:44 floppym Exp $ EAPI=5 @@ -53,7 +53,7 @@ >=dev-python/cssselect-0.7.1 >=dev-python/cssutils-0.9.9 >=dev-python/dbus-python-0.82.2 - virtual/python-imaging + dev-python/imaging >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 1.285 app-text/calibre/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.285&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.285&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?r1=1.284&r2=1.285 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v retrieving revision 1.284 retrieving revision 1.285 diff -u -r1.284 -r1.285 --- ChangeLog 7 Jun 2013 08:00:21 -0000 1.284 +++ ChangeLog 8 Jun 2013 15:34:44 -0000 1.285 @@ -1,6 +1,14 @@ # ChangeLog for app-text/calibre # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.284 2013/06/07 08:00:21 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.285 2013/06/08 15:34:44 floppym Exp $ + +*calibre-0.9.34-r1 (08 Jun 2013) + + 08 Jun 2013; Mike Gilbert +calibre-0.9.34-r1.ebuild, + +files/calibre-pillow.patch, -calibre-0.9.34.ebuild, calibre-0.9.27.ebuild, + calibre-0.9.33.ebuild: + Fix PIL import for Pillow compat. Revert imaging dep change in ebuild which do + not apply this fix. *calibre-0.9.34 (07 Jun 2013) 1.1 app-text/calibre/calibre-0.9.34-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.34-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.34-r1.ebuild?rev=1.1&content-type=text/plain Index: calibre-0.9.34-r1.ebuild =================================================================== # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.34-r1.ebuild,v 1.1 2013/06/08 15:34:44 floppym Exp $ EAPI=5 inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs DESCRIPTION="Ebook management application." HOMEPAGE="http://calibre-ebook.com/" SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz" # Restrict mirror due non-free prs500 fonts (bug #470212). RESTRICT="mirror" LICENSE=" GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2 unRAR " 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-lang/python-2.7.1:2.7[sqlite,ssl] >=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 virtual/python-imaging >=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= dev-qt/qtdbus:4= dev-qt/qtsvg: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} 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" # no_updates: do not annoy user with "new version is availible all the time # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface epatch \ "${FILESDIR}/${PN}-no_updates_dialog.patch" \ "${FILESDIR}/${PN}-disable_plugins.patch" \ "${FILESDIR}/${PN}-pillow.patch" # Remove non-free fonts (bug #470212). rm -r resources/fonts/prs500 || die } 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}" tc-export CC CXX # 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 "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \ "${EPREFIX}"/usr/bin/python2.7 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 einfo "Converting python shebangs" while read -r -d $'\0' ; do local shebang=$(head -n1 "$REPLY") if [[ ${shebang} == "#!"*python* ]] ; then sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \ die "sed failed" fi done < <(find "${ED}" -type f -print0) einfo "Compiling python modules" "${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \ -d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die 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 }