* [gentoo-commits] gentoo-x86 commit in app-text/calibre: ChangeLog calibre-0.7.46.ebuild
@ 2011-02-19 9:34 Zac Medico (zmedico)
0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico (zmedico) @ 2011-02-19 9:34 UTC (permalink / raw
To: gentoo-commits
zmedico 11/02/19 09:34:09
Modified: ChangeLog
Added: calibre-0.7.46.ebuild
Log:
0.7.46 version bump.
(Portage version: 2.2.0_alpha24_p5/cvs/Linux i686)
Revision Changes Path
1.132 app-text/calibre/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?r1=1.131&r2=1.132
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog 14 Feb 2011 02:56:39 -0000 1.131
+++ ChangeLog 19 Feb 2011 09:34:09 -0000 1.132
@@ -1,6 +1,11 @@
# ChangeLog for app-text/calibre
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.131 2011/02/14 02:56:39 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.132 2011/02/19 09:34:09 zmedico Exp $
+
+*calibre-0.7.46 (19 Feb 2011)
+
+ 19 Feb 2011; Zac Medico <zmedico@gentoo.org> +calibre-0.7.46.ebuild:
+ 0.7.46 version bump.
*calibre-0.7.45 (14 Feb 2011)
1.1 app-text/calibre/calibre-0.7.46.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild?rev=1.1&content-type=text/plain
Index: calibre-0.7.46.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild,v 1.1 2011/02/19 09:34:09 zmedico Exp $
EAPI=3
PYTHON_DEPEND=2:2.6
PYTHON_USE_WITH=sqlite
inherit python distutils eutils fdo-mime bash-completion multilib
DESCRIPTION="Ebook management application."
HOMEPAGE="http://calibre-ebook.com/"
SRC_URI="http://calibre-ebook.googlecode.com/files/$P.tar.gz"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~x86"
SLOT="0"
IUSE=""
SHARED_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/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.2.1
>=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.5.9 media-gfx/graphicsmagick[imagemagick] )
>=media-libs/libwmf-0.2.8
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"
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 #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 $LDFLAGS"
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.
local libdir=$(get_libdir)
dodir /usr/$libdir
mv "${D}lib/calibre" "${D}usr/$libdir/" ||
die "failed to move libdir"
find "${D}"lib -type d -empty -delete
grep -rlZ "/usr/lib/calibre" "${D}" | \
xargs -0 sed -e "s:/usr/lib/calibre:/usr/$libdir/calibre:g" -i ||
die "failed to fix harcoded libdir paths"
find "${D}"share/calibre/man -type f -print0 | \
while read -r -d $'\0' ; do
if [[ $REPLY = *.[0-9]calibre.bz2 ]] ; then
newname=${REPLY%calibre.bz2}.bz2
mv "$REPLY" "$newname"
doman "$newname" || die "doman failed"
rm -f "$newname" || die "rm failed"
fi
done
rmdir "${D}"share/calibre/man/* || \
die "could not remove redundant man subdir(s)"
rmdir "${D}"share/calibre/man || \
die "could not remove redundant man dir"
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
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/calibre: ChangeLog calibre-0.7.46.ebuild
@ 2011-02-22 20:10 Zac Medico (zmedico)
0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico (zmedico) @ 2011-02-22 20:10 UTC (permalink / raw
To: gentoo-commits
zmedico 11/02/22 20:10:04
Modified: ChangeLog calibre-0.7.46.ebuild
Log:
Bug #355639 - Increase python and PyQt4 deps.
(Portage version: 2.2.0_alpha25/cvs/Linux i686)
Revision Changes Path
1.133 app-text/calibre/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.133&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.133&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?r1=1.132&r2=1.133
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- ChangeLog 19 Feb 2011 09:34:09 -0000 1.132
+++ ChangeLog 22 Feb 2011 20:10:04 -0000 1.133
@@ -1,6 +1,9 @@
# ChangeLog for app-text/calibre
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.132 2011/02/19 09:34:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.133 2011/02/22 20:10:04 zmedico Exp $
+
+ 22 Feb 2011; Zac Medico <zmedico@gentoo.org> calibre-0.7.46.ebuild:
+ Bug #355639 - Increase python and PyQt4 deps.
*calibre-0.7.46 (19 Feb 2011)
1.2 app-text/calibre/calibre-0.7.46.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild?r1=1.1&r2=1.2
Index: calibre-0.7.46.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calibre-0.7.46.ebuild 19 Feb 2011 09:34:09 -0000 1.1
+++ calibre-0.7.46.ebuild 22 Feb 2011 20:10:04 -0000 1.2
@@ -1,9 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild,v 1.1 2011/02/19 09:34:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.7.46.ebuild,v 1.2 2011/02/22 20:10:04 zmedico Exp $
EAPI=3
-PYTHON_DEPEND=2:2.6
+PYTHON_DEPEND=2:2.7
PYTHON_USE_WITH=sqlite
inherit python distutils eutils fdo-mime bash-completion multilib
@@ -33,7 +33,7 @@
>=dev-python/lxml-2.2.1
>=dev-python/mechanize-0.1.11
>=dev-python/python-dateutil-1.4.1
- >=dev-python/PyQt4-4.7[X,svg,webkit]
+ >=dev-python/PyQt4-4.8.2[X,svg,webkit]
|| ( >=media-gfx/imagemagick-6.5.9 media-gfx/graphicsmagick[imagemagick] )
>=media-libs/libwmf-0.2.8
virtual/libusb:0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-22 20:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-19 9:34 [gentoo-commits] gentoo-x86 commit in app-text/calibre: ChangeLog calibre-0.7.46.ebuild Zac Medico (zmedico)
-- strict thread matches above, loose matches on Subject: below --
2011-02-22 20:10 Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox