diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-02-09 22:14:45 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-02-09 22:14:45 +0000 |
commit | 3662e6f38a7f0264df778e05d5a6db55bd9910b6 (patch) | |
tree | 0b7e558817717235e860cb4f0c9ed8756a80daf5 /sci-geosciences | |
parent | Drop buggy code as discussed on qt@gentoo.org on 2012/02/02 (diff) | |
download | historical-3662e6f38a7f0264df778e05d5a6db55bd9910b6.tar.gz historical-3662e6f38a7f0264df778e05d5a6db55bd9910b6.tar.bz2 historical-3662e6f38a7f0264df778e05d5a6db55bd9910b6.zip |
Do not require xmlto for releases since the tarball includes the man pages already, and add a live git ebuild.
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
Diffstat (limited to 'sci-geosciences')
-rw-r--r-- | sci-geosciences/gpsd/ChangeLog | 9 | ||||
-rw-r--r-- | sci-geosciences/gpsd/Manifest | 32 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch | 36 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.4.ebuild | 23 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-9999.ebuild | 162 |
5 files changed, 240 insertions, 22 deletions
diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog index 85762b2c644b..9e97caa7d0c4 100644 --- a/sci-geosciences/gpsd/ChangeLog +++ b/sci-geosciences/gpsd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-geosciences/gpsd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.82 2012/01/13 17:32:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.83 2012/02/09 22:14:45 vapier Exp $ + +*gpsd-9999 (09 Feb 2012) + + 09 Feb 2012; Mike Frysinger <vapier@gentoo.org> gpsd-3.4.ebuild, + +files/gpsd-3.4-always-install-man-pages.patch, +gpsd-9999.ebuild: + Do not require xmlto for releases since the tarball includes the man pages + already, and add a live git ebuild. *gpsd-3.4 (13 Jan 2012) diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index 53517415d8ac..273f4612b171 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -12,6 +12,7 @@ AUX gpsd-3.3-pkg-config.patch 1925 RMD160 eeae061c8e807ada8f736d89e3146847bc9a1d 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-3.4-always-install-man-pages.patch 1258 RMD160 e56c42aea2d024a06d78adaf337346126292ddad SHA1 9e2b643bab4a3b3f7eb6dc3693e794db034f89f0 SHA256 8fbe8b210cd549e3377f4955d35753f3fedab2604ebc4dfc95bebe797b583c74 AUX gpsd-3.4-cfgetispeed.patch 1975 RMD160 60f509b398b33f4e4437ba22fb42bd2fc2f4fcd4 SHA1 c263053e552f6b8a9303e503c4a7ad5515a30761 SHA256 e6eee311765eab99cfc682939a693ff30066dead6e17e1b60371de01360e9c01 AUX gpsd-3.4-chrpath.patch 2838 RMD160 946ec7cca14ea87667cdd41092f767b4fe45ec44 SHA1 fd69c0ba2301e84b77f822a29fffea8acef984b0 SHA256 001944b926d9d328d78a0d971ed610e797b49a07d50bb1933b660b5af2a4f948 AUX gpsd-3.4-gpsmon-lm.patch 980 RMD160 661751e70335bcb21f8e51091e18a115d9428328 SHA1 d411f29a494c20c5b43281cf1e35d4816950544c SHA256 18719b3557cada637ef2ff824d065ffedcc9598ddea0961925dc6fb9571a2eed @@ -26,23 +27,24 @@ EBUILD gpsd-2.95-r1.ebuild 2674 RMD160 3cfe82ffac9f57d771b6728420d106debd49c22e EBUILD gpsd-2.96-r1.ebuild 2840 RMD160 75cc21a587c3ef12bb891f8a2dc7ee30fa7cfb1f SHA1 bdf8663fb324ca8ddbe81b58348d12b6a03174ca SHA256 04bab92bbe716753ff6bcd719fa958e32440e7bcc219c6d409936edda0fed695 EBUILD gpsd-3.3-r1.ebuild 4271 RMD160 1082fd6fda6c9ee12c5b9ae6c4f8508753906c6a SHA1 9f11ddb5d5d2828a36353421aa05c6e8dda0442a SHA256 faf8236ab66713d04d11a2f4d5cd6d8e62e303e922289ecbb915c9adf0d57108 EBUILD gpsd-3.3.ebuild 4145 RMD160 454a2da60f501ac74e252c7ea24c974b1fef01df SHA1 71da34e59fbb43815fed0653af9e3290ddef9da7 SHA256 2eea0510ce1e65d67cd65a41a7191bee6f0d0dfdc4eb5a6f218ed61a4bc47186 -EBUILD gpsd-3.4.ebuild 4244 RMD160 c5b41ac99ddd7cb970190a8839057b375ce69260 SHA1 15a14cfa33c1ac99cdc1b0c1d812268bc7ae67b3 SHA256 c648a5acd00e8b04115a538150b6733a9844bee095085f1d93837b5caa3a46e2 -MISC ChangeLog 14952 RMD160 d3405ef700b7658fe84e324681239e42ec0b456d SHA1 22a709777611cd046775b2900507de2155f9893a SHA256 3bb3d151a2a711728c56c76987339efe16d975738802d5b801d62ebf83cc3bb8 +EBUILD gpsd-3.4.ebuild 4471 RMD160 f25f77e7f4f375524468c6db616f9acbfee14ea6 SHA1 5edb6cafb9352d0c1b201b1585c4977d33761337 SHA256 da597623a584953d665c53535af9c924c10fa6068a6d329365263ac707d3f9a9 +EBUILD gpsd-9999.ebuild 4366 RMD160 2605ae104703a3f2d46cd2b4d4f49a46956a0666 SHA1 f963d038006146e477bb6af22c6e2b13c8902458 SHA256 9cb8272c6c3cac249a8b446c19a2260386212eec725bf26c626eebdfa5d6024d +MISC ChangeLog 15230 RMD160 2d2736f0b48528e00435651d64e448b93ed3e01b SHA1 391f99b47529932d30e1d993ce97bd05f9cd9d7e SHA256 59bd2e708e1f06c8537e8f9abdee6da606a09b9707686aa7062a41f342a37b85 MISC metadata.xml 755 RMD160 5b1284e2e50fbcd3f84fa388c3980298d74bfbfd SHA1 de24f0892fb828f2cb8c64aae6a0f7a53cb5239e SHA256 62975e20eaea76bd26e07faaffc0409ff0474fb57b2556040538c4ca4e553d48 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPEGqdAAoJELEHsLL7fEFWq5YP+gJqnlcgq8wRWq65tW4seZSQ -6cZgSmAeE3KMy7DBmndoMVCl/hWQJZsC4SmcX6iwlUulEmXHlMG3zywOIXREMzvJ -1cKS5JFEJ9NQ3qeXE0eIE2oeIH8tszw61JhF8aD/nIvQJ3HYjzEeFX1sQH7YI0zx -ANeihbHvMKOSZ5maaOYQBZb/W1s+o0CKx0/x1qKV/obCtvGNVGfp8u5Y1ztc5o5T -s8Lh99HDcDKKcpj3LjP4NB4UuyfoFZ7XxA3ny/L6QAfBWUIS/2nlGXfHo+29oRe4 -gCTWqyC9AY7sftbkTA1idNVDAbJv4cCDAKlCSO0XNn5ez/POG42jUkbVlqYdLTy2 -JTH7pFuEgJoLQ1Lexv+B4kG00XZWgpDXfBalXbsaV1+apOVFXlrPcKU6/nHQx7J3 -eqiLhcCqIM81/fpKJxaJTcX2xugeMS9LMxvhtlUPdbVe02PDp0XMh0xj7KA4snVA -3qSXfn4HApUM7sCWab+Dz5jAOx8OV4sD7P6TTq3uoLUPhhD/At+zPontPp3yumV6 -Ekq/+WgHPU0jsiVcb37vULeLyQKbElFPJ0J4dWS2tuecmu8kHDXjPebHkcjXBGdO -sUDXEqXcVDFeASjy3EaM2zTrNWRpJ4oFV6g18xWwYXRQub6yhSEeLVxTaQzPS8C/ -eWdMpCqDeqHwD3kEYIg6 -=K3bD +iQIcBAEBAgAGBQJPNEVeAAoJELEHsLL7fEFWpZ0QAJmWjESEpAeg+veNV9omG0nm +s40QFZVH/jG70neZ3/hnP0TYDhDBq4YQP67jxRx8UC4syCM0ziGKl5jBwvFekMmi +a4AtINLg3dTsSpR+lyoTYCEXg/aNBdZywvEkEcZYMAaZjfPN5xuznpWQrNTEhrEE +HfrjlSfcA2YpGpXaQTjX47pkzzJo6GfnewGycy0XIyQlCcZ5P7XmOtgOS3GdTxTS +hoBVYkxFzpyPEzxRBzasAUp2JK+jiywlM6AOOgdf+k3XPXBfeC0vUbZirBf9yn80 +FWC0cQSYOctN1EicmMgwvPa2IyQuSO3cWy42pp7gP1RCrA55BcNYqGZHtBc4zjes +KdH286pq/3rY3xPN5eM+2seLRWlyirU2AFitWLSaH0JfE9eqEB3KeefCe5bszi7H +T+qUPGaE8LD13epwTLcxK1jBEyd+X758zlfgHCrS2pu6C/5qobZe0ySoTKHCJOf3 +L/lu9MO28K92OOA3d6F5+aTyTWzU7Z77ol+c1/18C2vch33je5pP/tc8O/w//W91 +CiPpesJCbc4XGtRegpVmWxhImYnW8nsWxHC8VFeBaa1cSFmZ63DQvF9G8Ajm+fy2 +GEw5zMaff/tfEphAZP/Vtyjxe9X15KTItd5KALSw+KNkfHoe81l8FwsQeEv/zWk+ +203tPe7FCraveIF5TZIK +=nEn5 -----END PGP SIGNATURE----- diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch b/sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch new file mode 100644 index 000000000000..c9c1c7d109ad --- /dev/null +++ b/sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch @@ -0,0 +1,36 @@ +From 918d6d8e5bac3981126cb01e673430cb7c96ec02 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Thu, 9 Feb 2012 16:51:24 -0500 +Subject: [PATCH] always install the man pages + +Since we maintain local copies, don't require xmlto/xsltproc in +order to install them. This makes packaging simpler. + +Signed-off-by: Mike Frysinger <vapier@gentoo.org> +--- + SConstruct | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/SConstruct b/SConstruct +index ab85b7d..fb08779 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1186,11 +1186,10 @@ if qt_env: + + + maninstall = [] +-if manbuilder: +- for manpage in base_manpages.keys() + python_manpages.keys(): +- section = manpage.split(".")[1] +- dest = os.path.join(installdir('mandir'), "man"+section, manpage) +- maninstall.append(env.InstallAs(source=manpage, target=dest)) ++for manpage in base_manpages.keys() + python_manpages.keys(): ++ section = manpage.split(".")[1] ++ dest = os.path.join(installdir('mandir'), "man"+section, manpage) ++ maninstall.append(env.InstallAs(source=manpage, target=dest)) + install = env.Alias('install', binaryinstall + maninstall + python_install + pc_install + headerinstall) + + def Uninstall(nodes): +-- +1.7.8.4 + diff --git a/sci-geosciences/gpsd/gpsd-3.4.ebuild b/sci-geosciences/gpsd/gpsd-3.4.ebuild index 2ca85199b7ea..6ebf24fc1b38 100644 --- a/sci-geosciences/gpsd/gpsd-3.4.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.4.ebuild,v 1.1 2012/01/13 17:32:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.4.ebuild,v 1.2 2012/02/09 22:14:45 vapier Exp $ EAPI="4" @@ -11,13 +11,19 @@ SCONS_MIN_VERSION="1.2.1" inherit eutils user multilib distutils scons-utils toolchain-funcs +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" + inherit git-2 +else + SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +fi + 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 @@ -39,12 +45,16 @@ RDEPEND="X? ( dev-python/pygtk:2 ) ) 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 )" +# xml packages are for man page generation +if [[ ${PV} == "9999" ]] ; then + DEPEND+=" + app-text/xmlto + =app-text/docbook-xml-dtd-4.1*" +fi + pkg_setup() { use python && python_pkg_setup } @@ -55,6 +65,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.4-gpsmon-lm.patch epatch "${FILESDIR}"/${PN}-3.4-strptime.patch epatch "${FILESDIR}"/${PN}-3.4-chrpath.patch + epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch # Avoid useless -L paths to the install dir sed -i \ diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild new file mode 100644 index 000000000000..49a95f9c21b7 --- /dev/null +++ b/sci-geosciences/gpsd/gpsd-9999.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.1 2012/02/09 22:14:45 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 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" + inherit git-2 +else + SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients" +HOMEPAGE="http://catb.org/gpsd/" + +LICENSE="BSD" +SLOT="0" + +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 )" +DEPEND="${RDEPEND} + test? ( sys-devel/bc )" + +# xml packages are for man page generation +if [[ ${PV} == "9999" ]] ; then + DEPEND+=" + app-text/xmlto + =app-text/docbook-xml-dtd-4.1*" +fi + +pkg_setup() { + use python && python_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.3-ldflags.patch + epatch "${FILESDIR}"/${PN}-3.4-strptime.patch + epatch "${FILESDIR}"/${PN}-3.4-chrpath.patch + epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch + + # Avoid useless -L paths to the install dir + sed -i \ + -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \ + -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 socket_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= + 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 +} |