Seems to build also with chrony. Fixes bug#406339. Do not keep so much ebuilds around for no reason.

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

8 files changed, 28 insertions, 662 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index c4a8cb6bb299..fde3b6a8fea3 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.86 2012/05/23 14:20:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.87 2012/05/24 16:19:41 scarabeus Exp $
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -gpsd-3.3-r1.ebuild,
+  -gpsd-3.3.ebuild, -gpsd-3.4.ebuild, -gpsd-3.5.ebuild, gpsd-3.6.ebuild,
+  gpsd-9999.ebuild:
+  Seems to build also with chrony. Fixes bug#406339. Do not keep so much ebuilds
+  around for no reason.
 
 *gpsd-3.6 (23 May 2012)
 
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 94191c67c6aa..9def420c23dd 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -25,34 +25,27 @@ AUX gpsd.conf-2 314 RMD160 e345c8504b020da4b4a0310b59112ba6eb178dce SHA1 d049949
 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
-DIST gpsd-3.4.tar.gz 1422890 RMD160 f7cddc018b5b6834a097bbefbddb2b0a3844b203 SHA1 b942902479238f8a3eaa1955299d97461e93081a SHA256 79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f
-DIST gpsd-3.5.tar.gz 1436256 RMD160 5d79e9bae1fa9d96c6104ebbec4386fbe1102a9a SHA1 b280012200a72b745b70ed44c635fccc8dc88cfd SHA256 5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171
 DIST gpsd-3.6.tar.gz 1449822 RMD160 d067eb8114b8a6241fa9ff3c955655ece5b66361 SHA1 aef663ee532a8ebe38521f9f3a889bfb253d2046 SHA256 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc
 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 4271 RMD160 1082fd6fda6c9ee12c5b9ae6c4f8508753906c6a SHA1 9f11ddb5d5d2828a36353421aa05c6e8dda0442a SHA256 faf8236ab66713d04d11a2f4d5cd6d8e62e303e922289ecbb915c9adf0d57108
