From b9b3984d14b842ecdacffbe72410f0350b892887 Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Tue, 6 Sep 2005 06:18:25 +0000 Subject: [PATCH] fixed dbus depends and added new version Package-Manager: portage-2.0.51.22-r2 --- sci-geosciences/gpsd/ChangeLog | 10 +- sci-geosciences/gpsd/Manifest | 17 ++-- .../{digest-gpsd-2.25 => digest-gpsd-2.25-r1} | 0 sci-geosciences/gpsd/files/digest-gpsd-2.29 | 1 + .../gpsd/files/gpsd-2.25-SiRF.patch | 20 ++++ .../{gpsd-2.25.ebuild => gpsd-2.25-r1.ebuild} | 7 +- sci-geosciences/gpsd/gpsd-2.26.ebuild | 8 +- sci-geosciences/gpsd/gpsd-2.29.ebuild | 95 +++++++++++++++++++ 8 files changed, 143 insertions(+), 15 deletions(-) rename sci-geosciences/gpsd/files/{digest-gpsd-2.25 => digest-gpsd-2.25-r1} (100%) create mode 100644 sci-geosciences/gpsd/files/digest-gpsd-2.29 create mode 100644 sci-geosciences/gpsd/files/gpsd-2.25-SiRF.patch rename sci-geosciences/gpsd/{gpsd-2.25.ebuild => gpsd-2.25-r1.ebuild} (95%) create mode 100644 sci-geosciences/gpsd/gpsd-2.29.ebuild diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index 18ad399e6897..f754a83b555f 100644 --- a/sci-geosciences/gpsd/ChangeLog +++ b/sci-geosciences/gpsd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-geosciences/gpsd # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.4 2005/08/20 21:12:04 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.5 2005/09/06 06:18:25 nerdboy Exp $ + +*gpsd-2.29 (06 Sep 2005) +*gpsd-2.25-r1 (06 Sep 2005) + + 06 Sep 2005; Steve Arnold + +files/gpsd-2.25-SiRF.patch, -gpsd-2.25.ebuild, +gpsd-2.25-r1.ebuild, + gpsd-2.26.ebuild, +gpsd-2.29.ebuild: + fixed dbus depends and added new version 20 Aug 2005; Olivier Fisette gpsd-2.26.ebuild: Depend on dbus version 0.23.4 or later (fixes bug #102049). diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 6650150f5c6a..d2b95b7e8174 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1,12 +1,15 @@ -MD5 777248bf38c53c855d2b381befae0721 gpsd-2.25.ebuild 3603 -MD5 979f21aae19bdea6cf779fd9464d2ad2 gpsd-2.26.ebuild 3634 -MD5 18c038373992c23c60310d592aeef078 ChangeLog 1256 MD5 78ec9f0a49a5a89267a4b8953d904de9 metadata.xml 420 -MD5 99f9af655eb3229584632db5cc25d3a5 files/gpsd-2.26-python.patch 525 -MD5 20476e3f2208bbe360308b3d159b7d47 files/gpsd-2.26-dbus.patch 830 +MD5 bff05a7de00bf6079e18584550607c91 gpsd-2.26.ebuild 3638 +MD5 6140aecab89d1967b02b2220b46b5468 ChangeLog 1513 +MD5 02861e95411edb0f6c86f96017972114 gpsd-2.25-r1.ebuild 3642 +MD5 bdc70940d48b29d9d5a268ba071c15c3 gpsd-2.29.ebuild 3233 MD5 f6622a741ad185c494741151fac6f920 files/40-usb-serial.rules 212 -MD5 2760a88bc02861b5ff0f752758db08a3 files/digest-gpsd-2.25 61 -MD5 516c464c491b74356c0583f15bbf754e files/digest-gpsd-2.26 61 MD5 b84a0fec652fc8df8b533eb160055841 files/gpsd.conf 867 MD5 56fd36d7f177ce4c229e2d61abcf7d15 files/gpsd.init 949 MD5 7e6d1d3e16536b0ccd1ad7f0c0d92c58 files/gpsd-2.25-y-format.patch 3987 +MD5 45dc7d436da7eb835597bd28d5f6d292 files/digest-gpsd-2.29 61 +MD5 20476e3f2208bbe360308b3d159b7d47 files/gpsd-2.26-dbus.patch 830 +MD5 99f9af655eb3229584632db5cc25d3a5 files/gpsd-2.26-python.patch 525 +MD5 516c464c491b74356c0583f15bbf754e files/digest-gpsd-2.26 61 +MD5 355d862d9200d39a11a276b18109254f files/gpsd-2.25-SiRF.patch 681 +MD5 2760a88bc02861b5ff0f752758db08a3 files/digest-gpsd-2.25-r1 61 diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.25 b/sci-geosciences/gpsd/files/digest-gpsd-2.25-r1 similarity index 100% rename from sci-geosciences/gpsd/files/digest-gpsd-2.25 rename to sci-geosciences/gpsd/files/digest-gpsd-2.25-r1 diff --git a/sci-geosciences/gpsd/files/digest-gpsd-2.29 b/sci-geosciences/gpsd/files/digest-gpsd-2.29 new file mode 100644 index 000000000000..813db3af5ac5 --- /dev/null +++ b/sci-geosciences/gpsd/files/digest-gpsd-2.29 @@ -0,0 +1 @@ +MD5 3ff80db0e7d906457e5a7a1b04fcb4ec gpsd-2.29.tar.gz 602411 diff --git a/sci-geosciences/gpsd/files/gpsd-2.25-SiRF.patch b/sci-geosciences/gpsd/files/gpsd-2.25-SiRF.patch new file mode 100644 index 000000000000..5f4bb5a4d9e0 --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-2.25-SiRF.patch @@ -0,0 +1,20 @@ +--- libgpsd_core.c.orig 2005-05-30 20:17:49.000000000 -0700 ++++ libgpsd_core.c 2005-05-30 20:19:49.000000000 -0700 +@@ -407,7 +407,7 @@ + gmtime_r(&intfixtime, &tm); + if (session->gpsdata.fix.mode > 1) { + sprintf(bufp, +- "$GPGGA,%02d%02d%02d,%07.4f,%c,%08.4f,%c,%d,%02d,%s,%.1f,%c,", ++ "$GPGGA,%02d%02d%02d,%09.4f,%c,%010.4f,%c,%d,%02d,%s,%.1f,%c,", + tm.tm_hour, + tm.tm_min, + tm.tm_sec, +@@ -435,7 +435,7 @@ + bufp += strlen(bufp); + } + sprintf(bufp, +- "$GPRMC,%02d%02d%02d,%c,%07.4f,%c,%08.4f,%c,%.4f,%.3f,%02d%02d%02d,,", ++ "$GPRMC,%02d%02d%02d,%c,%09.4f,%c,%010.4f,%c,%.4f,%.3f,%02d%02d%02d,,", + tm.tm_hour, + tm.tm_min, + tm.tm_sec, diff --git a/sci-geosciences/gpsd/gpsd-2.25.ebuild b/sci-geosciences/gpsd/gpsd-2.25-r1.ebuild similarity index 95% rename from sci-geosciences/gpsd/gpsd-2.25.ebuild rename to sci-geosciences/gpsd/gpsd-2.25-r1.ebuild index af737e1d78c6..6a6d16fde616 100644 --- a/sci-geosciences/gpsd/gpsd-2.25.ebuild +++ b/sci-geosciences/gpsd/gpsd-2.25-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.25.ebuild,v 1.3 2005/08/08 01:14:31 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.25-r1.ebuild,v 1.1 2005/09/06 06:18:25 nerdboy Exp $ inherit eutils libtool distutils @@ -18,7 +18,7 @@ DEPEND="X? ( virtual/motif virtual/x11 ) usb? ( sys-apps/hotplug ) - dbus? ( >=sys-apps/dbus-0.23.4 ) + dbus? ( =sys-apps/dbus-0.23.4* ) dev-lang/python app-text/xmlto virtual/libc @@ -27,8 +27,9 @@ DEPEND="X? ( virtual/motif src_unpack() { unpack ${A} cd ${S} - # remove patch for >=2.26 + # remove patch for >=2.27 epatch ${FILESDIR}/${P}-y-format.patch + epatch ${FILESDIR}/${P}-SiRF.patch elibtoolize } diff --git a/sci-geosciences/gpsd/gpsd-2.26.ebuild b/sci-geosciences/gpsd/gpsd-2.26.ebuild index 942b970ea87d..b70ea204fe21 100644 --- a/sci-geosciences/gpsd/gpsd-2.26.ebuild +++ b/sci-geosciences/gpsd/gpsd-2.26.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.26.ebuild,v 1.2 2005/08/20 21:12:04 ribosome Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.26.ebuild,v 1.3 2005/09/06 06:18:25 nerdboy Exp $ inherit eutils libtool distutils @@ -17,7 +17,7 @@ IUSE="X usb dbus" DEPEND="X? ( virtual/motif virtual/x11 ) usb? ( sys-apps/hotplug ) - dbus? ( >=sys-apps/dbus-0.23.4 ) + dbus? ( =sys-apps/dbus-0.23.4* ) dev-lang/python app-text/xmlto virtual/libc @@ -44,11 +44,11 @@ src_install() { make DESTDIR=${D} install if use usb ; then -# sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap + sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap insinto /etc/hotplug/usb doins gpsd.usermap exeinto /etc/hotplug/usb - doexe gpsd.hotplug + newexe gpsd.hotplug gpsd else newconfd ${FILESDIR}/gpsd.conf gpsd newinitd ${FILESDIR}/gpsd.init gpsd diff --git a/sci-geosciences/gpsd/gpsd-2.29.ebuild b/sci-geosciences/gpsd/gpsd-2.29.ebuild new file mode 100644 index 000000000000..dea4fe6c55c0 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-2.29.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.29.ebuild,v 1.1 2005/09/06 06:18:25 nerdboy Exp $ + +inherit eutils libtool distutils + +DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients." +HOMEPAGE="http://gpsd.berlios.de/" +SRC_URI="http://download.berlios.de/gpsd/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~sparc ~arm" + +IUSE="X usb dbus" + +DEPEND="X? ( virtual/motif + virtual/x11 + ) + usb? ( sys-apps/hotplug ) + dbus? ( =sys-apps/dbus-0.23.4* ) + dev-lang/python + app-text/xmlto + virtual/libc + sys-devel/gcc" + +src_unpack() { + unpack ${A} + cd ${S} + elibtoolize +} + +src_compile() { + distutils_python_version + export MY_ECONF="--with-gnu-ld --with-pic $(use_with X x) $(use_enable dbus)" + econf ${MY_ECONF} || die "econf failed" + emake || die "emake failed" +} + +src_install() { + cd ${S} + make DESTDIR=${D} install + + if use usb ; then + sed -i -e "s/gpsd.hotplug/gpsd/g" gpsd.hotplug gpsd.usermap + insinto /etc/hotplug/usb + doins gpsd.usermap + exeinto /etc/hotplug/usb + newexe gpsd.hotplug gpsd + else + newconfd ${FILESDIR}/gpsd.conf gpsd + newinitd ${FILESDIR}/gpsd.init gpsd + fi + if use X ; then + insinto /usr/lib/X11/app-defaults + newins xgps.ad xgps + newins xgpsspeed.ad xgpsspeed + fi + dobin logextract + diropts "-m0644" + exeinto /usr/lib/python${PYVER}/site-packages + doexe gps.py + dodoc AUTHORS HACKING INSTALL README TODO ${FILESDIR}/40-usb-serial.rules +} + +pkg_postinst() { + einfo "To use hotplugging (USB devices) your kernel has to be compiled" + einfo "with CONFIG_HOTPLUG enabled and sys-apps/hotplug must be emerged" + einfo "(both usb and dbus support are optional)." + einfo + einfo "Different GPS devices require the corresponding kernel options" + einfo "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver" + einfo "for an adapter, such as those that come with Deluo GPS units (eg," + einfo "USB_SERIAL_PL2303). Straight serial devices should always work," + einfo "even without hotplug support." + ewarn + ewarn "If your client connection shows no data when gpsd is started via" + ewarn "the normal hotplug action, then kill the existing gpsd process" + ewarn "and try starting it directly via something like:" + ewarn "sudo /usr/sbin/gpsd -p /dev/ttyUSB0" + ewarn "or whatever your device is. This will verify whether your device" + ewarn "is working or not." + ewarn + einfo "Read the INSTALL doc for more information on supported hardware," + einfo "and make sure udev has the right group permissions set on the tty" + einfo "devices if using USB (it should Do The Right Thing (TM))..." + einfo + einfo "Finally, the default gpsd setup looks for /dev/ttyUSB0, in the" + einfo "case of the USB-serial adapter mentioned above. Depending on" + einfo "your default device scheme (ie, udev, devfs, static), you will" + einfo "need to create a device alias if the default name is different." + einfo "A udev rule file has been provided with an example rule in the" + einfo "docs directory. If the device names are correct, gpsd will" + einfo "start automatically when the GPS device is plugged in." +} -- 2.26.2