| 1 |
floppym 13/08/27 17:59:56 |
| 2 |
|
| 3 |
Modified: gpsd-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Refactor python-stuff in src_prepare into python_prepare_all. |
| 6 |
|
| 7 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.14 sci-geosciences/gpsd/gpsd-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.14&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.14&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.13&r2=1.14 |
| 15 |
|
| 16 |
Index: gpsd-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v |
| 19 |
retrieving revision 1.13 |
| 20 |
retrieving revision 1.14 |
| 21 |
diff -u -r1.13 -r1.14 |
| 22 |
--- gpsd-9999.ebuild 25 Aug 2013 17:00:54 -0000 1.13 |
| 23 |
+++ gpsd-9999.ebuild 27 Aug 2013 17:59:55 -0000 1.14 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.13 2013/08/25 17:00:54 floppym Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.14 2013/08/27 17:59:55 floppym Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -82,24 +82,27 @@ |
| 33 |
-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ |
| 34 |
SConstruct || die |
| 35 |
|
| 36 |
+ use python && distutils-r1_src_prepare |
| 37 |
+} |
| 38 |
+ |
| 39 |
+python_prepare_all() { |
| 40 |
+ python_export_best |
| 41 |
# Extract python info out of SConstruct so we can use saner distribute |
| 42 |
- if use python ; then |
| 43 |
- pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } |
| 44 |
- local pybins=$(pyvar python_progs) |
| 45 |
- local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) |
| 46 |
- local packet=$(python -c "${pysrcs}; print(python_extensions['gps/packet'])") |
| 47 |
- local client=$(python -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") |
| 48 |
- sed \ |
| 49 |
- -e "s|@VERSION@|$(pyvar gpsd_version)|" \ |
| 50 |
- -e "s|@URL@|$(pyvar website)|" \ |
| 51 |
- -e "s|@EMAIL@|$(pyvar devmail)|" \ |
| 52 |
- -e "s|@SCRIPTS@|${pybins}|" \ |
| 53 |
- -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ |
| 54 |
- -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ |
| 55 |
- -e "s|@SCRIPTS@|$(pyvar python_progs)|" \ |
| 56 |
- "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die |
| 57 |
- distutils-r1_src_prepare |
| 58 |
- fi |
| 59 |
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } |
| 60 |
+ local pybins=$(pyvar python_progs) |
| 61 |
+ local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) |
| 62 |
+ local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") |
| 63 |
+ local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") |
| 64 |
+ sed \ |
| 65 |
+ -e "s|@VERSION@|$(pyvar gpsd_version)|" \ |
| 66 |
+ -e "s|@URL@|$(pyvar website)|" \ |
| 67 |
+ -e "s|@EMAIL@|$(pyvar devmail)|" \ |
| 68 |
+ -e "s|@SCRIPTS@|${pybins}|" \ |
| 69 |
+ -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ |
| 70 |
+ -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ |
| 71 |
+ -e "s|@SCRIPTS@|$(pyvar python_progs)|" \ |
| 72 |
+ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die |
| 73 |
+ distutils-r1_python_prepare_all |
| 74 |
} |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.111 sci-geosciences/gpsd/ChangeLog |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.111&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.111&content-type=text/plain |
| 84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.110&r2=1.111 |
| 85 |
|
| 86 |
Index: ChangeLog |
| 87 |
=================================================================== |
| 88 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v |
| 89 |
retrieving revision 1.110 |
| 90 |
retrieving revision 1.111 |
| 91 |
diff -u -r1.110 -r1.111 |
| 92 |
--- ChangeLog 26 Aug 2013 16:53:49 -0000 1.110 |
| 93 |
+++ ChangeLog 27 Aug 2013 17:59:55 -0000 1.111 |
| 94 |
@@ -1,6 +1,9 @@ |
| 95 |
# ChangeLog for sci-geosciences/gpsd |
| 96 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 97 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.110 2013/08/26 16:53:49 ago Exp $ |
| 98 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.111 2013/08/27 17:59:55 floppym Exp $ |
| 99 |
+ |
| 100 |
+ 27 Aug 2013; Mike Gilbert <floppym@g.o> gpsd-9999.ebuild: |
| 101 |
+ Refactor python-stuff in src_prepare into python_prepare_all. |
| 102 |
|
| 103 |
26 Aug 2013; Agostino Sarubbo <ago@g.o> gpsd-3.9.ebuild: |
| 104 |
Stable for ppc, wrt bug #468262 |
Archives