diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-08-27 17:59:55 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-08-27 17:59:55 +0000 |
| commit | 09a7053dcea159cbd8ac52271b286cd3b2e1898d (patch) | |
| tree | 388905cef8a874442dfc81beb41a3cb2fa24202e /sci-geosciences | |
| parent | drop old (diff) | |
| download | historical-09a7053dcea159cbd8ac52271b286cd3b2e1898d.tar.gz historical-09a7053dcea159cbd8ac52271b286cd3b2e1898d.tar.bz2 historical-09a7053dcea159cbd8ac52271b286cd3b2e1898d.zip | |
Refactor python-stuff in src_prepare into python_prepare_all.
Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/gpsd/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-9999.ebuild | 39 |
2 files changed, 25 insertions, 19 deletions
diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index b86ef40b9e53..e73d49d23017 100644 --- a/sci-geosciences/gpsd/ChangeLog +++ b/sci-geosciences/gpsd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-geosciences/gpsd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.110 2013/08/26 16:53:49 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.111 2013/08/27 17:59:55 floppym Exp $ + + 27 Aug 2013; Mike Gilbert <floppym@gentoo.org> gpsd-9999.ebuild: + Refactor python-stuff in src_prepare into python_prepare_all. 26 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gpsd-3.9.ebuild: Stable for ppc, wrt bug #468262 diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild index a4cc18f68dc3..bbd8853febc6 100644 --- a/sci-geosciences/gpsd/gpsd-9999.ebuild +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.13 2013/08/25 17:00:54 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.14 2013/08/27 17:59:55 floppym Exp $ EAPI="5" @@ -82,24 +82,27 @@ src_prepare() { -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ SConstruct || die + use python && distutils-r1_src_prepare +} + +python_prepare_all() { + python_export_best # Extract python info out of SConstruct so we can use saner distribute - if use python ; then - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs) - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$(python -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$(python -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") - sed \ - -e "s|@VERSION@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ - -e "s|@SCRIPTS@|$(pyvar python_progs)|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die - distutils-r1_src_prepare - fi + pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } + local pybins=$(pyvar python_progs) + local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) + local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") + local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") + sed \ + -e "s|@VERSION@|$(pyvar gpsd_version)|" \ + -e "s|@URL@|$(pyvar website)|" \ + -e "s|@EMAIL@|$(pyvar devmail)|" \ + -e "s|@SCRIPTS@|${pybins}|" \ + -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ + -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ + -e "s|@SCRIPTS@|$(pyvar python_progs)|" \ + "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die + distutils-r1_python_prepare_all } src_configure() { |