Updated new version with less hacky work-arounds and updated USE flags.

Package-Manager: portage-2.2_rc25/cvs/Linux x86_64

4 files changed, 201 insertions, 7 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 3507947914ba..b5d7fde88b0a 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/gpsd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.36 2008/12/21 17:56:11 nerdboy Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.37 2009/03/23 03:25:39 nerdboy Exp $
+
+*gpsd-2.38 (23 Mar 2009)
+
+  23 Mar 2009; Steve Arnold <nerdboy@gentoo.org> metadata.xml,
+  +gpsd-2.38.ebuild:
+  Updated new version with less hacky work-arounds and updated USE flags.
+  Everything should be linked and instaleld correctly now (see bugs #250757
+  and #246757).
 
   21 Dec 2008; Steve Arnold <nerdboy@gentoo.org> gpsd-2.36.ebuild,
   gpsd-2.37.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 6abd2a950db7..0a520726d098 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -9,10 +9,12 @@ DIST gpsd-2.33.tar.gz 639348 RMD160 175b90cb8dda1d85964078a4f14cec84b0cc4885 SHA
 DIST gpsd-2.34.tar.gz 668063 RMD160 cefe9f08c8164597bd04e51622d2175a40781bdb SHA1 96d8ab99445dc68136e4ee3622a58f4c464f7510 SHA256 39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8
 DIST gpsd-2.36.tar.gz 736220 RMD160 aa3c4741dba4c07f145f62fb027e2ba303d16284 SHA1 4faee0e3e1e5422702f354a85849fd4e8c3a98c2 SHA256 0c9bf796b932dab2baab70829780eccde4113c08ce649768facd5010d6da640a
 DIST gpsd-2.37.tar.gz 712943 RMD160 72387ef3c8da39ed1a1dffa9aecfff1622023fcc SHA1 5bf4e1db9e570cc14b70bd0cf902926f96131ace SHA256 8860e61edc26f0665ad6ea0b34be4e3fd2cc7c51c5fd63b25c857a1870e8e137
+DIST gpsd-2.38.tar.gz 776598 RMD160 e5c8a05170286fd7aac87c9d182cfdf5a8f6c6b0 SHA1 310cad336e06faed34a7bd3503b169b502520925 SHA256 ae828da850ac0590fd47768856c4ec29021332204182abe4ad94098d72168474
 EBUILD gpsd-2.32.ebuild 3426 RMD160 5b2336887f2a931f48da7fa73fec9c321bc388a0 SHA1 33ec49407e6c50311dd2de18d31d50d11c491d3b SHA256 f77cfc0e8068c25efd979ef078d6c1d99242b5d94b8ba85e3a87d4d56708bbfb
 EBUILD gpsd-2.33-r1.ebuild 3849 RMD160 4ffd2c45b44a64c5025aae8cf0e74cf524d3512d SHA1 6098cf056cf8a32af2adc6a6334f4ab3a6487828 SHA256 058aef0e76c9e4108ec53840d70de2636e91cae018297fbfa454addb6cc5fc6a
 EBUILD gpsd-2.34-r1.ebuild 4277 RMD160 765e2b3ad3a6df30feb9df6a1ff3d85466a0b6bc SHA1 154c6e0dbd8ff71ff48bbf114aa526a7a9bc3157 SHA256 703374a10fda8ba895d7888ea51a66401b69ccbeb579b31bde938bff19f4808b
 EBUILD gpsd-2.36.ebuild 4761 RMD160 df761f6ad9ff0b57079991626adf4dcb3ae48c9e SHA1 2584cbed277f0b7a2b4f100055ccf4c6f9b6ce04 SHA256 c55e0ab46e50e30bcc98e82f96965d9ef8b29bea63bf09b99a52b632c65971ec
 EBUILD gpsd-2.37.ebuild 5027 RMD160 2a55e57847c0282f8d7bc188b2b684360b442f4c SHA1 446ca40cb1c38630251119a66088d7cec64a0c7d SHA256 f943fe1ae272d65ab3f0babb44e3256766d0e8245c073347f782b1ace56ae6cb
-MISC ChangeLog 7508 RMD160 06e460514066232e9d95f11b834f5890f9f3c520 SHA1 4e0a1dc311ca475732529f281ebaceb2c1d18889 SHA256 288ced1d6c3fff0e9dc0f2153825a70650d67a95051d813ade7a6b65d52bdd00
-MISC metadata.xml 725 RMD160 43552fdec3ce155eaf18eaec511817d7c339934f SHA1 06a4dc2f0ba9a85fcdccfb5184939e8b677d4789 SHA256 f9e74c40c24f4dc61c5d17088e3208f8b3035f71e85c6434df48eb97f4825a71
+EBUILD gpsd-2.38.ebuild 5288 RMD160 0322151d21933d69b32246683e5cda5acf5ba701 SHA1 b866e538d19dc707ee4c7d7cf5a3413e8e01c210 SHA256 3349c957628aa738ef2c39d1b7c878f303a8d2d3ee5901651c980075c9666e53
+MISC ChangeLog 7785 RMD160 8c8082523a38ebe363385c99dbd1dceb9292a921 SHA1 b800f082062cde5b52e6b81f12c1a762f1b21615 SHA256 55556641cbe9501bf55977a0ce285e4f0469548f3fc35291b0378e50920d26f6
+MISC metadata.xml 901 RMD160 521474a3c5487fe41e33ed3067516043efab25cf SHA1 c0860dfce0113f7bf862a2e8bc02bd3dabc90c36 SHA256 66c670f114b0962ceb8df44f0132f382889cae675f97e3f8ec72423ac9fb2c5b
diff --git a/sci-geosciences/gpsd/gpsd-2.38.ebuild b/sci-geosciences/gpsd/gpsd-2.38.ebuild
new file mode 100644
index 000000000000..ff87ebc193b3
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-2.38.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.38.ebuild,v 1.1 2009/03/23 03:25:39 nerdboy Exp $
+
+inherit autotools eutils distutils flag-o-matic
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients."
+HOMEPAGE="http://gpsd.berlios.de/"
+SRC_URI="mirror://berlios/gpsd/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="dbus garmin minimal ntp ocean python tntc usb X"
+
+RDEPEND="X? (
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw
+	)
+	python? ( dev-lang/python )
+
+	dbus? ( >=sys-apps/dbus-0.94
+		>=dev-libs/glib-2.6
+		dev-libs/dbus-glib )
+	ntp? ( net-misc/ntp )
+	usb? ( virtual/dev-manager )"
+
+DEPEND="${RDEPEND}
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
+	)
+	!minimal? (
+		dev-libs/libxslt
+		sys-libs/ncurses
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# add -lm to setup.py again (see bug #250757)
+	sed -i \
+	    -e "s:, gpspacket_sources:, gpspacket_sources, libraries=['m']:g" \
+	    -e "s:geoid.c\"]:geoid.c\"], libraries=['m']:g" \
+	    setup.py || die "sed 1 failed"
+	# fix Garmin text struct
+	sed -i -e "s:RTCM2_PACKET;:RTCM2_PACKET,:g" \
+	    drivers.c || die "sed 2 failed"
+	# add missing include file (see bug #162361)
+	sed -i -e "s:gps.h libgpsmm.h:gps.h libgpsmm.h gpsd_config.h:g" \
+	    Makefile.am || die "sed 3 failed"
+
+	eautoreconf
+}
+
+src_compile() {
+
+	local my_conf="--enable-shared --with-pic --enable-static \
+		--disable-fast-install"
+		# --enable-superstar2 is missing a header file
+
+	use python && distutils_python_version
+
+	if use ntp; then
+		my_conf="${my_conf} --enable-ntpshm --enable-pps"
+	else
+		my_conf="${my_conf} --disable-ntpshm --disable-pps"
+	fi
+
+	if use minimal; then
+		local max_clients="5"
+		local max_devices="2"
+		if ! use ntp; then
+			my_conf="${my_conf} --disable-pps --disable-ntpshm"
+		fi
+		my_conf="${my_conf} --enable-squelch --without-x \
+		--enable-max-devices=${max_devices} \
+		--enable-max-clients=${max_clients}"
+
+		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
+		$(use_enable dbus) $(use_enable ocean oceanserver) \
+		$(use_enable tntc tnt) $(use_enable python) \
+		$(use_enable garmin garmintxt) || die "econf failed"
+	else
+		econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
+		$(use_enable ocean oceanserver) $(use_enable python) \
+		$(use_enable garmin garmintxt) $(use_with X x) \
+		|| die "econf failed"
+	fi
+
+	# still needs an explicit linkage with the math lib (bug #250757)
+	append-ldflags -Wl,-z,-defs -Wl,--no-undefined
+
+	emake || die "emake failed"
+}
+
+src_install() {
+
+	make DESTDIR="${D}" install || die "make install failed"
+
+	if use usb ; then
+		insinto /etc/hotplug/usb
+		doins gpsd.usermap
+		exeinto /etc/hotplug/usb
+		doexe gpsd.hotplug
+		insinto /etc/udev/rules.d
+		doins "${FILESDIR}"/99-gpsd-usb.rules
+		keepdir /var/run/usb # needed for REMOVER
+	else
+		newconfd "${FILESDIR}"/gpsd.conf gpsd
+		newinitd "${FILESDIR}"/gpsd.init gpsd
+	fi
+
+	if use X && ! use minimal ; then
+		insinto /etc/X11/app-defaults
+		newins xgps.ad Xgps
+		newins xgpsspeed.ad Xgpsspeed
+	else
+		rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
+		"${D}usr/share/man/man1/xgps.1.bz2"
+	fi
+
+	use python && distutils_src_install
+
+	dodoc INSTALL README TODO
+
+	# add missing dgpsip-servers and capabilities files
+	insinto /usr/share/${PN}
+	doins dgpsip-servers gpscap.ini
+
+	if use minimal; then
+		doman gpsctl.1 sirfmon.1 gpsd.8 gps.1 cgps.1 cgpxlogger.1 gpspipe.1
+		use python && doman gpsprof.1
+	else
+		diropts "-m0644"
+		dobin logextract
+		use python && dobin striplog
+	fi
+}
+
+pkg_postinst() {
+	elog ""
+	elog "This version of gpsd has broken support for the SuperStarII"
+	elog "chipset which is currently disabled."
+	elog ""
+	elog "Other than the above, all default devices are enabled, and all"
+	elog "optional devices and formats are controlled via USE flags."
+	elog ""
+	elog "Recent versions of udev (>=udev-115 or so) should have correct"
+	elog "usb device detection and startup of gpsd (ie, without hotplug)."
+	elog ""
+	elog "Certain GPS devices also require the corresponding kernel options"
+	elog "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
+	elog "for an adapter such as those that come with Deluo GPS units (eg,"
+	elog "USB_SERIAL_PL2303). Straight serial devices should always work,"
+	elog "even without udev/hotplug support."
+	elog ""
+	elog "Note: the supplied gpsd udev rules are now device-specific, so"
+	elog "if your device isn't detected correctly, please use lsusb or"
+	elog "another suitable tool to determine the proper device IDs and"
+	elog "use the commented rules to fill in the blanks for your device."
+	elog ""
+	elog "Please see this post about the new capabilities database:"
+	elog ""
+	elog "http://lists.berlios.de/pipermail/gpsd-dev/2009-January/006333.html"
+	elog ""
+	elog "on current hardware, adding new hardware, etc.  Read the above"
+	elog "and the INSTALL doc for more information on supported hardware,"
+	elog "and make sure udev has the right group permissions set on the"
+	elog "devices if using USB (it should Do The Right Thing (TM))..."
+	elog ""
+}
diff --git a/sci-geosciences/gpsd/metadata.xml b/sci-geosciences/gpsd/metadata.xml
index b801483020bb..bf421a84d1b1 100644
--- a/sci-geosciences/gpsd/metadata.xml
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -6,13 +6,17 @@
   <email>nerdboy@gentoo.org</email>
   <name>Steve Arnold</name>
 </maintainer>
-<longdescription>Unbundled GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients, such as GPSDrive, kismet, and pygps.
+<longdescription>Unbundled GPS daemon and library to support USB and serial
+ GPS devices and various GPS/mapping clients, such as GPSDrive, kismet, and
+ pygps.
 </longdescription>
 <use>
+  <flag name='garmin'>Enable support for Garmin simple text protocol</flag>
   <flag name='italk'>Enable iTalk protocol support</flag>
   <flag name='itrax'>Enable iTrax hardware support</flag>
   <flag name='ntp'>Enable <pkg>net-misc/ntp</pkg> shared memory interface
-    for GPS time</flag>
-  <flag name='tntc'>Enable True North Technologies support</flag>
+    and PPS kernel support for GPS time</flag>
+  <flag name='ocean'>Enable OceanServer support</flag>
+  <flag name='tntc'>Enable True North Technologies digital compass support</flag>
 </use>
 </pkgmetadata>