summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-08-17 21:15:57 +0000
committerZac Medico <zmedico@gentoo.org>2012-08-17 21:15:57 +0000
commit8088990ba434468ec7b0a3c62d4de988bf9cba32 (patch)
tree6bea9e32b4e214f2efd49f3f6cbfa538f1f460e6
parentfix decode error for LANG=C, bug #431316, thanks travlr (diff)
downloadgentoo-2-8088990ba434468ec7b0a3c62d4de988bf9cba32.tar.gz
gentoo-2-8088990ba434468ec7b0a3c62d4de988bf9cba32.tar.bz2
gentoo-2-8088990ba434468ec7b0a3c62d4de988bf9cba32.zip
0.8.65 version bump.
(Portage version: 2.2.0_alpha121/cvs/Linux i686)
-rw-r--r--app-text/calibre/ChangeLog8
-rw-r--r--app-text/calibre/calibre-0.8.65.ebuild (renamed from app-text/calibre/calibre-0.8.63.ebuild)13
2 files changed, 14 insertions, 7 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 2603cc4a2dfa..854f43052806 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.221 2012/08/10 22:20:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.222 2012/08/17 21:15:57 zmedico Exp $
+
+*calibre-0.8.65 (17 Aug 2012)
+
+ 17 Aug 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.65.ebuild,
+ -calibre-0.8.63.ebuild:
+ 0.8.65 version bump.
*calibre-0.8.64 (10 Aug 2012)
diff --git a/app-text/calibre/calibre-0.8.63.ebuild b/app-text/calibre/calibre-0.8.65.ebuild
index 49b3906b5b6c..7d6faabfd667 100644
--- a/app-text/calibre/calibre-0.8.63.ebuild
+++ b/app-text/calibre/calibre-0.8.65.ebuild
@@ -1,12 +1,12 @@
# 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.63.ebuild,v 1.2 2012/08/08 16:23:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.65.ebuild,v 1.1 2012/08/17 21:15:57 zmedico Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
PYTHON_USE_WITH="ssl sqlite"
-inherit python distutils eutils fdo-mime bash-completion-r1 multilib
+inherit python eutils fdo-mime bash-completion-r1 multilib
DESCRIPTION="Ebook management application."
HOMEPAGE="http://calibre-ebook.com/"
@@ -37,6 +37,7 @@ COMMON_DEPEND="
>=dev-python/PyQt4-4.9.1[X,svg,webkit]
>=media-gfx/imagemagick-6.5.9[jpeg,png]
>=media-libs/libwmf-0.2.8
+ media-libs/libmtp
virtual/libusb:0
x11-libs/qt-dbus:4
x11-libs/qt-svg:4
@@ -82,9 +83,8 @@ src_prepare() {
'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
'-i', 'Makefile'])" \
+ -e "s:if not opts.only:if True:" \
-i setup/extensions.py || die "sed failed to patch extensions.py"
-
- distutils_src_prepare
}
src_install() {
@@ -126,11 +126,12 @@ src_install() {
dodir "$(python_get_sitedir)" # for init_calibre.py
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
- distutils_src_install \
+ python setup.py install \
+ --root="${D}" \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/${libdir}" \
--staging-root="${ED}usr" \
- --staging-libdir="${ED}usr/${libdir}"
+ --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"