diff options
| -rw-r--r-- | sci-geosciences/gpsd/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/Manifest | 17 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch | 39 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.3-setup.py | 17 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch | 31 | ||||
| -rw-r--r-- | sci-geosciences/gpsd/gpsd-3.3.ebuild | 148 |
6 files changed, 255 insertions, 7 deletions
diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index 59e2246cc41f..b09049f0cd1a 100644 --- a/sci-geosciences/gpsd/ChangeLog +++ b/sci-geosciences/gpsd/ChangeLog @@ -1,6 +1,14 @@ # 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.73 2011/07/18 07:09:17 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.74 2011/11/20 06:59:00 vapier Exp $ + +*gpsd-3.3 (20 Nov 2011) + + 20 Nov 2011; Mike Frysinger <vapier@gentoo.org> +gpsd-3.3.ebuild, + +files/gpsd-3.3-release-rev.patch, +files/gpsd-3.3-setup.py, + +files/gpsd-3.3-udev-install.patch: + Version bump #380883 by Andreas K. Hüttel and Ed Wildgoose. Add USE=X + support for #369261 by Patrick. 18 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> gpsd-2.96-r1.ebuild: Add sys-devel/bc as test dep. Fixes bug #363203. diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 2a708ece58cb..88e670ae2960 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1,23 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX 2.95-disable-strip.patch 382 RMD160 e9e94c7593b60c12dde86dc4d769ff0ff7a60413 SHA1 4ae5f084998b1538bf5428fd37016f48d57da0ee SHA256 435a6fa9c1ea46befc24af760da9ef96f4a66b9bf98c2b9d5d3f9ba2c72b4080 AUX 2.95-fix-ldflags.patch 721 RMD160 4be1b2ea581d8aef35896acd9098bc298b3199ad SHA1 c8b03243da8d747429632eab871fa40e412be509 SHA256 3a93468ca101c876549bdda0a1d129ca5803706e4291f9fc8e7c74d2015ecf5a AUX 2.96-fix-ldflags.patch 1000 RMD160 a1d4fa399bf9dee71b7adebd2ed2f01d39e7c4f7 SHA1 05530775b53cd5f60f619af8d95499822b42c779 SHA256 a83e03fa5b7b4286724339f44d4933427b7e80cea82887a89a0a7b9cd665a8df 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-release-rev.patch 1206 RMD160 4db37f9d998cc56c32cb1deb0679dd9ba11c0f21 SHA1 e7e3e0a1fda9fd55ea5c0c86ecdcd33972840b79 SHA256 37688ad979c9915e25952f461fefa313682e3f62b8093a7b5205e1e9164df2e5 +AUX gpsd-3.3-setup.py 448 RMD160 3b06265cde87612040ef2955f097fe2b87b433a7 SHA1 e8d1b510aed5b6c267b92c059ceaef255ce0756f SHA256 3a8f18f7f1e957c1b33ea25046dc4116422d087dd9f880f7bf2ad8fd0153f4c4 +AUX gpsd-3.3-udev-install.patch 970 RMD160 1ed13da680ba245f7bb34b14754c27fcce99a479 SHA1 e274a7eda8690658a65305f133bc84f91055784d SHA256 d0e10f7655e010d33309251ddda6157957c3d05bfc22e24124920a8fbf51413a AUX gpsd.conf-2 314 RMD160 e345c8504b020da4b4a0310b59112ba6eb178dce SHA1 d0499491a762e46e7d76854109266b36c1f22c0b SHA256 2d9ab242319f24dac14d53b57b222b288dfbac10cbdf31c9aecbb65cf03c72dc AUX gpsd.init-2 861 RMD160 c1d5a0fd107e3f4bc36a936cbae133c39b8828f7 SHA1 cf08caee2826e7b35d00762c475755bd0ae84d12 SHA256 6b6e3b23d95acd7326e3982509302dbef005e143bb46557c573aca1c0e2cb672 DIST gpsd-2.95.tar.gz 1385681 RMD160 c9e8d3b7ff73c655d65f0f6e329ca7ff241b10f6 SHA1 af1f575c8ec3a2db7a71c35f2296fd339a4a1ff3 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae DIST gpsd-2.96bis.tar.gz 1554605 RMD160 ea09b73709627f95470dbd023e5ffc48209fde6a SHA1 cf123255f9ec54d018642cf230cd05826e507a9e SHA256 c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690 +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 -MISC ChangeLog 13601 RMD160 0dff641823deb80d61bd5835f945cab7c7f0f20e SHA1 11eb3f249d702474028ec8dd647f9d72f8bdf95f SHA256 9bdb59f954cf574be9c6ef3118b3d92b06c6ffc680ac29b82d5d42f6a682f833 +EBUILD gpsd-3.3.ebuild 4006 RMD160 4b789b7576d1f231e11ff2192f98e78bfb16bc8d SHA1 afb232c4dfe43caefa03346fb7dd1f4e77a4a073 SHA256 2108b05fa369d546fc96a15aef3a49173b0acf2a2f49fce643c586e5fd1e294d +MISC ChangeLog 13900 RMD160 43eb545dc1e51ed785be81f9af816d6fa6e1d13b SHA1 9046b39a6a46fa7327e82a326a9487e6b196ebd2 SHA256 f9ccd9c9c7555a2f54b8fee8fcdfa8a470e53d38f044f7020e144e4b45425f18 MISC metadata.xml 572 RMD160 405fe380fe1257019ea02155b4f3c5316cb38380 SHA1 3a4945cdf750d48c8468650c1218c22f77872ccd SHA256 602da5f9768c2f0866c924db204baff61765479af03c71cfe3ae99ed8df7d436 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk4j3B8ACgkQHB6c3gNBRYegXgCfdBD1AOKIoIAFwYBx2X2hPkwp -nJ0AoJjX9IiiMg24TC/WiRjBzs9NxYAa -=Br9W +iF4EAREIAAYFAk7IpToACgkQaC/OocHi7Ja2jQD+P8n6YpX0abI85O2FQpopAmJj +7DZ3BD6yQ1zRpSK8tNsA/RUhOEFbQ9Z/mGFM142Tz0pvzqk/kThosFtBTUYivxfR +=xOQr -----END PGP SIGNATURE----- diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch b/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch new file mode 100644 index 000000000000..29415590caee --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch @@ -0,0 +1,39 @@ +taken from upstream repo & tweaked; drop with 3.4 release + +From c96ffb7733b56a8c5c20d473d8fd83b62b6abfde Mon Sep 17 00:00:00 2001 +From: Bernd Zeimetz <bernd@bzed.de> +Date: Thu, 10 Nov 2011 22:18:07 +0100 +Subject: [PATCH] SConstruct: Use gpsd_version as revision for releases. + +--- + SConstruct | 13 ++++++++----- + 1 files changed, 8 insertions(+), 5 deletions(-) + +diff --git a/SConstruct b/SConstruct +index d367403..3d95e7e 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -978,12 +978,15 @@ env.Command(target="ais_json.i", source="jsongen.py", action='''\ + chmod a-w $TARGET''') + + # generate revision.h +-(st, rev) = commands.getstatusoutput('git describe') +-if st != 0: +- from datetime import datetime +- rev = datetime.now().isoformat()[:-4] ++if 'dev' in gpsd_version: ++ (st, rev) = commands.getstatusoutput('git describe') ++ if st != 0: ++ from datetime import datetime ++ rev = datetime.now().isoformat()[:-4] ++else: ++ rev = gpsd_version + revision='#define REVISION "%s"\n' %(rev.strip(),) +-env.NoClean(env.Textfile(target="revision.h", source=[revision])) ++env.Textfile(target="revision.h", source=[revision]) + + # generate pps_pin.h + pps_pin = env['pps_pin'] +-- +1.7.6.1 + diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-setup.py b/sci-geosciences/gpsd/files/gpsd-3.3-setup.py new file mode 100644 index 000000000000..93cc5e8f2149 --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.3-setup.py @@ -0,0 +1,17 @@ +from distutils.core import setup, Extension + +setup( + name = "gps", + version = @VERSION@, + description = 'Python libraries for the gpsd service daemon', + url = @URL@, + author = 'the GPSD project', + author_email = @EMAIL@, + license = "BSD", + ext_modules=[ + Extension("gps.packet", @GPS_PACKET_SOURCES@, include_dirs=["."]), + Extension("gps.clienthelpers", @GPS_CLIENT_SOURCES@, include_dirs=["."]), + ], + packages = ['gps'], + scripts = @SCRIPTS@, +) diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch b/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch new file mode 100644 index 000000000000..ef000bc27068 --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch @@ -0,0 +1,31 @@ +From b0513cd2e44705058ffdaa7a9c3f32371e9fcd5b Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Thu, 17 Nov 2011 23:44:06 -0500 +Subject: [PATCH] use DESTDIR with udev install + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + SConstruct | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/SConstruct b/SConstruct +index 1f99740..b7a98e4 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1505,9 +1505,10 @@ if env['python']: + # is plugged in. + + Utility('udev-install', '', [ +- 'cp $SRCDIR/gpsd.rules /lib/udev/rules.d/25-gpsd.rules', +- 'cp $SRCDIR/gpsd.hotplug /lib/udev/', +- 'chmod a+x /lib/udev/gpsd.hotplug', ++ 'mkdir -p ' + DESTDIR + '/lib/udev/rules.d', ++ 'cp $SRCDIR/gpsd.rules ' + DESTDIR + '/lib/udev/rules.d/25-gpsd.rules', ++ 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + '/lib/udev/', ++ 'chmod a+x ' + DESTDIR + '/lib/udev/gpsd.hotplug', + ]) + + Utility('udev-uninstall', '', [ +-- +1.7.6.1 + diff --git a/sci-geosciences/gpsd/gpsd-3.3.ebuild b/sci-geosciences/gpsd/gpsd-3.3.ebuild new file mode 100644 index 000000000000..3d2ffa32c9c9 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-3.3.ebuild @@ -0,0 +1,148 @@ +# 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.ebuild,v 1.1 2011/11/20 06:59:00 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 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 + + # 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:' \ + 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 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 + 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 +} |