| 1 |
arfrever 10/02/06 15:08:30 |
| 2 |
|
| 3 |
Modified: pyfltk-1.1.5.ebuild pyfltk-1.1.4.ebuild |
| 4 |
Log: |
| 5 |
Use $(PYTHON -f) instead of ${python}. |
| 6 |
(Portage version: 15324-svn/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-python/pyfltk/pyfltk-1.1.5.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: pyfltk-1.1.5.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- pyfltk-1.1.5.ebuild 21 Jan 2010 01:33:42 -0000 1.1 |
| 22 |
+++ pyfltk-1.1.5.ebuild 6 Feb 2010 15:08:30 -0000 1.2 |
| 23 |
@@ -1,8 +1,9 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild,v 1.1 2010/01/21 01:33:42 bicatali Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild,v 1.2 2010/02/06 15:08:30 arfrever Exp $ |
| 28 |
|
| 29 |
EAPI="2" |
| 30 |
+PYTHON_DEPEND="2" |
| 31 |
SUPPORT_PYTHON_ABIS="1" |
| 32 |
|
| 33 |
inherit eutils distutils |
| 34 |
@@ -22,15 +23,14 @@ |
| 35 |
RDEPEND=">=x11-libs/fltk-1.1.9:1.1[opengl]" |
| 36 |
DEPEND="${RDEPEND} |
| 37 |
dev-lang/swig" |
| 38 |
- |
| 39 |
-RESTRICT_PYTHON_ABIS="3*" |
| 40 |
- |
| 41 |
-PYTHON_MODNAME="fltk" |
| 42 |
+RESTRICT_PYTHON_ABIS="3.*" |
| 43 |
|
| 44 |
S="${WORKDIR}/${MY_P}" |
| 45 |
|
| 46 |
DOCS="CHANGES" |
| 47 |
|
| 48 |
+PYTHON_MODNAME="fltk" |
| 49 |
+ |
| 50 |
src_prepare() { |
| 51 |
rm -f python/fltk* |
| 52 |
# move docs because the swig stuff will remove them |
| 53 |
@@ -38,9 +38,10 @@ |
| 54 |
} |
| 55 |
|
| 56 |
src_compile() { |
| 57 |
- cd "${S}"/python |
| 58 |
- ${python} MakeSwig.py || die "swigging wrappers failed" |
| 59 |
- cd "${S}" |
| 60 |
+ pushd python > /dev/null |
| 61 |
+ "$(PYTHON -f)" MakeSwig.py || die "swigging wrappers failed" |
| 62 |
+ popd > /dev/null |
| 63 |
+ |
| 64 |
distutils_src_compile |
| 65 |
} |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.7 dev-python/pyfltk/pyfltk-1.1.4.ebuild |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.4.ebuild?rev=1.7&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.4.ebuild?rev=1.7&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.4.ebuild?r1=1.6&r2=1.7 |
| 75 |
|
| 76 |
Index: pyfltk-1.1.4.ebuild |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.4.ebuild,v |
| 79 |
retrieving revision 1.6 |
| 80 |
retrieving revision 1.7 |
| 81 |
diff -u -r1.6 -r1.7 |
| 82 |
--- pyfltk-1.1.4.ebuild 24 Nov 2009 00:03:53 -0000 1.6 |
| 83 |
+++ pyfltk-1.1.4.ebuild 6 Feb 2010 15:08:30 -0000 1.7 |
| 84 |
@@ -1,8 +1,9 @@ |
| 85 |
-# Copyright 1999-2009 Gentoo Foundation |
| 86 |
+# Copyright 1999-2010 Gentoo Foundation |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.4.ebuild,v 1.6 2009/11/24 00:03:53 bicatali Exp $ |
| 89 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.4.ebuild,v 1.7 2010/02/06 15:08:30 arfrever Exp $ |
| 90 |
|
| 91 |
EAPI="2" |
| 92 |
+PYTHON_DEPEND="2" |
| 93 |
SUPPORT_PYTHON_ABIS="1" |
| 94 |
|
| 95 |
inherit eutils distutils |
| 96 |
@@ -22,15 +23,14 @@ |
| 97 |
RDEPEND=">=x11-libs/fltk-1.1.9:1.1[opengl]" |
| 98 |
DEPEND="${RDEPEND} |
| 99 |
dev-lang/swig" |
| 100 |
- |
| 101 |
-RESTRICT_PYTHON_ABIS="3*" |
| 102 |
- |
| 103 |
-PYTHON_MODNAME="fltk" |
| 104 |
+RESTRICT_PYTHON_ABIS="3.*" |
| 105 |
|
| 106 |
S="${WORKDIR}/${MY_P}" |
| 107 |
|
| 108 |
DOCS="CHANGES" |
| 109 |
|
| 110 |
+PYTHON_MODNAME="fltk" |
| 111 |
+ |
| 112 |
src_prepare() { |
| 113 |
rm -f python/fltk* |
| 114 |
# move docs because the swig stuff will remove them |
| 115 |
@@ -38,9 +38,10 @@ |
| 116 |
} |
| 117 |
|
| 118 |
src_compile() { |
| 119 |
- cd "${S}"/python |
| 120 |
- ${python} MakeSwig.py || die "swigging wrappers failed" |
| 121 |
- cd "${S}" |
| 122 |
+ pushd python > /dev/null |
| 123 |
+ "$(PYTHON -f)" MakeSwig.py || die "swigging wrappers failed" |
| 124 |
+ popd > /dev/null |
| 125 |
+ |
| 126 |
distutils_src_compile |
| 127 |
} |
Archives