Version bump.

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

5 files changed, 210 insertions, 15 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 2e758cd15f77..e57f2d12a345 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.88 2012/07/26 15:06:26 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.89 2012/08/01 21:51:58 vapier Exp $
+
+*gpsd-3.7 (01 Aug 2012)
+
+  01 Aug 2012; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.7-rpath.patch,
+  +gpsd-3.7.ebuild, gpsd-9999.ebuild:
+  Version bump.
 
   26 Jul 2012; Michael Palimaka <kensington@gentoo.org> gpsd-2.95-r1.ebuild,
   gpsd-2.96-r1.ebuild, gpsd-3.6.ebuild, gpsd-9999.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 82f47348b448..6e2fbbfcc6ec 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -21,25 +21,34 @@ AUX gpsd-3.4-strptime.patch 688 SHA256 df6eadfa97cf120c76738f6742c5bec6abbc28fdf
 AUX gpsd-3.5-clock.patch 1655 SHA256 89d1b866cfacb1044a5afe6dc00d588846a31b629fa7cd6b85a5a079bed098c5 SHA512 a8cfb7e6133fff48e6384effdc7a29be92497a211799baefd18125feefb54643f428e7cea4e9e5286354839caa136909eac2dc6ecabd1bb0d7d165867c019a4a WHIRLPOOL d1b98538e15f0c8ec3ae05a14e8e5549929723788d3fcaa1c8e13f6895b08ffe6b05a6c8ad80c4ce54eca9737753e4ef61285bdc435a65f412ff12ef14ae3f58
 AUX gpsd-3.6-debug.patch 8754 SHA256 afac1c615bd82cd6d88d4aab7f0c30572db3dfe9978fbde56981e6d3882e004f SHA512 be5407303473ae6f941dcce24815309da88ca98e890d7b622e31f0ae1d24716e252e284ee94998e920fd8f0eedd96dfcd88907f08d95e36bd87c7e82a72876b1 WHIRLPOOL 720f072bf2f0f197f257995120025694620f6afef96ecd4f5bcc731fee0cf6a21bf14d609867ad74d7f1a35c2df32aa2dfa0b5dd25eaeaf26bff88acaee5b90a
 AUX gpsd-3.6-rpath.patch 418 SHA256 a838afc86b19ae5615a7e4babc141468df2ee3ab97027528aab5b1e7a87e75a1 SHA512 1ab54028a6a0f74ea4bc4e25c5aa84bfb49f6855e2e117e49cd00a72d206e18ba057ba0418962bf68127376bb4937d3fd46c4017dd225c9994d6e27fb38cffd6 WHIRLPOOL 4e2356487fe7386cdd272f18454d8ec30b8512a16b9ddcfa9fc295dccc21f7e0a6b765227bf7515ad89b97d546cb3ce2596e82fe50439eb6c9bd31b0fcc5c01c
+AUX gpsd-3.7-rpath.patch 505 SHA256 cc045cfbdf0c077ac11b11681ee313005311c48e87cbc304e3e94889ed61cc96 SHA512 6391748f62d4dbfcc85af8938d0f6f83fc812c1a925cce5f8e3dcc2fa8a8ae8a1d9430332633739042fae6dab1d436897856ffafa1a60f83c8368e818d9564ca WHIRLPOOL edf0c2155e6a2bb65aa36a9604e3b48a123aee4bc33ae14b68e971e6c9b2cc39cb8a87ab1ffa4712554e5d42b392f038b032d17e312204ed8df7a142d3b63f67
 AUX gpsd.conf-2 314 SHA256 2d9ab242319f24dac14d53b57b222b288dfbac10cbdf31c9aecbb65cf03c72dc SHA512 48d157f572b075effaa19fd5d853c3afd229bc8f33a3046366c637faf172bb6610e651701839c16ab67eac407040a1fd18820802241cd76c82db118b5a1b94bc WHIRLPOOL e42256bf787056d706efd3789471adcb8a26ca7641318a29420554bad824f559966e4fdbdba6f580405d47d1b08deacd8b87d02b1bd7e720e12e95af19c93021
 AUX gpsd.init-2 861 SHA256 6b6e3b23d95acd7326e3982509302dbef005e143bb46557c573aca1c0e2cb672 SHA512 4375bcdd39ba320cfedffcc18b2a366b70e81a1f2e734351a6575479dfed678ef038d84c8165ce5127db6be57651c0d4ae9ed5130d26e5fdf920473fff6e0979 WHIRLPOOL 3c476d1a95163e135ab21a9b37b1a25aae2bc0e9535dd532a1a34a30e197b4d4c4772a2aab33cf32d0c6cac8a2f4726761318f9c42a7a018c226a58e61f08465
