* [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-2.18.0.ebuild ChangeLog
@ 2015-02-01 11:54 Ben de Groot (yngwin)
0 siblings, 0 replies; 2+ messages in thread
From: Ben de Groot (yngwin) @ 2015-02-01 11:54 UTC (permalink / raw
To: gentoo-commits
yngwin 15/02/01 11:54:46
Modified: ChangeLog
Added: calibre-2.18.0.ebuild
Log:
version bump
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)
Revision Changes Path
1.339 app-text/calibre/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.339&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.339&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?r1=1.338&r2=1.339
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- ChangeLog 9 Dec 2014 16:24:29 -0000 1.338
+++ ChangeLog 1 Feb 2015 11:54:46 -0000 1.339
@@ -1,6 +1,11 @@
# ChangeLog for app-text/calibre
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.338 2014/12/09 16:24:29 axs Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.339 2015/02/01 11:54:46 yngwin Exp $
+
+*calibre-2.18.0 (01 Feb 2015)
+
+ 01 Feb 2015; Ben de Groot <yngwin@gentoo.org> +calibre-2.18.0.ebuild:
+ version bump
*calibre-2.12.0 (09 Dec 2014)
1.1 app-text/calibre/calibre-2.18.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild?rev=1.1&content-type=text/plain
Index: calibre-2.18.0.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild,v 1.1 2015/02/01 11:54:46 yngwin Exp $
EAPI=5
inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
DESCRIPTION="Ebook management application"
HOMEPAGE="http://calibre-ebook.com/"
[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
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"
# Note, dropped dep on >=app-text/poppler-0.20.2:=[qt4,xpdf-headers(+)] as #1, its qt5 now, and
# 2, because repoman blew up when it was there, and my installed copy doesnt seem to link to it.
COMMON_DEPEND="
>=app-text/podofo-0.8.2:=
>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
>=dev-libs/chmlib-0.40:=
>=dev-libs/icu-4.4:=
dev-libs/glib:2
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
>=media-gfx/imagemagick-6.5.9[jpeg,png]
media-libs/fontconfig
>=media-libs/freetype-2:=
>=media-libs/libmtp-1.1.5:=
sys-libs/zlib
udisks? ( virtual/libudev )
x11-libs/libX11
x11-libs/libXext
x11-libs/libXrender
>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
dev-python/netifaces[python_targets_python2_7(-)]
>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
media-fonts/liberation-fonts
>=media-libs/libwmf-0.2.8
virtual/libusb:1=
virtual/python-imaging[python_targets_python2_7(-)]
>=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
>=virtual/podofo-build-0.8.2"
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"
# use system beautifulsoup, instead of bundled
rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
|| die "could not remove bundled beautifulsoup"
find "${S}" -type f -name \*.py -exec \
sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
|| die "could not sed bundled beautifulsoup out of the source tree"
# avoid failure of xdg tools to recognize vendor prefix
sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-i "${S}"/src/calibre/linux.py || die 'sed failed'
# 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}-2.9.0-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}
echo $0 : $@
exit 0
EOF
cp "${T}"/{kbuildsycoca,update-mime-database}
chmod +x "${T}"/{kbuildsycoca,update-mime-database}
export QMAKE="/usr/lib/qt5/bin/qmake"
# 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_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
tc-export CC CXX
# Bug #334243 - respect LDFLAGS when building extensions
export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
local libdir=$(get_libdir)
[[ -n $libdir ]] || die "get_libdir returned an empty string"
# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
local x
for x in /dev/dri/card[0-9] ; do
[[ -e ${x} ]] && addpredict ${x}
done
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"
# 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"
find "${ED}"usr/share -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
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-2.18.0.ebuild ChangeLog
@ 2015-02-02 19:33 Mikle Kolyada (zlogene)
0 siblings, 0 replies; 2+ messages in thread
From: Mikle Kolyada (zlogene) @ 2015-02-02 19:33 UTC (permalink / raw
To: gentoo-commits
zlogene 15/02/02 19:33:00
Modified: calibre-2.18.0.ebuild ChangeLog
Log:
Add ~arm keyword
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xC42EB5D6)
Revision Changes Path
1.2 app-text/calibre/calibre-2.18.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild?r1=1.1&r2=1.2
Index: calibre-2.18.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- calibre-2.18.0.ebuild 1 Feb 2015 11:54:46 -0000 1.1
+++ calibre-2.18.0.ebuild 2 Feb 2015 19:33:00 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild,v 1.1 2015/02/01 11:54:46 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.18.0.ebuild,v 1.2 2015/02/02 19:33:00 zlogene Exp $
EAPI=5
@@ -32,7 +32,7 @@
unRAR
"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
SLOT="0"
IUSE="+udisks"
1.340 app-text/calibre/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.340&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?rev=1.340&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/calibre/ChangeLog?r1=1.339&r2=1.340
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- ChangeLog 1 Feb 2015 11:54:46 -0000 1.339
+++ ChangeLog 2 Feb 2015 19:33:00 -0000 1.340
@@ -1,6 +1,9 @@
# ChangeLog for app-text/calibre
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.339 2015/02/01 11:54:46 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.340 2015/02/02 19:33:00 zlogene Exp $
+
+ 02 Feb 2015; Mikle Kolyada <zlogene@gentoo.org> calibre-2.18.0.ebuild:
+ Add ~arm keyword
*calibre-2.18.0 (01 Feb 2015)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-02 19:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-01 11:54 [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-2.18.0.ebuild ChangeLog Ben de Groot (yngwin)
-- strict thread matches above, loose matches on Subject: below --
2015-02-02 19:33 Mikle Kolyada (zlogene)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox