summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-08-24 20:28:26 +0000
committerZac Medico <zmedico@gentoo.org>2012-08-24 20:28:26 +0000
commitadb365ac70de25b48e32068fcc28cc74099d18e4 (patch)
tree73a32a51e4e91166b224aab3d6df8a34603357ce /app-text/calibre
parentBump to new prerelease. (diff)
downloadgentoo-2-adb365ac70de25b48e32068fcc28cc74099d18e4.tar.gz
gentoo-2-adb365ac70de25b48e32068fcc28cc74099d18e4.tar.bz2
gentoo-2-adb365ac70de25b48e32068fcc28cc74099d18e4.zip
0.8.66 version bump.
(Portage version: 2.2.0_alpha122/cvs/Linux i686)
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/ChangeLog8
-rw-r--r--app-text/calibre/calibre-0.8.66.ebuild (renamed from app-text/calibre/calibre-0.8.64.ebuild)11
2 files changed, 12 insertions, 7 deletions
diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 854f43052806..ceb821e63b1a 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.222 2012/08/17 21:15:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.223 2012/08/24 20:28:26 zmedico Exp $
+
+*calibre-0.8.66 (24 Aug 2012)
+
+ 24 Aug 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.66.ebuild,
+ -calibre-0.8.64.ebuild:
+ 0.8.66 version bump.
*calibre-0.8.65 (17 Aug 2012)
diff --git a/app-text/calibre/calibre-0.8.64.ebuild b/app-text/calibre/calibre-0.8.66.ebuild
index 8934b3b5610f..a8d1b9191fc3 100644
--- a/app-text/calibre/calibre-0.8.64.ebuild
+++ b/app-text/calibre/calibre-0.8.66.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.64.ebuild,v 1.1 2012/08/10 22:20:13 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.66.ebuild,v 1.1 2012/08/24 20:28:26 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/"
@@ -84,8 +84,6 @@ src_prepare() {
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
'-i', 'Makefile'])" \
-i setup/extensions.py || die "sed failed to patch extensions.py"
-
- distutils_src_prepare
}
src_install() {
@@ -127,11 +125,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"