-DIST gpsd-2.95.tar.gz 1385681 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae
-DIST gpsd-2.96bis.tar.gz 1554605 SHA256 c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690
+DIST gpsd-2.95.tar.gz 1385681 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae SHA512 f48dd0a2942e39de0b1d38a8979e123edbd39de05e2786419433826dfbf9de579fcb9b2c179385bc84313817a4266fd76560253b4e67e2daf419618699abbf98 WHIRLPOOL e9da24e45efee327f8849a4f52e39ebd7d2ce06a0d7372a3b11baee68129e72be62bfd4a5b0ed181cae1b693722bd551ab1337fcdce9dbfc80a091df283329ac
+DIST gpsd-2.96bis.tar.gz 1554605 SHA256 c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690 SHA512 a6ba88b3907293d13032bb623de321b36dfc3fec25502cafa22924c4d0ff187b46f192d27effa9b4214cba3de16dd3c7c0a0fc6d5ba411e2799acb8b3e832aa4 WHIRLPOOL 0fd1471e819759f055ec389d0236c7894f107062331325cb520d60c16431339eabc616019e96270ed54f9defc34a5ed45927977e6e62a16730a0b0decf6552ed
 DIST gpsd-3.6.tar.gz 1449822 SHA256 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc SHA512 a31114f68e9481d68bfb45d90286181eb47083c58a1e1cfae78b73ead36b448050b97a0b31131a58197f32adba4eeb6f798f3c4e55e928536cd68648d5860e18 WHIRLPOOL ef4f569ed32cba0e6c39726dfd6636292f38f4fe45b95035b4c20fd03eb569d12f228b468ba00e35dfd5e3bf4eda84cf3506d418cc553b55b882fa4e15277350
+DIST gpsd-3.7.tar.gz 1460424 SHA256 7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac SHA512 fc6edad8694a62ead2018e78ba5f3033dcc960b89fea7fbc781493b951ff8a3024cfa56a18c96cca747a3394885cdb24e5fce358e8f6a1a17fd4a3248228937f WHIRLPOOL 592908b39f248e68ceb6d2a1b14fa62401388e674aa5cdc901aa8e7caaf6fe5da742cd77530ddb00c5789e2372fdb8a46af9d946af89d6e560457c4eaa5cd92f
 EBUILD gpsd-2.95-r1.ebuild 2676 SHA256 463c5ac913c6e7c6d1af9bdfddfca032974d9daa5ed76b1e0a5a4ae898870ac3 SHA512 73179e1da2c16e8d035e71fa5caa5e9cca47b1bc26ddd173bc75f5c67cdfb311af91a17e21060fb4bec265c23cd37816c5141d494c72acacd4e06a281f98e87c WHIRLPOOL 0c0dc89eaf7e0d1ea5614eef057e1bac3f7f461d456ef6bdbcceafa6b339198ec74e3d6fa118e55a5adecc4e45d5618a913a93eedb6e5b5e4726acd75817e9c2
 EBUILD gpsd-2.96-r1.ebuild 2843 SHA256 ee7e457bdc56a4591d1285c2237b543cef08724c0ee601a4dbc174a75da1f6d5 SHA512 9867fc96638ed0f568f7aff7063a418e458e1d488c9a29de8fc1dd4e14bbe2bd158d3f9e5f3b8cd6a833027ef6820420476477a5567a51385189699906a18ed3 WHIRLPOOL cfc925647c6fac46771271d75abee79e58b15cfbc44f6e4714392f5edd43a7f4b3d7d683f15a12cdc4587750a50f0f8e60b0a910d7a9e68af6fd90b8f1b9537e
 EBUILD gpsd-3.6.ebuild 4457 SHA256 a5290e309e664e7f26189b9732021287e3cbdaf9b69cbeeae77468ff942d55d6 SHA512 9825093cc7ce23b24aebd1f8022d16a9dc6191e5de331bfb6093426cf1332d26f85aedaaac5b88c78b147a05ad9d71882902bdd96625b0848cff010d02e6de4f WHIRLPOOL 19910513c7b518a0a1ad8a7be6712ffb867a94cd0d546edb8b491b35de812ad16447499bbb48f881ca1312a1cdd03d00ae2920436d587e23caf15767708978df
