summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-06-15 21:35:36 +0000
committerZac Medico <zmedico@gentoo.org>2012-06-15 21:35:36 +0000
commite6ad7e027f4e56531b29d4d4a3b667451c1e04f9 (patch)
tree7cbeca0d2641cd28104129d747b0d8a30f0d4ddb /app-text/calibre
parentStable for amd64, wrt bug #366813 (diff)
downloadgentoo-2-e6ad7e027f4e56531b29d4d4a3b667451c1e04f9.tar.gz
gentoo-2-e6ad7e027f4e56531b29d4d4a3b667451c1e04f9.tar.bz2
gentoo-2-e6ad7e027f4e56531b29d4d4a3b667451c1e04f9.zip
0.8.56 version bump.
(Portage version: 2.2.0_alpha110_p32/cvs/Linux i686)
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/ChangeLog9
-rw-r--r--app-text/calibre/calibre-0.8.56.ebuild (renamed from app-text/calibre/calibre-0.8.54.ebuild)6
2 files changed, 11 insertions, 4 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 706405c53bd5..ce21c325bd09 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
# 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.210 2012/06/11 22:06:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.211 2012/06/15 21:35:36 zmedico Exp $
+
+*calibre-0.8.56 (15 Jun 2012)
+
+ 15 Jun 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.56.ebuild,
+ -calibre-0.8.54.ebuild:
+ 0.8.56 version bump.
11 Jun 2012; Zac Medico <zmedico@gentoo.org> calibre-0.8.55.ebuild:
Add new qt-dbus and qt-svg deps for building calibre_style.so.
@@ -1095,4 +1101,3 @@
Initial import of calibre (formerly libprs500), software to handle PRS-500
and PRS-505 e-Book readers by Sony. Thanks to drac who committed the
xdg-utils patch it can finally enter the tree.
-
diff --git a/app-text/calibre/calibre-0.8.54.ebuild b/app-text/calibre/calibre-0.8.56.ebuild
index ea814b2cfb95..021833b7ff55 100644
--- a/app-text/calibre/calibre-0.8.54.ebuild
+++ b/app-text/calibre/calibre-0.8.56.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.8.54.ebuild,v 1.1 2012/05/31 21:59:19 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.56.ebuild,v 1.1 2012/06/15 21:35:36 zmedico Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
@@ -38,6 +38,8 @@ COMMON_DEPEND="
>=media-gfx/imagemagick-6.5.9[jpeg,png]
>=media-libs/libwmf-0.2.8
virtual/libusb:0
+ x11-libs/qt-dbus:4
+ x11-libs/qt-svg:4
>=x11-misc/xdg-utils-1.0.2-r2"
RDEPEND="${COMMON_DEPEND}
@@ -73,7 +75,7 @@ src_prepare() {
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 + \\[ext\\.name+'\\.pro'\\])$/a\
+ sed -e "/^ self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \