Add fix from upstream for socket setup, and add USE flags to control shared memory...

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 83646f345d09981546a4a7a362d2a33933945b5b..fddb75c799b0441492e8a9b04a7899e0e5094d99 100644 (file)
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.78 2011/11/22 20:13:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.79 2011/12/06 22:01:56 vapier Exp $
+
+*gpsd-3.3-r1 (06 Dec 2011)
+
+  06 Dec 2011; Mike Frysinger <vapier@gentoo.org> +gpsd-3.3-r1.ebuild,
+  +files/gpsd-3.3-msocks-init.patch, metadata.xml:
+  Add fix from upstream for socket setup, and add USE flags to control shared
+  memory/socket interfaces.
 
   22 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/gpsd-3.3-ldflags.patch, gpsd-3.3.ebuild:

diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index ba88e7ecdb3dd5439d69051ed5242e3876e3762d..7e6d4e0ce028f4e24546ecb34551881ef01dd6c0 100644 (file)
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -7,6 +7,7 @@ AUX 2.96-fix-ldflags.patch 1000 RMD160 a1d4fa399bf9dee71b7adebd2ed2f01d39e7c4f7
 AUX 2.96-fix-tests.patch 944 RMD160 c04e257c4aec8147f24d5c8f1850718f3756f128 SHA1 bcba7823b35a8bb487d93ce875bae32131ae9e10 SHA256 2dced865a8a8951855b9ee8fc5586aa9be3f0c7513c8299c4632ca32a31d2074
 AUX 2.96-pkgconfig.patch 1377 RMD160 20ff8e65763981f4f7075dc0a86764bd02017d75 SHA1 203172648b7b1e16e3b28a5815238adf4649a1fc SHA256 8b20899afd3e0e391664461ef359eef1ed6bfc49ba633c90e683178637359e15
 AUX gpsd-3.3-ldflags.patch 482 RMD160 9a9fb87dfc88ac5567dbf1c7a85fd559f66e0080 SHA1 58c60962b152ab58e5ab943bcf4e10d7d1c2d808 SHA256 e109744b2a1e066df9bd421a8a653eacbc233877d1588f6695f77ffe1c3550fa
+AUX gpsd-3.3-msocks-init.patch 930 RMD160 d80acb186a22b4779efc233192320dc4e65147cc SHA1 1a97f395141342fd3089cbb62e750048553dc305 SHA256 6dd2f216856f44c70a780a59bf5a2226858d01a9df779a37805271c044d258f8
 AUX gpsd-3.3-pkg-config.patch 1925 RMD160 eeae061c8e807ada8f736d89e3146847bc9a1d47 SHA1 a0dcf519bab808af1675b84171997eaf620b2073 SHA256 1b97692277e94969c547e3cb35185554655500ebbab2e84467456a0c03a1bc79
 AUX gpsd-3.3-release-rev.patch 1206 RMD160 4db37f9d998cc56c32cb1deb0679dd9ba11c0f21 SHA1 e7e3e0a1fda9fd55ea5c0c86ecdcd33972840b79 SHA256 37688ad979c9915e25952f461fefa313682e3f62b8093a7b5205e1e9164df2e5
 AUX gpsd-3.3-setup.py 448 RMD160 3b06265cde87612040ef2955f097fe2b87b433a7 SHA1 e8d1b510aed5b6c267b92c059ceaef255ce0756f SHA256 3a8f18f7f1e957c1b33ea25046dc4116422d087dd9f880f7bf2ad8fd0153f4c4
@@ -18,13 +19,14 @@ DIST gpsd-2.96bis.tar.gz 1554605 RMD160 ea09b73709627f95470dbd023e5ffc48209fde6a
 DIST gpsd-3.3.tar.gz 1401206 RMD160 73442e2bccac87a7ba4349ec63c443edbf05a131 SHA1 82a2ffe825c30c2152f2696221dbeeb82a4e9dd5 SHA256 1dbc1813f94f7f05fbf3341bf0154bae26903d1fb90c33b63d5458373ea931b9
 EBUILD gpsd-2.95-r1.ebuild 2674 RMD160 3cfe82ffac9f57d771b6728420d106debd49c22e SHA1 86ba4ecde7158a24c535675036f638c9f6683ecc SHA256 d8e81c1b8b9531fc59ea1c9da7710c76c23802faec8e6d404732ed557058ed7b
 EBUILD gpsd-2.96-r1.ebuild 2840 RMD160 75cc21a587c3ef12bb891f8a2dc7ee30fa7cfb1f SHA1 bdf8663fb324ca8ddbe81b58348d12b6a03174ca SHA256 04bab92bbe716753ff6bcd719fa958e32440e7bcc219c6d409936edda0fed695
+EBUILD gpsd-3.3-r1.ebuild 4272 RMD160 f391e0e8d924c062e01d41cb69301158724439f4 SHA1 91947d35ce4b88f5b149b467507b5460a12ef884 SHA256 d2464cbcca6510e87b30fd608dfeb5bda307eb3fb1eee2ffafd9bae93f4fc6d3
 EBUILD gpsd-3.3.ebuild 4145 RMD160 454a2da60f501ac74e252c7ea24c974b1fef01df SHA1 71da34e59fbb43815fed0653af9e3290ddef9da7 SHA256 2eea0510ce1e65d67cd65a41a7191bee6f0d0dfdc4eb5a6f218ed61a4bc47186
-MISC ChangeLog 14321 RMD160 bca88f2a432b81669292f6824320b0031f17fd77 SHA1 a2323d959faddcea59a09f9a8b5709c7e73dc906 SHA256 74b25125c70065435362d979a6a4868304c404bfb9d69d60dab3392587726afa
-MISC metadata.xml 572 RMD160 405fe380fe1257019ea02155b4f3c5316cb38380 SHA1 3a4945cdf750d48c8468650c1218c22f77872ccd SHA256 602da5f9768c2f0866c924db204baff61765479af03c71cfe3ae99ed8df7d436
+MISC ChangeLog 14578 RMD160 9bfa2966868d3c23a1460dcbd9b24a3f96cafc4e SHA1 d23d4c7afb38e04b5f96d92a83ee5d4e0cbec398 SHA256 f1abfba330f8af6959fa1805d38cb1d3b46687d3f30c69b7e0694252b6741f2d
+MISC metadata.xml 755 RMD160 5b1284e2e50fbcd3f84fa388c3980298d74bfbfd SHA1 de24f0892fb828f2cb8c64aae6a0f7a53cb5239e SHA256 62975e20eaea76bd26e07faaffc0409ff0474fb57b2556040538c4ca4e553d48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7MAmcACgkQaC/OocHi7JZoGAD9Ga92HwPwc9avKOi0AixVquYW
-u1fGC1Tp7n3EpBhsSssA/jR9Hs21v4DGHPA/9N6SZPBXgWQTXgxdOzI6lrii3BwP
-=bd54
+iF4EAREIAAYFAk7ekNsACgkQaC/OocHi7Ja43QD/WVV4+Z9IJZdO9KPdwLgiY6Pn
+IAEgGQkvGV7hOzL/uY0BAJinaMsgEVBlj1s5IZUrxCwS/R0h0iwu0HWpsdYDR/h/
+=zdY6
 -----END PGP SIGNATURE-----

diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-msocks-init.patch b/sci-geosciences/gpsd/files/gpsd-3.3-msocks-init.patch
new file mode 100644 (file)
index 0000000..6b06864
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-msocks-init.patch
@@ -0,0 +1,33 @@
+fix from upstream git repo
+
+From e3d7f8b3f35442ae71dc95d776c900d2c29b215c Mon Sep 17 00:00:00 2001
+From: Yufeng Shen <miletus@chromium.org>
+Date: Tue, 15 Nov 2011 17:29:49 -0500
+Subject: [PATCH] Initialize msocks[2] to -1
+
+When SOCKET_EXPORT_ENABLE is not defined, msocks[2] can reach the
+point where it is used (put into all_fds to be monitored by select()),
+without initilization.
+
+Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
+---
+ gpsd.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/gpsd.c b/gpsd.c
+index 2d4090f..d342f5a 100644
+--- a/gpsd.c
++++ b/gpsd.c
+@@ -1762,7 +1762,8 @@ int main(int argc, char *argv[])
+     static char *pid_file = NULL;
+     struct gps_device_t *device;
+     fd_set rfds;
+-    int i, option, msocks[2], dfd;
++    int i, option, dfd;
++    int msocks[2] = {-1, -1};
+     bool go_background = true;
+     struct timeval tv;
+     const struct gps_type_t **dp;
+-- 
+1.7.6.1
+

