1 |
patrick 09/09/10 00:32:31 |
2 |
|
3 |
Modified: ChangeLog IcePy-3.2.1.ebuild |
4 |
Log: |
5 |
Fixing py 2.6 and 2.7 detection. Fixes #280075, Patch by Lars Wendler. |
6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.12 dev-python/IcePy/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/ChangeLog?rev=1.12&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/ChangeLog?rev=1.12&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/ChangeLog?r1=1.11&r2=1.12 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v |
18 |
retrieving revision 1.11 |
19 |
retrieving revision 1.12 |
20 |
diff -u -r1.11 -r1.12 |
21 |
--- ChangeLog 17 Jan 2008 14:08:07 -0000 1.11 |
22 |
+++ ChangeLog 10 Sep 2009 00:32:30 -0000 1.12 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-python/IcePy |
25 |
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.11 2008/01/17 14:08:07 caleb Exp $ |
27 |
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/ChangeLog,v 1.12 2009/09/10 00:32:30 patrick Exp $ |
29 |
+ |
30 |
+ 10 Sep 2009; Patrick Lauer <patrick@g.o> IcePy-3.2.1.ebuild, |
31 |
+ +files/IcePy-3.2.1-python-2.6.diff: |
32 |
+ Fixing py 2.6 and 2.7 detection. Fixes #280075, Patch by Lars Wendler. |
33 |
|
34 |
17 Jan 2008; Caleb Tennis <caleb@g.o> IcePy-3.2.1.ebuild: |
35 |
set the PYTHON_VERSION environment variable so we pick the right version, |
36 |
|
37 |
|
38 |
|
39 |
1.6 dev-python/IcePy/IcePy-3.2.1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild?rev=1.6&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild?rev=1.6&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild?r1=1.5&r2=1.6 |
44 |
|
45 |
Index: IcePy-3.2.1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v |
48 |
retrieving revision 1.5 |
49 |
retrieving revision 1.6 |
50 |
diff -u -r1.5 -r1.6 |
51 |
--- IcePy-3.2.1.ebuild 17 Jan 2008 14:08:07 -0000 1.5 |
52 |
+++ IcePy-3.2.1.ebuild 10 Sep 2009 00:32:30 -0000 1.6 |
53 |
@@ -1,6 +1,8 @@ |
54 |
-# Copyright 1999-2008 Gentoo Foundation |
55 |
+# Copyright 1999-2009 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.5 2008/01/17 14:08:07 caleb Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/IcePy/IcePy-3.2.1.ebuild,v 1.6 2009/09/10 00:32:30 patrick Exp $ |
59 |
+ |
60 |
+EAPI="2" |
61 |
|
62 |
inherit eutils python multilib |
63 |
|
64 |
@@ -15,10 +17,7 @@ |
65 |
|
66 |
DEPEND="~dev-cpp/Ice-3.2.1" |
67 |
|
68 |
-src_unpack() { |
69 |
- unpack ${A} |
70 |
- cd "${S}" |
71 |
- |
72 |
+src_prepare() { |
73 |
python_version |
74 |
|
75 |
# Store the PYTHON_VERSION in a variable so the Makefile knows which one to use |
76 |
@@ -26,6 +25,7 @@ |
77 |
|
78 |
MAKE_RULES="${S}/config/Make.rules" |
79 |
epatch "${FILESDIR}/icepy-${PV}-makefile.patch" |
80 |
+ epatch "${FILESDIR}/IcePy-${PV}-python-2.6.diff" |
81 |
|
82 |
if use amd64; then |
83 |
sed -i -e "s:^#LP64:LP64:g" "${MAKE_RULES}" || die "Failed to set lib64 directory" |