-EBUILD gpsd-3.3.ebuild 4145 RMD160 454a2da60f501ac74e252c7ea24c974b1fef01df SHA1 71da34e59fbb43815fed0653af9e3290ddef9da7 SHA256 2eea0510ce1e65d67cd65a41a7191bee6f0d0dfdc4eb5a6f218ed61a4bc47186
-EBUILD gpsd-3.4.ebuild 4520 RMD160 c24b952ac74aac3a654008a0cdd2e79b3ad148dd SHA1 464a72037c5b9d3d6a746d02708e1922ce378a29 SHA256 3a3f9910ed99342f62326cf4f2e59d36b9d4f2868e330fb5c72ad8e8e556ac20
-EBUILD gpsd-3.5.ebuild 4431 RMD160 09d54c080a66b4eb60c140b624c597c17b0afa54 SHA1 265cb3a3da1120a1db68af2453237e81fbb65fd1 SHA256 7d703c80d7e43ff75f3db8006b24491c5de5eaeda0af507789258e91e9197e9b
-EBUILD gpsd-3.6.ebuild 4428 RMD160 3040781bee25bc2e717030e1bb824842b3a85273 SHA1 d77fda4da713e70b3a56e9806d1ad57f779f5414 SHA256 f2040ee0b84bdd07033a7f7337864fe4458b9a07684a9112d4d22cd3703f091c
-EBUILD gpsd-9999.ebuild 4432 RMD160 7e96cfa6124c31d681686894dc239e2045b28f24 SHA1 28b11c523416048e7b10dfd89d98e1180c696ea6 SHA256 425140da3bba06134416578ddd9ce0541f11eb51226a93913f27121dcd2bd0a3
-MISC ChangeLog 15721 RMD160 8756f9803d3247e48077bd0bbf7b15d933548503 SHA1 051494b71bc4650d351a0331ca31fb1399c42a4e SHA256 a131ead165daca568e27491a12d2ee57b465f6e98eadcc140980afccd06f279a
+EBUILD gpsd-3.6.ebuild 4454 RMD160 76c126120b0eedd737bfcbb966ddb4fa1e1fb5fc SHA1 b9269310c54dcddfff26cd65d6952866754b538d SHA256 e8fbedd0fcbba799345731677bf56e9f0e5fb802a0d516f818eae6ea67f288c8
+EBUILD gpsd-9999.ebuild 4458 RMD160 0eb53c5cf4783ac0fdea2920b9608a6b36ef5ce6 SHA1 5966fa89f27961d07b0666b26592134231d8325f SHA256 ccef6bf056d1ef9b51081a3074f59a535cea00687e21fe937d034ea20d1cbccb
+MISC ChangeLog 15999 RMD160 f0991638c6c5c59ad106cdce8e27b51f7f562e42 SHA1 58e20f6e899d464001c2904bf9843325764ef667 SHA256 996c8758d35e43e4cf8f008937a3eab521291e91b370c7ace6e9aaca3745e679
 MISC metadata.xml 755 RMD160 5b1284e2e50fbcd3f84fa388c3980298d74bfbfd SHA1 de24f0892fb828f2cb8c64aae6a0f7a53cb5239e SHA256 62975e20eaea76bd26e07faaffc0409ff0474fb57b2556040538c4ca4e553d48
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvPJfAAoJELEHsLL7fEFWNxsP/1aR7RfWFG+9emOoucdoaRi2
-f56h3/BvV/CFj26F+dLnawSPNFw9E/eSMYcq0lc8P7H+ZIVl44r1KClRWa8N4sge
-JvVU51vUvMnUPRxLPFTf8BOOznEqMHeDhJDYbF2OSc0lC66YfS02HjIZJoEUXSFP
-vsfVZQDXzWagejHptauTez2hzcHzCJormnQIxMWZfvT1rHovF4qr+Fq4Zs/Mzu+D
-PXLMI2gFODcwPiqa3cCbsLbsXzAfXcZKwCnZjcvGbGSioHSKGIJVKTtqdCa44j9w
-EhjzV3z1ES7bZjLSYZQi0nsWhndu3aur/pTmTOlyLe5BxvJzJKLuKLw79LXexUCz
-iGMfhLteiqdS+jPty2rjAJvgBhfdepw4EjBbzJRbNlKu+8xvrhNkkX2VUZi2zvyh
-0qQ0sClpmzyE2UWQLOWVZVTyGKMWZJbGL7ixao4UsEyPJcoy0SxACMnQLP38oxNI
-QG27BcR3Lr51JsviORYMfhQrMBCcmVtE1p87W18DDW6a96Th2oTb9AzTB2SHwKMi
-GaPv8wAeqcbyL5dpdGqQunXUGA3MRLZ8Msi1WosyGcdo4V7RrGzji2uwX3kPFoo5
-YOI/b02y+WABQ4SZ5yLv0FRVf6B7MPglj8rCqWRFEGG7Di4FbsBMBZW6TUK4RYRN
-6lNRp7fFixI9GfCrV7Ia
-=8vG7
+iQIcBAEBAgAGBQJPvl+sAAoJEOSiRoyO7jvoxJEQAIsXetG5j4I+4QREMC1WCOc4
+j8dPhZamNJL7vS0XEaveS6pQrAtpOVAAKGC8WhOsc33G9X0Ed3iimNBgrd/H2Yox
+RYWLveW2g2c0Dsk2BDZR/P8+9bPDephoCTJDZTB0T4Z2bymvoFvMT8D8L7V2Xah6
+i8aKsaNFsoZQW68byOHcX3yh5DoEfjz8TmCGo6B3KZf0ng8rEKT4HW+bGT0yW3DZ
+/lA5gk0l7ie/417nAjgBqtDiF6BfQ5bodWp1n3fhuVubj8zFNKGkVpdnxigABHCA
+MNm9usOZrBLp1iyWOSJxnLnebo0n+wdzTd2aPT1jJvsb1OmBHWA2ozGET8heAb+P
+C1dt977FZJi2OR2K/j8/ZbcRxsAcGOjjr7TIgxrx/jpQQve5LeIRzY1yMzT3QnSY
+84Wr+/5Aes0w1sm8aIR2X1RgqTzzuol/8/ImFczvZgeWfR6sw+eX/Pcf7YHy7zSJ
+aOYP2cvid7q8BHUO2GIde7MyEIC2MVh6lEzdWZJeCp2ID28Dy6bzJEWay0pRIIzu
+6i2jmq47pY5GrJJWH8hMiqfoj9p/kkhZDqrOVAdXpNwqMCHjlyYFdhlgM/t85TEY
+OlVvvCnqkn6N3EhT+IZFAovLePsUWumqIjoj1xWASTIz148HeF5USmYYdkJnj0ey
+/FTfGiuknaKoiXX3yDvw
+=H0kY
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild
deleted file mode 100644
index 66882ebccdae..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.3-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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.3 2011/12/07 16:17:42 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 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=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/gpsd-3.3.ebuild b/sci-geosciences/gpsd/gpsd-3.3.ebuild
deleted file mode 100644
index 9cb9965f5fe7..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.3.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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.4 2011/11/22 18:52:30 flameeyes 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
-	epatch "${FILESDIR}"/${P}-pkg-config.patch
-	epatch "${FILESDIR}"/${P}-ldflags.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 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/gpsd-3.4.ebuild b/sci-geosciences/gpsd/gpsd-3.4.ebuild
deleted file mode 100644
index 5e719e92baf4..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.4.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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.3 2012/05/21 22:36:22 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-cfgetispeed.patch #393515
-	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
-	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.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
-}
diff --git a/sci-geosciences/gpsd/gpsd-3.5.ebuild b/sci-geosciences/gpsd/gpsd-3.5.ebuild
deleted file mode 100644
index 66dd7e2984a7..000000000000
--- a/sci-geosciences/gpsd/gpsd-3.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# 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.5.ebuild,v 1.1 2012/05/21 22:37:12 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-chrpath.patch
-	epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
-	epatch "${FILESDIR}"/${PN}-3.5-clock.patch
-	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.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="${EPREFIX}/usr"
-		libdir="\$prefix/$(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
-}
diff --git a/sci-geosciences/gpsd/gpsd-3.6.ebuild b/sci-geosciences/gpsd/gpsd-3.6.ebuild
index 89841abb45d1..0892ff798161 100644
--- a/sci-geosciences/gpsd/gpsd-3.6.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.6.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.6.ebuild,v 1.1 2012/05/23 14:20:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.6.ebuild,v 1.2 2012/05/24 16:19:41 scarabeus Exp $
 
 EAPI="4"
 
@@ -43,7 +43,7 @@ RDEPEND="X? ( dev-python/pygtk:2 )
 		sys-apps/dbus
 		dev-libs/dbus-glib
 	)
-	ntp? ( net-misc/ntp )
+	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
 	qt4? ( x11-libs/qt-gui )"
 DEPEND="${RDEPEND}
 	test? ( sys-devel/bc )"
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 64b570cd867e..375357d28465 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.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-9999.ebuild,v 1.2 2012/05/21 22:37:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.3 2012/05/24 16:19:41 scarabeus Exp $
 
 EAPI="4"
 
@@ -43,7 +43,7 @@ RDEPEND="X? ( dev-python/pygtk:2 )
 		sys-apps/dbus
 		dev-libs/dbus-glib
 	)
-	ntp? ( net-misc/ntp )
+	ntp? ( || ( net-misc/ntp net-misc/chrony ) )
 	qt4? ( x11-libs/qt-gui )"
 DEPEND="${RDEPEND}
 	test? ( sys-devel/bc )"