From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.9.26.ebuild ChangeLog calibre-0.9.24.ebuild
Date: Fri, 5 Apr 2013 16:27:18 +0000 (UTC) [thread overview]
Message-ID: <20130405162718.CF70B2171D@flycatcher.gentoo.org> (raw)
zmedico 13/04/05 16:27:18
Modified: ChangeLog
Added: calibre-0.9.26.ebuild
Removed: calibre-0.9.24.ebuild
Log:
0.9.26 version bump.
(Portage version: 2.2.0_alpha171/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Revision Changes Path
1.270 app-text/calibre/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.270&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.270&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?r1=1.269&r2=1.270
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- ChangeLog 29 Mar 2013 21:29:47 -0000 1.269
+++ ChangeLog 5 Apr 2013 16:27:18 -0000 1.270
@@ -1,6 +1,12 @@
# 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.269 2013/03/29 21:29:47 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.270 2013/04/05 16:27:18 zmedico Exp $
+
+*calibre-0.9.26 (05 Apr 2013)
+
+ 05 Apr 2013; Zac Medico <zmedico@gentoo.org> +calibre-0.9.26.ebuild,
+ -calibre-0.9.24.ebuild:
+ 0.9.26 version bump.
*calibre-0.9.25 (29 Mar 2013)
1.1 app-text/calibre/calibre-0.9.26.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.26.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.9.26.ebuild?rev=1.1&content-type=text/plain
Index: calibre-0.9.26.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.26.ebuild,v 1.1 2013/04/05 16:27:18 zmedico Exp $
EAPI=5
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=
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}
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"
# 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"
}
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}
}
reply other threads:[~2013-04-05 16:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130405162718.CF70B2171D@flycatcher.gentoo.org \
--to=zmedico@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox