1 |
vapier 15/02/27 18:11:55 |
2 |
|
3 |
Modified: gpsd-9999.ebuild ChangeLog |
4 |
Added: gpsd-3.13.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
9 |
|
10 |
Revision Changes Path |
11 |
1.20 sci-geosciences/gpsd/gpsd-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.20&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?rev=1.20&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild?r1=1.19&r2=1.20 |
16 |
|
17 |
Index: gpsd-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v |
20 |
retrieving revision 1.19 |
21 |
retrieving revision 1.20 |
22 |
diff -u -r1.19 -r1.20 |
23 |
--- gpsd-9999.ebuild 18 Feb 2015 19:43:36 -0000 1.19 |
24 |
+++ gpsd-9999.ebuild 27 Feb 2015 18:11:55 -0000 1.20 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2015 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.19 2015/02/18 19:43:36 vapier Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.20 2015/02/27 18:11:55 vapier Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
|
33 |
@@ -27,8 +27,8 @@ |
34 |
GPSD_PROTOCOLS=( |
35 |
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt |
36 |
geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip |
37 |
- oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt |
38 |
- tripmate tsip ublox |
39 |
+ oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2 |
40 |
+ tnt tripmate tsip ublox |
41 |
) |
42 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
43 |
IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X" |
44 |
@@ -84,7 +84,7 @@ |
45 |
python_export_best |
46 |
# Extract python info out of SConstruct so we can use saner distribute |
47 |
pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } |
48 |
- local pybins=$(pyvar python_progs) |
49 |
+ local pybins=$(pyvar python_progs | tail -1) |
50 |
local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) |
51 |
local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") |
52 |
local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") |
53 |
@@ -95,7 +95,7 @@ |
54 |
-e "s|@SCRIPTS@|${pybins}|" \ |
55 |
-e "s|@GPS_PACKET_SOURCES@|${packet}|" \ |
56 |
-e "s|@GPS_CLIENT_SOURCES@|${client}|" \ |
57 |
- -e "s|@SCRIPTS@|$(pyvar python_progs)|" \ |
58 |
+ -e "s|@SCRIPTS@|${pybins}|" \ |
59 |
"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die |
60 |
distutils-r1_python_prepare_all |
61 |
} |
62 |
|
63 |
|
64 |
|
65 |
1.127 sci-geosciences/gpsd/ChangeLog |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.127&view=markup |
68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?rev=1.127&content-type=text/plain |
69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/ChangeLog?r1=1.126&r2=1.127 |
70 |
|
71 |
Index: ChangeLog |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v |
74 |
retrieving revision 1.126 |
75 |
retrieving revision 1.127 |
76 |
diff -u -r1.126 -r1.127 |
77 |
--- ChangeLog 18 Feb 2015 19:43:36 -0000 1.126 |
78 |
+++ ChangeLog 27 Feb 2015 18:11:55 -0000 1.127 |
79 |
@@ -1,6 +1,12 @@ |
80 |
# ChangeLog for sci-geosciences/gpsd |
81 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
82 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.126 2015/02/18 19:43:36 vapier Exp $ |
83 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.127 2015/02/27 18:11:55 vapier Exp $ |
84 |
+ |
85 |
+*gpsd-3.13 (27 Feb 2015) |
86 |
+ |
87 |
+ 27 Feb 2015; Mike Frysinger <vapier@g.o> +files/gpsd-3.13-ntpshm.patch, |
88 |
+ +gpsd-3.13.ebuild, gpsd-9999.ebuild: |
89 |
+ Version bump. |
90 |
|
91 |
18 Feb 2015; Mike Frysinger <vapier@g.o> gpsd-9999.ebuild: |
92 |
Update build to match latest git. |
93 |
|
94 |
|
95 |
|
96 |
1.1 sci-geosciences/gpsd/gpsd-3.13.ebuild |
97 |
|
98 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-3.13.ebuild?rev=1.1&view=markup |
99 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/gpsd-3.13.ebuild?rev=1.1&content-type=text/plain |
100 |
|
101 |
Index: gpsd-3.13.ebuild |
102 |
=================================================================== |
103 |
# Copyright 1999-2015 Gentoo Foundation |
104 |
# Distributed under the terms of the GNU General Public License v2 |
105 |
# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.13.ebuild,v 1.1 2015/02/27 18:11:55 vapier Exp $ |
106 |
|
107 |
EAPI="5" |
108 |
|
109 |
DISTUTILS_OPTIONAL=1 |
110 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
111 |
SCONS_MIN_VERSION="1.2.1" |
112 |
|
113 |
inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs |
114 |
|
115 |
if [[ ${PV} == "9999" ]] ; then |
116 |
EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" |
117 |
inherit git-2 |
118 |
else |
119 |
SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" |
120 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
121 |
fi |
122 |
|
123 |
DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients" |
124 |
HOMEPAGE="http://catb.org/gpsd/" |
125 |
|
126 |
LICENSE="BSD" |
127 |
SLOT="0" |
128 |
|
129 |
GPSD_PROTOCOLS=( |
130 |
aivdm ashtech earthmate evermore fury fv18 garmin garmintxt |
131 |
geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip |
132 |
oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2 |
133 |
tnt tripmate tsip ublox |
134 |
) |
135 |
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} |
136 |
IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X" |
137 |
REQUIRED_USE="X? ( python ) |
138 |
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) |
139 |
python? ( ${PYTHON_REQUIRED_USE} )" |
140 |
|
141 |
RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) |
142 |
ncurses? ( sys-libs/ncurses ) |
143 |
bluetooth? ( net-wireless/bluez ) |
144 |
usb? ( virtual/libusb:1 ) |
145 |
dbus? ( |
146 |
sys-apps/dbus |
147 |
dev-libs/dbus-glib |
148 |
) |
149 |
ntp? ( || ( net-misc/ntp net-misc/chrony ) ) |
150 |
qt4? ( dev-qt/qtgui:4 ) |
151 |
python? ( ${PYTHON_DEPS} )" |
152 |
DEPEND="${RDEPEND} |
153 |
virtual/pkgconfig |
154 |
test? ( sys-devel/bc )" |
155 |
|
156 |
# xml packages are for man page generation |
157 |
if [[ ${PV} == "9999" ]] ; then |
158 |
DEPEND+=" |
159 |
app-text/xmlto |
160 |
=app-text/docbook-xml-dtd-4.1*" |
161 |
fi |
162 |
|
163 |
src_prepare() { |
164 |
# Make sure our list matches the source. |
165 |
local src_protocols=$(echo $( |
166 |
sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort |
167 |
) ) |
168 |
if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then |
169 |
eerror "Detected protocols: ${src_protocols}" |
170 |
eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" |
171 |
die "please sync ebuild & source" |
172 |
fi |
173 |
|
174 |
epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch |
175 |
epatch "${FILESDIR}"/${PN}-3.11-rpath.patch |
176 |
epatch "${FILESDIR}"/${PN}-3.13-ntpshm.patch |
177 |
|
178 |
# Avoid useless -L paths to the install dir |
179 |
sed -i \ |
180 |
-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ |
181 |
SConstruct || die |
182 |
|
183 |
use python && distutils-r1_src_prepare |
184 |
} |
185 |
|
186 |
python_prepare_all() { |
187 |
python_export_best |
188 |
# Extract python info out of SConstruct so we can use saner distribute |
189 |
pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } |
190 |
local pybins=$(pyvar python_progs | tail -1) |
191 |
local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) |
192 |
local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") |
193 |
local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") |
194 |
sed \ |
195 |
-e "s|@VERSION@|$(pyvar gpsd_version)|" \ |
196 |
-e "s|@URL@|$(pyvar website)|" \ |
197 |
-e "s|@EMAIL@|$(pyvar devmail)|" \ |
198 |
-e "s|@SCRIPTS@|${pybins}|" \ |
199 |
-e "s|@GPS_PACKET_SOURCES@|${packet}|" \ |
200 |
-e "s|@GPS_CLIENT_SOURCES@|${client}|" \ |
201 |
-e "s|@SCRIPTS@|${pybins}|" \ |
202 |
"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die |
203 |
distutils-r1_python_prepare_all |
204 |
} |
205 |
|
206 |
src_configure() { |
207 |
myesconsargs=( |
208 |
prefix="${EPREFIX}/usr" |
209 |
libdir="\$prefix/$(get_libdir)" |
210 |
udevdir="$(get_udevdir)" |
211 |
chrpath=False |
212 |
gpsd_user=gpsd |
213 |
gpsd_group=uucp |
214 |
nostrip=True |
215 |
python=False |
216 |
manbuild=False |
217 |
shared=$(usex !static True False) |
218 |
$(use_scons bluetooth bluez) |
219 |
$(use_scons cxx libgpsmm) |
220 |
$(use_scons debug clientdebug) |
221 |
$(use_scons dbus dbus_export) |
222 |
$(use_scons ipv6) |
223 |
$(use_scons latency_timing timing) |
224 |
$(use_scons ncurses) |
225 |
$(use_scons ntp ntpshm) |
226 |
$(use_scons ntp pps) |
227 |
$(use_scons shm shm_export) |
228 |
$(use_scons sockets socket_export) |
229 |
$(use_scons qt4 libQgpsmm) |
230 |
$(use_scons usb) |
231 |
) |
232 |
|
233 |
# enable specified protocols |
234 |
local protocol |
235 |
for protocol in ${GPSD_PROTOCOLS[@]} ; do |
236 |
myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) |
237 |
done |
238 |
} |
239 |
|
240 |
src_compile() { |
241 |
export CHRPATH= |
242 |
tc-export CC CXX PKG_CONFIG |
243 |
export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} |
244 |
escons |
245 |
|
246 |
use python && distutils-r1_src_compile |
247 |
} |
248 |
|
249 |
src_install() { |
250 |
DESTDIR="${D}" escons install $(usex udev udev-install "") |
251 |
|
252 |
newconfd "${FILESDIR}"/gpsd.conf-2 gpsd |
253 |
newinitd "${FILESDIR}"/gpsd.init-2 gpsd |
254 |
|
255 |
if use python ; then |
256 |
distutils-r1_src_install |
257 |
# Delete all X related packages if user doesn't want them |
258 |
if ! use X ; then |
259 |
rm "${ED%/}"/usr/bin/xgps* || die |
260 |
fi |
261 |
fi |
262 |
} |
263 |
|
264 |
pkg_preinst() { |
265 |
# Run the gpsd daemon as gpsd and group uucp; create it here |
266 |
# as it doesn't seem to be needed during compile/install ... |
267 |
enewuser gpsd -1 -1 -1 "uucp" |
268 |
} |