* [gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd: gpsd-9999.ebuild ChangeLog
@ 2013-08-27 17:59 Mike Gilbert (floppym)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert (floppym) @ 2013-08-27 17:59 UTC (permalink / raw
To: gentoo-commits
floppym 13/08/27 17:59:56
Modified: gpsd-9999.ebuild ChangeLog
Log:
Refactor python-stuff in src_prepare into python_prepare_all.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.14 sci-geosciences/gpsd/gpsd-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.13&r2=1.14
Index: gpsd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gpsd-9999.ebuild 25 Aug 2013 17:00:54 -0000 1.13
+++ gpsd-9999.ebuild 27 Aug 2013 17:59:55 -0000 1.14
@@ -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 @@
-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() {
1.111 sci-geosciences/gpsd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.111&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.111&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.110&r2=1.111
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- ChangeLog 26 Aug 2013 16:53:49 -0000 1.110
+++ ChangeLog 27 Aug 2013 17:59:55 -0000 1.111
@@ -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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd: gpsd-9999.ebuild ChangeLog
@ 2015-02-18 19:43 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2015-02-18 19:43 UTC (permalink / raw
To: gentoo-commits
vapier 15/02/18 19:43:36
Modified: gpsd-9999.ebuild ChangeLog
Log:
Update build to match latest git.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.19 sci-geosciences/gpsd/gpsd-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.18&r2=1.19
Index: gpsd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gpsd-9999.ebuild 30 Oct 2014 21:20:36 -0000 1.18
+++ gpsd-9999.ebuild 18 Feb 2015 19:43:36 -0000 1.19
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.18 2014/10/30 21:20:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.19 2015/02/18 19:43:36 vapier Exp $
EAPI="5"
@@ -71,7 +71,6 @@
epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
- epatch "${FILESDIR}"/${PN}-3.11-hotplug-config.patch #511584
# Avoid useless -L paths to the install dir
sed -i \
@@ -109,7 +108,7 @@
chrpath=False
gpsd_user=gpsd
gpsd_group=uucp
- strip=False
+ nostrip=True
python=False
manbuild=False
shared=$(usex !static True False)
1.126 sci-geosciences/gpsd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.125&r2=1.126
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- ChangeLog 30 Oct 2014 21:32:38 -0000 1.125
+++ ChangeLog 18 Feb 2015 19:43:36 -0000 1.126
@@ -1,6 +1,9 @@
# ChangeLog for sci-geosciences/gpsd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.125 2014/10/30 21:32:38 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.126 2015/02/18 19:43:36 vapier Exp $
+
+ 18 Feb 2015; Mike Frysinger <vapier@gentoo.org> gpsd-9999.ebuild:
+ Update build to match latest git.
*gpsd-3.11 (30 Oct 2014)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd: gpsd-9999.ebuild ChangeLog
@ 2014-10-30 21:20 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-30 21:20 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/30 21:20:36
Modified: gpsd-9999.ebuild ChangeLog
Log:
Source /etc/conf.d/gpsd in hotplug rules #511584 by Mark Wagner.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.18 sci-geosciences/gpsd/gpsd-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.17&r2=1.18
Index: gpsd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- gpsd-9999.ebuild 30 Oct 2014 21:16:11 -0000 1.17
+++ gpsd-9999.ebuild 30 Oct 2014 21:20:36 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.17 2014/10/30 21:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.18 2014/10/30 21:20:36 vapier Exp $
EAPI="5"
@@ -71,6 +71,7 @@
epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
+ epatch "${FILESDIR}"/${PN}-3.11-hotplug-config.patch #511584
# Avoid useless -L paths to the install dir
sed -i \
1.123 sci-geosciences/gpsd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.123&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.123&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.122&r2=1.123
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- ChangeLog 30 Oct 2014 21:16:11 -0000 1.122
+++ ChangeLog 30 Oct 2014 21:20:36 -0000 1.123
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/gpsd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.122 2014/10/30 21:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.123 2014/10/30 21:20:36 vapier Exp $
+
+ 30 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+ +files/gpsd-3.11-hotplug-config.patch, files/gpsd.init-2, gpsd-9999.ebuild:
+ Source /etc/conf.d/gpsd in hotplug rules #511584 by Mark Wagner.
30 Oct 2014; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.11-rpath.patch,
gpsd-9999.ebuild:
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd: gpsd-9999.ebuild ChangeLog
@ 2014-10-30 21:16 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2014-10-30 21:16 UTC (permalink / raw
To: gentoo-commits
vapier 14/10/30 21:16:11
Modified: gpsd-9999.ebuild ChangeLog
Log:
Update ebuild to match latest git source #527000 by Michal Privoznik.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.17 sci-geosciences/gpsd/gpsd-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.16&r2=1.17
Index: gpsd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gpsd-9999.ebuild 30 Jul 2014 19:41:46 -0000 1.16
+++ gpsd-9999.ebuild 30 Oct 2014 21:16:11 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.16 2014/07/30 19:41:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.17 2014/10/30 21:16:11 vapier Exp $
EAPI="5"
@@ -26,7 +26,7 @@
GPSD_PROTOCOLS=(
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
- geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+ geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
tripmate tsip ublox
)
@@ -61,7 +61,7 @@
src_prepare() {
# Make sure our list matches the source.
local src_protocols=$(echo $(
- sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+ sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
) )
if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
eerror "Detected protocols: ${src_protocols}"
@@ -70,7 +70,7 @@
fi
epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
- epatch "${FILESDIR}"/${PN}-3.10-rpath.patch
+ epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
# Avoid useless -L paths to the install dir
sed -i \
1.122 sci-geosciences/gpsd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.122&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.122&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.121&r2=1.122
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog 10 Aug 2014 20:27:43 -0000 1.121
+++ ChangeLog 30 Oct 2014 21:16:11 -0000 1.122
@@ -1,6 +1,10 @@
# ChangeLog for sci-geosciences/gpsd
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.121 2014/08/10 20:27:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.122 2014/10/30 21:16:11 vapier Exp $
+
+ 30 Oct 2014; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.11-rpath.patch,
+ gpsd-9999.ebuild:
+ Update ebuild to match latest git source #527000 by Michal Privoznik.
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> gpsd-2.95-r1.ebuild,
gpsd-2.96-r1.ebuild:
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd: gpsd-9999.ebuild ChangeLog
@ 2013-08-25 17:00 Mike Gilbert (floppym)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert (floppym) @ 2013-08-25 17:00 UTC (permalink / raw
To: gentoo-commits
floppym 13/08/25 17:00:54
Modified: gpsd-9999.ebuild ChangeLog
Log:
Fix the live ebuild and convert to distutils-r1.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path
1.13 sci-geosciences/gpsd/gpsd-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.12&r2=1.13
Index: gpsd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gpsd-9999.ebuild 30 Mar 2013 20:37:24 -0000 1.12
+++ gpsd-9999.ebuild 25 Aug 2013 17:00:54 -0000 1.13
@@ -1,15 +1,14 @@
# 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.12 2013/03/30 20:37:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.13 2013/08/25 17:00:54 floppym Exp $
-EAPI="4"
+EAPI="5"
-PYTHON_DEPEND="python? 2:2.6"
-RESTRICT_PYTHON_ABIS="3.*"
-SUPPORT_PYTHON_ABIS="1"
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_6,2_7} )
SCONS_MIN_VERSION="1.2.1"
-inherit eutils udev user multilib distutils scons-utils toolchain-funcs
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
@@ -34,9 +33,10 @@
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
REQUIRED_USE="X? ( python )
- gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )"
-RDEPEND="X? ( dev-python/pygtk:2 )
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
ncurses? ( sys-libs/ncurses )
bluetooth? ( net-wireless/bluez )
usb? ( virtual/libusb:1 )
@@ -45,7 +45,8 @@
dev-libs/dbus-glib
)
ntp? ( || ( net-misc/ntp net-misc/chrony ) )
- qt4? ( dev-qt/qtgui:4 )"
+ qt4? ( dev-qt/qtgui:4 )
+ python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}
virtual/pkgconfig
test? ( sys-devel/bc )"
@@ -57,13 +58,7 @@
=app-text/docbook-xml-dtd-4.1*"
fi
-pkg_setup() {
- use python && python_pkg_setup
-}
-
-src_unpack() {
- default
-
+src_prepare() {
# Make sure our list matches the source.
local src_protocols=$(echo $(
sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
@@ -73,16 +68,13 @@
eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}"
die "please sync ebuild & source"
fi
-}
-src_prepare() {
epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
epatch "${FILESDIR}"/${PN}-3.8-udev.patch
epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
- epatch "${FILESDIR}"/${PN}-3.8-no-export-t.patch #463850
# Avoid useless -L paths to the install dir
sed -i \
@@ -106,7 +98,7 @@
-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
- distutils_src_prepare
+ distutils-r1_src_prepare
fi
}
@@ -148,7 +140,7 @@
export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
escons
- use python && distutils_src_compile
+ use python && distutils-r1_src_compile
}
src_install() {
@@ -158,13 +150,10 @@
newinitd "${FILESDIR}"/gpsd.init-2 gpsd
if use python ; then
- distutils_src_install
+ distutils-r1_src_install
# Delete all X related packages if user doesn't want them
if ! use X ; then
- local p
- for p in $(grep -Il 'import .*pygtk' *) ; do
- find "${D}"/usr/bin -name "${p}*" -delete
- done
+ rm "${ED%/}"/usr/bin/xgps* || die
fi
fi
}
@@ -174,11 +163,3 @@
# as it doesn't seem to be needed during compile/install ...
enewuser gpsd -1 -1 -1 "uucp"
}
-
-pkg_postinst() {
- use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
- use python && distutils_pkg_postrm
-}
1.109 sci-geosciences/gpsd/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.109&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.109&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.108&r2=1.109
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- ChangeLog 24 Aug 2013 12:34:41 -0000 1.108
+++ ChangeLog 25 Aug 2013 17:00:54 -0000 1.109
@@ -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.108 2013/08/24 12:34:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.109 2013/08/25 17:00:54 floppym Exp $
+
+ 25 Aug 2013; Mike Gilbert <floppym@gentoo.org> gpsd-9999.ebuild:
+ Fix the live ebuild and convert to distutils-r1.
24 Aug 2013; Agostino Sarubbo <ago@gentoo.org> gpsd-3.9.ebuild:
Stable for ppc64, wrt bug #468262
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-18 19:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-27 17:59 [gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd: gpsd-9999.ebuild ChangeLog Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2015-02-18 19:43 Mike Frysinger (vapier)
2014-10-30 21:20 Mike Frysinger (vapier)
2014-10-30 21:16 Mike Frysinger (vapier)
2013-08-25 17:00 Mike Gilbert (floppym)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox