Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/botan: ChangeLog botan-1.8.8-r1.ebuild
Date: Tue, 30 Mar 2010 18:35:52
Message-Id: E1NwgI1-00034P-2l@stork.gentoo.org
1 arfrever 10/03/30 18:35:49
2
3 Modified: ChangeLog botan-1.8.8-r1.ebuild
4 Log:
5 Set Python 2 as active version of Python.
6 (Portage version: 15841-svn/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.57 dev-libs/botan/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?rev=1.57&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?rev=1.57&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/ChangeLog?r1=1.56&r2=1.57
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v
18 retrieving revision 1.56
19 retrieving revision 1.57
20 diff -u -r1.56 -r1.57
21 --- ChangeLog 4 Feb 2010 04:20:51 -0000 1.56
22 +++ ChangeLog 30 Mar 2010 18:35:48 -0000 1.57
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-libs/botan
25 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.56 2010/02/04 04:20:51 hwoarang Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/ChangeLog,v 1.57 2010/03/30 18:35:48 arfrever Exp $
28 +
29 + 30 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
30 + botan-1.8.8-r1.ebuild:
31 + Set Python 2 as active version of Python.
32
33 04 Feb 2010; Markos Chandras <hwoarang@g.o> botan-1.8.8.ebuild:
34 Stable on amd64 wrt bug #295701
35
36
37
38 1.2 dev-libs/botan/botan-1.8.8-r1.ebuild
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild?rev=1.2&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild?rev=1.2&content-type=text/plain
42 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild?r1=1.1&r2=1.2
43
44 Index: botan-1.8.8-r1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild,v
47 retrieving revision 1.1
48 retrieving revision 1.2
49 diff -u -r1.1 -r1.2
50 --- botan-1.8.8-r1.ebuild 23 Jan 2010 15:18:58 -0000 1.1
51 +++ botan-1.8.8-r1.ebuild 30 Mar 2010 18:35:48 -0000 1.2
52 @@ -1,10 +1,10 @@
53 # Copyright 1999-2010 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild,v 1.1 2010/01/23 15:18:58 grobian Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/botan/botan-1.8.8-r1.ebuild,v 1.2 2010/03/30 18:35:48 arfrever Exp $
57
58 -EAPI="2"
59 +EAPI="3"
60
61 -inherit eutils multilib toolchain-funcs
62 +inherit eutils multilib python toolchain-funcs
63
64 MY_PN="Botan"
65 MY_P="${MY_PN}-${PV}"
66 @@ -25,11 +25,18 @@
67 ssl? ( >=dev-libs/openssl-0.9.8g )"
68
69 DEPEND="${RDEPEND}
70 - >=dev-lang/python-2.4"
71 + =dev-lang/python-2*"
72 +
73 +pkg_setup() {
74 + python_set_active_version 2
75 +}
76
77 src_prepare() {
78 epatch "${FILESDIR}/${P}-use_negative_lea_displacement.patch"
79 - epatch "${FILESDIR}"/${P}-darwin-install_name-fix.patch
80 + epatch "${FILESDIR}/${P}-darwin-install_name-fix.patch"
81 +
82 + # Install documentation in /usr/share/doc/${PF}.
83 + sed -e "/^DOCDIR *=/s/Botan-\$(VERSION)/${PF}/" -i src/build-data/makefile/unix_shr.in || die "sed failed"
84 }
85
86 src_configure() {
87 @@ -59,7 +66,7 @@
88 # install in src_install, we need the correct live-system prefix here on
89 # Darwin for a shared lib with correct install_name
90 ./configure.py \
91 - --prefix="${EPREFIX}"/usr \
92 + --prefix="${EPREFIX}/usr" \
93 --libdir=$(get_libdir) \
94 --docdir=share/doc \
95 --cc=gcc \
96 @@ -86,8 +93,5 @@
97 }
98
99 src_install() {
100 - emake DESTDIR="${D%/}${EPREFIX}/usr" install || die "emake install failed"
101 - # do the move as a two-stage operation for case-INsensitive filesystems
102 - mv "${D%/}${EPREFIX}"/usr/share/doc/{Botan-${PV},tbm} || die
103 - mv "${D%/}${EPREFIX}"/usr/share/doc/{tbm,${PF}} || die
104 + emake DESTDIR="${ED}usr" install || die "emake install failed"
105 }