Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/calibre: calibre-0.5.9-r1.ebuild ChangeLog
Date: Wed, 29 Apr 2009 06:32:54
Message-Id: E1Lz3Lc-0003ih-F1@stork.gentoo.org
1 zmedico 09/04/29 06:32:48
2
3 Modified: calibre-0.5.9-r1.ebuild ChangeLog
4 Log:
5 29 Apr 2009; Zac Medico <zmedico@g.o> calibre-0.5.9-r1.ebuild:
6 Move sed calls from src_compile to src_prepare, and call
7 bash-completion_pkg_postinst in pkg_postinst.
8 (Portage version: 2.2_rc31_p13404/cvs/Linux i686)
9
10 Revision Changes Path
11 1.3 app-text/calibre/calibre-0.5.9-r1.ebuild
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.5.9-r1.ebuild?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.5.9-r1.ebuild?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/calibre-0.5.9-r1.ebuild?r1=1.2&r2=1.3
16
17 Index: calibre-0.5.9-r1.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r1.ebuild,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- calibre-0.5.9-r1.ebuild 29 Apr 2009 04:45:10 -0000 1.2
24 +++ calibre-0.5.9-r1.ebuild 29 Apr 2009 06:32:48 -0000 1.3
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2009 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r1.ebuild,v 1.2 2009/04/29 04:45:10 zmedico Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.5.9-r1.ebuild,v 1.3 2009/04/29 06:32:48 zmedico Exp $
30
31 EAPI=2
32 NEED_PYTHON=2.6
33 @@ -47,14 +47,14 @@
34 >=x11-misc/xdg-utils-1.0.2-r2
35 sys-apps/help2man"
36
37 -src_compile() {
38 +src_prepare() {
39 # Removing the post_install call. We'll do that stuff in src_install.
40 sed -i -e "/if 'install'/,/subprocess.check_call/d" \
41 setup.py || die "couldn't remove post_install call"
42 # For help2man to succeed, we need to tell it the path to the tools.
43 sed -i -e "s:\('help2man',\) \(prog\):\1 \'PYTHONPATH=\"${D}$(python_get_sitedir)\" \' + \'${D}usr/bin/\' + \2:" \
44 src/calibre/linux.py || die "sed'ing in the IMAGE path failed"
45 - distutils_src_compile
46 + distutils_src_prepare
47 }
48
49 src_install() {
50 @@ -110,4 +110,5 @@
51 fdo-mime_desktop_database_update
52 fdo-mime_mime_database_update
53 distutils_pkg_postinst
54 + bash-completion_pkg_postinst
55 }
56
57
58
59 1.15 app-text/calibre/ChangeLog
60
61 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.15&view=markup
62 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?rev=1.15&content-type=text/plain
63 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/calibre/ChangeLog?r1=1.14&r2=1.15
64
65 Index: ChangeLog
66 ===================================================================
67 RCS file: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v
68 retrieving revision 1.14
69 retrieving revision 1.15
70 diff -u -r1.14 -r1.15
71 --- ChangeLog 29 Apr 2009 04:45:10 -0000 1.14
72 +++ ChangeLog 29 Apr 2009 06:32:48 -0000 1.15
73 @@ -1,6 +1,10 @@
74 # ChangeLog for app-text/calibre
75 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
76 -# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.14 2009/04/29 04:45:10 zmedico Exp $
77 +# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.15 2009/04/29 06:32:48 zmedico Exp $
78 +
79 + 29 Apr 2009; Zac Medico <zmedico@g.o> calibre-0.5.9-r1.ebuild:
80 + Move sed calls from src_compile to src_prepare, and call
81 + bash-completion_pkg_postinst in pkg_postinst.
82
83 29 Apr 2009; Zac Medico <zmedico@g.o> calibre-0.5.9-r1.ebuild:
84 Require python[sqlite] for traceback shown in bug #258938, comment #27.