-EBUILD gpsd-9999.ebuild 4461 SHA256 e754006a518ebcd2c561b7fd374c64a296669ec2beaeeb05aaed2135719427e6 SHA512 4037b238da0bd7ebdc6d3fc191c7b0d20b52ff8a74de76b15382076f72a09a59d33432a063e0e1dbb7854266a1143593453b9c8543fd34444b7d9a86b76cb338 WHIRLPOOL f171ec1bc8a348de0afa9cbf9eea378cb4d25aef992cb83ae2e67298436edcc5f3a18db99eb4a2cb1f64ab9a56e3a06bf1a4f499a27ecb89e11fe0ad40287903
-MISC ChangeLog 16174 SHA256 dffde25f39e6aac6150adff64eb748e54ab0701a18ec589790e7640093c98091 SHA512 68df470d043d0efa558126093c85b653747df09802284602ada7111682f6b601b86ef83852f9f0743522b6cdaae85cea20b2583b9746e4302a0a7bea2ee0476b WHIRLPOOL a4ca1eaad48ebb8b5be2d99e179975a0d4ff71d26db8311cf48b722cb69c32cbebcffb54f159eec53568c5e6b3f58a395707e64b096e0a104957f46610ae53db
+EBUILD gpsd-3.7.ebuild 4426 SHA256 591b196151e1906a5abd53e37f741c14505d9721986b1a2b48e935d62ce2b607 SHA512 8465ac972851d63047d19a0d59557cc5f5ff858cb771415a0e051e7ea3f8646b18c647b259e5b3009c4698cf1c95929ab22eef83a9fefec3ddca48e271119501 WHIRLPOOL f5da5cf6ceef6ffd46526e52d9515ff6c71cb80b95ede00710a6970674313c92d4a35bf72dd0ff1fd8887848b1825b2e2ffff52d276cd8727adacbdd0cebf2be
+EBUILD gpsd-9999.ebuild 4427 SHA256 f242277fc45e083d9cec5bcfe71172ff15d1126bc91a1705ff15c1d618bb1d74 SHA512 08960c04b6f9b82343067f53512fb6a64000fdabd16a9ef3ac489a619db4bbf92e38b74023b9378af6ad54d3200ec84a7dcfebebeb6bacca355e780a0354e81d WHIRLPOOL 42a1ea0be6a49126f61b224b02f2961de5bb49942e4bf5477018a5a7db3b971edeadb59aebef390e77dafd0d6f46d3fc263b58ecd0a9470b0d476845d45f8aee
+MISC ChangeLog 16329 SHA256 f42e7a4aa6b2c1d56e29dd4fbafe555906bd16f8b97b64a1d10521a67bfcee97 SHA512 5553201b69bda9eee0dd399a7b7a596d7232d4efc6ba5aac9bc62ff9b4105da2c3e15268dff292e4541723da06b5b2ed2ccbec48deae3893a4719d20b96e6868 WHIRLPOOL b8155f3e80bfc368675c0f84e114f7fe445ff22f37a39dd74f3aefc5753bab405b583ebc4bfcfd0b7fb6b256073f0302b2ca286d12e0258d6a7b2104a54f4e6b
 MISC metadata.xml 755 SHA256 62975e20eaea76bd26e07faaffc0409ff0474fb57b2556040538c4ca4e553d48 SHA512 50bc106147aba89c004898184b01e190b80d2a48154261217a4b1300c08402a76047a2d5e2aa748cfed2e592a397f1bab7e23cfd3248c15d4a25cad4cf3606e1 WHIRLPOOL af10ff7b0657e5976ef72c89eadf8853e042e42bb62263be847247adadab7ba34156c05caa78d8e7282f2ef8cf2717b1b4ae6d99e36972d70b1c8bcec1c094d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQEVznAAoJEMbwO6tnXQ0s3IIH/A8U1D+hOAAmLTEMNBsxOQP1
