Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-db/metakit: metakit-2.4.9.7.ebuild ChangeLog metakit-2.4.9.6.ebuild
Date: Sun, 04 Apr 2010 21:36:21
Message-Id: E1NyXUP-0005ow-2j@stork.gentoo.org
1 arfrever 10/04/04 21:36:17
2
3 Modified: metakit-2.4.9.7.ebuild ChangeLog
4 metakit-2.4.9.6.ebuild
5 Log:
6 Delete calls to deprecated python_version().
7 (Portage version: HEAD/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.4 dev-db/metakit/metakit-2.4.9.7.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild?r1=1.3&r2=1.4
15
16 Index: metakit-2.4.9.7.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- metakit-2.4.9.7.ebuild 22 Feb 2010 11:46:57 -0000 1.3
23 +++ metakit-2.4.9.7.ebuild 4 Apr 2010 21:36:16 -0000 1.4
24 @@ -1,8 +1,8 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.3 2010/02/22 11:46:57 phajdan.jr Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.7.ebuild,v 1.4 2010/04/04 21:36:16 arfrever Exp $
29
30 -inherit python multilib eutils
31 +inherit eutils multilib python
32
33 DESCRIPTION="Embedded database library"
34 HOMEPAGE="http://www.equi4.com/metakit/"
35 @@ -11,7 +11,7 @@
36 LICENSE="MIT"
37 SLOT="0"
38 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
39 -IUSE="python tcl static"
40 +IUSE="python static tcl"
41
42 DEPEND=">=sys-apps/sed-4
43 python? ( >=dev-lang/python-2.2.1 )
44 @@ -20,21 +20,19 @@
45 RESTRICT="test"
46
47 src_unpack() {
48 - python_version
49 -
50 unpack ${A}
51 cd "${S}"
52
53 # Fix all hardcoded python2.5 paths
54 - for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp ; do
55 - sed -i -e "s:Python.h:python${PYVER}/Python.h:" ${name}
56 + for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp; do
57 + sed -i -e "s:Python.h:python$(python_get_version)/Python.h:" ${name}
58 done
59 - sed -i -e "s:python2.5:python${PYVER}:" unix/configure
60 + sed -i -e "s:python2.5:python$(python_get_version):" unix/configure
61 }
62
63 src_compile() {
64 local myconf mycxxflags
65 - use python && myconf="--with-python=/usr/include/python${PYVER},/usr/$(get_libdir)/python${PYVER}/site-packages"
66 + use python && myconf="--with-python=$(python_get_includedir),$(python_get_sitedir)"
67 use tcl && myconf="${myconf} --with-tcl=/usr/include,/usr/$(get_libdir)"
68 use static && myconf="${myconf} --disable-shared"
69 use static || mycxxflags="-fPIC"
70 @@ -53,9 +51,7 @@
71 }
72
73 src_install () {
74 - python_version
75 -
76 - use python && dodir /usr/$(get_libdir)/python${PYVER}/site-packages
77 + use python && dodir $(python_get_sitedir)
78 make DESTDIR="${D}" install || die
79
80 dodoc CHANGES README
81
82
83
84 1.46 dev-db/metakit/ChangeLog
85
86 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/ChangeLog?rev=1.46&view=markup
87 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/ChangeLog?rev=1.46&content-type=text/plain
88 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/ChangeLog?r1=1.45&r2=1.46
89
90 Index: ChangeLog
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v
93 retrieving revision 1.45
94 retrieving revision 1.46
95 diff -u -r1.45 -r1.46
96 --- ChangeLog 22 Feb 2010 11:46:57 -0000 1.45
97 +++ ChangeLog 4 Apr 2010 21:36:16 -0000 1.46
98 @@ -1,6 +1,10 @@
99 # ChangeLog for dev-db/metakit
100 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
101 -# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.45 2010/02/22 11:46:57 phajdan.jr Exp $
102 +# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.46 2010/04/04 21:36:16 arfrever Exp $
103 +
104 + 04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
105 + metakit-2.4.9.6.ebuild, metakit-2.4.9.7.ebuild:
106 + Delete calls to deprecated python_version().
107
108 22 Feb 2010; Pawel Hajdan jr <phajdan.jr@g.o>
109 metakit-2.4.9.7.ebuild:
110
111
112
113 1.8 dev-db/metakit/metakit-2.4.9.6.ebuild
114
115 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild?rev=1.8&view=markup
116 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild?rev=1.8&content-type=text/plain
117 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild?r1=1.7&r2=1.8
118
119 Index: metakit-2.4.9.6.ebuild
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild,v
122 retrieving revision 1.7
123 retrieving revision 1.8
124 diff -u -r1.7 -r1.8
125 --- metakit-2.4.9.6.ebuild 24 Jun 2007 21:51:51 -0000 1.7
126 +++ metakit-2.4.9.6.ebuild 4 Apr 2010 21:36:16 -0000 1.8
127 @@ -1,8 +1,8 @@
128 -# Copyright 1999-2007 Gentoo Foundation
129 +# Copyright 1999-2010 Gentoo Foundation
130 # Distributed under the terms of the GNU General Public License v2
131 -# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild,v 1.7 2007/06/24 21:51:51 vapier Exp $
132 +# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.6.ebuild,v 1.8 2010/04/04 21:36:16 arfrever Exp $
133
134 -inherit python multilib eutils
135 +inherit eutils multilib python
136
137 DESCRIPTION="Embedded database library"
138 HOMEPAGE="http://www.equi4.com/metakit/"
139 @@ -11,7 +11,7 @@
140 LICENSE="MIT"
141 SLOT="0"
142 KEYWORDS="amd64 ~hppa ia64 ppc s390 sparc x86"
143 -IUSE="python tcl static"
144 +IUSE="python static tcl"
145
146 DEPEND=">=sys-apps/sed-4
147 python? ( >=dev-lang/python-2.2.1 )
148 @@ -20,19 +20,19 @@
149 RESTRICT="test"
150
151 src_unpack() {
152 - python_version
153 + unpack ${A}
154 + cd "${S}"
155
156 - unpack ${A} ; cd ${S}
157 # Fix all hardcoded python2.5 paths
158 - for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp ; do
159 - sed -i -e "s:Python.h:python${PYVER}/Python.h:" ${name}
160 + for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp; do
161 + sed -i -e "s:Python.h:python$(python_get_version)/Python.h:" ${name}
162 done
163 - sed -i -e "s:python2.5:python${PYVER}:" unix/configure
164 + sed -i -e "s:python2.5:python$(python_get_version):" unix/configure
165 }
166
167 src_compile() {
168 local myconf mycxxflags
169 - use python && myconf="--with-python=/usr/include/python${PYVER},/usr/$(get_libdir)/python${PYVER}/site-packages"
170 + use python && myconf="--with-python=$(python_get_includedir),$(python_get_sitedir)"
171 use tcl && myconf="${myconf} --with-tcl=/usr/include,/usr/$(get_libdir)"
172 use static && myconf="${myconf} --disable-shared"
173 use static || mycxxflags="-fPIC"
174 @@ -51,10 +51,8 @@
175 }
176
177 src_install () {
178 - python_version
179 -
180 - use python && dodir /usr/$(get_libdir)/python${PYVER}/site-packages
181 - make DESTDIR=${D} install || die
182 + use python && dodir $(python_get_sitedir)
183 + make DESTDIR="${D}" install || die
184
185 dodoc CHANGES README WHATSNEW
186 dohtml MetaKit.html
Report Message
Find on MARC Find on Google Groups