diff --git a/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild
new file mode 100644 (file)
index 0000000..87a545c
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild,v 1.1 2011/12/06 22:01:56 vapier Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils user multilib distutils scons-utils toolchain-funcs
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+GPSD_PROTOCOLS=(
+       ashtech aivdm clientdebug earthmate evermore fv18 garmin
+       garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
+       oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
+       tripmate tnt ubx
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )"
+
+RDEPEND="X? ( dev-python/pygtk:2 )
+       ncurses? ( sys-libs/ncurses )
+       bluetooth? ( net-wireless/bluez )
+       usb? ( virtual/libusb:1 )
+       dbus? (
+               sys-apps/dbus
+               dev-libs/dbus-glib
+       )
+       ntp? ( net-misc/ntp )
+       qt4? ( x11-libs/qt-gui )"
+# xml packages are for man page generation
+DEPEND="${RDEPEND}
+       app-text/xmlto
+       =app-text/docbook-xml-dtd-4.1*
+       test? ( sys-devel/bc )"
+
+pkg_setup() {
+       use python && python_pkg_setup
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-release-rev.patch
+       epatch "${FILESDIR}"/${P}-udev-install.patch
+       epatch "${FILESDIR}"/${P}-pkg-config.patch
+       epatch "${FILESDIR}"/${P}-ldflags.patch
+       epatch "${FILESDIR}"/${P}-msocks-init.patch
+
+       # Avoid useless -L paths to the install dir
+       sed -i \
+               -e '/env.Prepend.*LIBPATH=.*installdir/s:env.*:pass:' \
+               -e '/env.Prepend.*RPATH=/s:env.*:pass:' \
+               -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+               SConstruct || die
+
+       # 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_src_prepare
+       fi
+}
+
+src_configure() {
+       myesconsargs=(
+               prefix=/usr
+               libdir="/$(get_libdir)"
+               gpsd_user=gpsd
+               gpsd_group=uucp
+               strip=False
+               python=False
+               $(use_scons bluetooth bluez)
+               $(use_scons cxx libgpsmm)
+               $(use_scons debug)
+               $(use_scons dbus dbus-export)
+               $(use_scons ipv6)
+               $(use_scons ncurses)
+               $(use_scons ntp ntpshm)
+               $(use_scons ntp pps)
+               $(use_scons shm shm-export)
+               $(use_scons sockets sockets-export)
+               $(use_scons qt4 libQgpsmm)
+               $(use_scons usb)
+       )
+
+       # enable specified protocols
+       local protocol
+       for protocol in ${GPSD_PROTOCOLS[@]} ; do
+               myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+       done
+}
+
+src_compile() {
+       export CHRPATH=true
+       tc-export CC CXX PKG_CONFIG
+       export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+       escons
+
+       use python && distutils_src_compile
+}
+
+src_install() {
+       DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+       newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+       newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+       if use python ; then
+               distutils_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
+               fi
+       fi
+}
+
+pkg_preinst() {
+       # Run the gpsd daemon as gpsd and group uucp; create it here
+       # 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
+}

diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index 5808e8f5d246c32a38b512927ee59c3fe850e539..9f5690e637686c2b2298d457851882dc6fb5e48b 100644 (file)
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -11,7 +11,10 @@
  pygps.
 </longdescription>
 <use>
+  <flag name='dbus'>export gpsd data over dbus connections</flag>
   <flag name='ntp'>Enable <pkg>net-misc/ntp</pkg> shared memory interface
     and PPS kernel support for GPS time</flag>
+  <flag name='sockets'>export gpsd over unix sockets</flag>
+  <flag name='shm'>export gpsd over shared memory</flag>
 </use>
 </pkgmetadata>