-ctTK+sK7FQH4gZRUJP/Dy1k0Y1XN99Rk9o6lqllAvqGKpq+QNI0oeOHgrgTjGgF/
-pgKUl4BszkOVxoi4+rOIJPpHNVPh4lqSqhtA7c6ysetr04wy6GARd4DnVwjoqL/F
-2u+Yg7Uh6qeSSSS7Z4LFoyb+HFqMHIPgLgUFJrq3gqxngUOqFf6oqPgcrfrVSduj
-lkZyM8aNLhhmsZVplwHQHEHAjFoZ+ZosFhRb3JTEK7TRuFlzbgytx7E5SvlYvgtl
-rjHiuwLEcyD6u5XVVoPJLhor1ahOnR+HJlPAnwXrSoYhf8YLcVJ1lhUamIKdRf4=
-=GuOB
+iQIcBAEBCAAGBQJQGaUGAAoJELEHsLL7fEFWRFUP/2VLisCQ63H0H13oJ6S98bXU
+XiYtn0K+3oRMib7d089bt4ijdWZu0jQgRmaYAeIac0B2RYeDhk7K+8AP94Oss809
+Ucf5o2RpEv3OOEO+CQt9BPd9fpqoL5WTups4I5lKAeMphftKyozjfv4Egm7goEgb
+pYABAfD027H14K0ucSv2L+xAjz/4A1upQIBt1YsANETOjZJMyh/LKAyPJrSwfNOX
+BWuGVsIwKBLStwAoEGV0mEl76qidElc64JkPniMFq+vx1v4yU8JJKeuiyMahPbc3
+3J79qluyyffGxRZaf1KFZVmb/AUHk/IER8qPpvevHhJrGbaihp8KGNqlq8F7aMEH
+aj1MyDGX+cAAta8jPwfjDJwMPijLb0TXDS9Fvi2l3mXqGo8vN6gzv/+t/7YiA9ZG
+rnqfFbeWc4uqgEqtr0a4m7b7QROahakNBRfbWwkTPhSElMCU5oTM7HyzjU+DV72Y
+by/nvJHeq36GIrlGLMWiYpI1pCmb4FfSOI2IiAJr8uLda97Isafnrt6yDln4NqG2
+8YD64YLKBi4OnTPI1LO8mDd928okV3LOudVKBiKbR0rrp09K8/00/PUOjH1oR+zm
+d+qzwe2yaRZi5oZ2W3oiDNDwqHvgdvHe4ppU1m2dyewin289tmify9HeS4ukG7kg
+lpb6jtClDcq+6icAX9nu
+=62rl
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
new file mode 100644
index 000000000000..5419cd31f637
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
@@ -0,0 +1,17 @@
+don't set the -rpath/-L flags to the install dir as this breaks DESTDIR
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -268,11 +268,7 @@
+     return wrapped
+ 
+ # Honor the specified installation prefix in link paths.
+-if not env["sysroot"]:
+-    env.Prepend(LIBPATH=[installdir('libdir')])
+-else:
+-    env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
+-if env["shared"]:
++if env["shared"] and env["chrpath"]:
+     env.Prepend(RPATH=[installdir('libdir')])
+ 
+ # Give deheader a way to set compiler flags
diff --git a/sci-geosciences/gpsd/gpsd-3.7.ebuild b/sci-geosciences/gpsd/gpsd-3.7.ebuild
new file mode 100644
index 000000000000..12b99c92dd44
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.7.ebuild
@@ -0,0 +1,163 @@
+# 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.7.ebuild,v 1.1 2012/08/01 21:51:58 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 net-misc/chrony ) )
+	qt4? ( x11-libs/qt-gui:4 )"
+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-always-install-man-pages.patch
+	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
+	epatch "${FILESDIR}"/${PN}-3.7-rpath.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)"
+		chrpath=False
+		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-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 0efad3f2a22b..ed9d26bff0a4 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.4 2012/07/26 15:06:26 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.5 2012/08/01 21:51:58 vapier Exp $
 
 EAPI="4"
 
@@ -61,10 +61,9 @@ 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
+	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
 
 	# Avoid useless -L paths to the install dir
 	sed -i \
@@ -96,6 +95,7 @@ src_configure() {
 	myesconsargs=(
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
+		chrpath=False
 		gpsd_user=gpsd
 		gpsd_group=uucp
 		strip=False