Update ebuild to match latest git source #527000 by Michal Privoznik.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 37 insertions, 10 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index d5cfe143330e..3cb7b5c938eb 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.121 2014/08/10 20:27:43 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.122 2014/10/30 21:16:11 vapier Exp $
+
+  30 Oct 2014; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.11-rpath.patch,
+  gpsd-9999.ebuild:
+  Update ebuild to match latest git source #527000 by Michal Privoznik.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> gpsd-2.95-r1.ebuild,
   gpsd-2.96-r1.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 17f17aedd36f..84a13a498b25 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -9,6 +9,7 @@ AUX 2.96-pkgconfig.patch 1377 SHA256 8b20899afd3e0e391664461ef359eef1ed6bfc49ba6
 AUX gpsd-3.10-dbus.patch 888 SHA256 ddff0fd7adc970af01815f01e644278d81135d2421735253c6991f682cdd92ad SHA512 26a8259f5d18ada712220c537a09d4488a908755190a11470fca36a9d2a2b83be264803d29e6aec1377dca4ad5a465283eaedff5d2f318c1cba57f3506e88a7d WHIRLPOOL e1c4654ba9e567a216762994919620d3147c1faef364137a163f73a29de3fa5b7f61a771459d5b97d69b7a1f44be6e72dd14c9c199149c7f28bf056f961b1bec
 AUX gpsd-3.10-rpath.patch 476 SHA256 a09ffb9052563b8f9d93a30c6ded7508a4219fd424c02e06b1c1da03cadf5348 SHA512 f83743ea2045edd6ef35c4d92155c0e07c6be64e67a36a31c7455718214c55db5bedf18ce9ffed22e9a80bc8c04c4e7e728723f0e6bc3dc35ec14c3e94b0b0fa WHIRLPOOL 2c69c65843ff3682428aa72e04fb3c4a5f18412b5012da6d9277481dd9d04845d32382d0c9fccb51bd1e38a64bfda744ac5b1c61294b643f3728832dec9b9578
 AUX gpsd-3.10-udev-install.patch 1400 SHA256 02eed61a8f91e62304ab5c26d87e1db72634a5590214fdcd08299449383c7c0d SHA512 9dc807b779850aca345ecb893e90d9cbd47d19b36e4058afa91ab6d3ea386940dacfcf8cffc3f204bc8076df6add73eceabd7dc15be4a2c6a03f58c2b6c43b93 WHIRLPOOL f4f9a207733fda2fe4705cc2639871047d6aae2e1ed76f95b3f39a35797a39683d98ecade9f0f74cdd31fd8c0cf91b2759f80c020db62f1cbb370eeb73d25c7b
+AUX gpsd-3.11-rpath.patch 384 SHA256 8e44a427c274e22684719b5fa84663db4f013264af619ee48118538cadc77315 SHA512 fe328ab2677d54c0f03322f14e2bf59eafe6a0346ca574746419956725d04c69e5d6619202ac310079bb36133181a66ace89fc0ee8a1aafd148076da6ace635c WHIRLPOOL 9cfdf16e3b938c294e18c774966622b39eb2a3239b76dd50a61a394d641df2f595ae1d296e88a18ed861914811f6613214eebf79b6f4f0e3530c51a50174a0c1
 AUX gpsd-3.3-ldflags.patch 482 SHA256 e109744b2a1e066df9bd421a8a653eacbc233877d1588f6695f77ffe1c3550fa SHA512 b45ca2aac1f218bde639b3e186fded0274492e1b9718cf69eed4f285c7e798251baaac25922a7b36c7682ca1e84c22a44bad513e230e631eca7a36b58bbd4629 WHIRLPOOL 4eff0a89eebe30d8b96be1290cfe816669d3ae92aff02dbd180321943493091b12575d80a87b3167fc3c8a872422756bb9d68a3da00a5a7855cb83c29afa4abc
 AUX gpsd-3.3-msocks-init.patch 930 SHA256 6dd2f216856f44c70a780a59bf5a2226858d01a9df779a37805271c044d258f8 SHA512 d90f20ca8390edee8319f4f6e21491f1f6105ac12f8d712d7ea46f56f4fe5e7a22a23d17cfbdcafbc1cd7363018d0f36b0cfb35d594667f8cbba813f606f04fb WHIRLPOOL 3551b561705d085fb60c330446931c0e4b4ec33dbd02afb1808b56b85f64bd4b6097287af1696a498bc280299ba6cc5eae5ae3042ad123bcc66126153a4df5da
 AUX gpsd-3.3-pkg-config.patch 1925 SHA256 1b97692277e94969c547e3cb35185554655500ebbab2e84467456a0c03a1bc79 SHA512 4753f54106f6ddff3f6289ac7d9fc8294dfcc64a90f2068f3edc9599386c40e3a28c7fd41715a6f3cb4e82fd431198206a79311d36175dcb9f878e46d1f85f78 WHIRLPOOL 9225d8af13a767b8ff24f8c70e28784af7f33a0a2bdcd7040963a8f592c42b1c37d7cf43847357706985c7785e8196669b6a5115623b11fcda09b26c919f3bb7
@@ -48,13 +49,23 @@ EBUILD gpsd-3.7.ebuild 4633 SHA256 40fdbc2adc62a477c954ed0f532f7e4ce5166dadc2b62
 EBUILD gpsd-3.8.ebuild 5148 SHA256 bfb852bba0f02ec9b1df3cb31eb9e656edfe2cc47e002f13c6cd44e900aa5387 SHA512 74923f2ee2e8e938ca590a358873d784b5df7f05e0869a4a0f7d1c6b713b14e35b3e6b4f3b7af7678a84b57120507f0d2b3b3c51eeb6e554c7c015e0d9826853 WHIRLPOOL 40c8370381e73492f83d509be62f569528beb8e6fd42e142b91988af2ba2a993cad096474437b5e47a84d9d5a04ceb9c57a8d1e45aa995dbb2b767aa4f90e38e
 EBUILD gpsd-3.9-r1.ebuild 5128 SHA256 8b9f4f149dfe55d2695058edac6ade48303ba2585534026157579b10788c1035 SHA512 d5ba1442f369a32d5bfafdff5ab78eb23976b3a1cf208e94e5d779c7098e9727b41742111d9b388f38fc515c7442ebb71dc086dfbcb543a6c6e4c8a0749413fe WHIRLPOOL ad2fb7d384b937d4996eccac12e01e29cb4e5d4cc53259a9cfacaa3ffd9d78660794e447bb086d437f56379cd3dde0f5755ede5bae2f40fe711ef92a592129ed
 EBUILD gpsd-3.9.ebuild 4939 SHA256 c9b058ed6fd719264d264cf179b8305af8a6dfed18b5ba0eaf652287c7d7068f SHA512 dae29147bf6d21d7c194858ccbe9382e3f25522c0ab02f0622d4ad50966dc6005b79318e698a5f80f33dbc6fb17272364f7c3bf0eaad166c13b8b5c3f9f66da3 WHIRLPOOL aefb80511845c798c1d877ed89eec8ba8659df18950e5f9a7fb2f0cb040961518e6d9aa8d79ecec3376b0075032b3f3aa06e4ac434e4c3e83d96bc7b0ac7a2b1
-EBUILD gpsd-9999.ebuild 4768 SHA256 6c09c78e0d93eb7932829bf91f46730c8d0a02a8d67f1107b600d59195814dfe SHA512 a9082559702f2a688b2112d0ef1ff6096b889bf940b4a35b83cdd9d317724cf9e33f1a7233df21cee2d7fb8c0fa4881148ed3812fa6afcbadac27374dbd450e9 WHIRLPOOL f14cdf18d3004b74943628c3dc7678e98e37ebf2e42c2c979a457dbe519f22432a176e53e3b2e434d4eeb29a01ed34c2403aa75d86ea333ed9010fe2ff90e921
-MISC ChangeLog 20827 SHA256 d7f83d44c81464130464faa7ac9fd37913e58ea45160510361b9d82cfbc1b539 SHA512 0006c898cb147ad0dad73815f287eeb095bcb8b64ae6b8c43cafb0e3cbcc5c81c2e9300e72ce2a50f794f0f988ef1dad39a13860544c8b6c731089f5cbb2e391 WHIRLPOOL 271051ebe50e5a11e255a21dceb8bf66a265494ac51253ddad837e39650fe7bc3987bb5ad9688f9adba11fbb232a6603f7a50bb55c2755f29ad72ae4b53023eb
+EBUILD gpsd-9999.ebuild 4773 SHA256 48a359d3f2a73ad7c1ecdc1bbcd10c0031c26beb5c0cddf7570ca631832f059d SHA512 b36d78f3a7b2f4b5629ae6e75320d14c1cdb448c2aeee7eebd3869314848808139deaec7eaa8f155e6fb9e6e74db37037a3689b715a269bc265e8f4060b2031f WHIRLPOOL 5d903e086048c2cbf529d6800b37f61a1e6a2932e01228bebbb738b237eb95c2bb4c457780e730f07b56f92c83b77bae02244014c37a9ad40afd588c2b233dd6
+MISC ChangeLog 21000 SHA256 344d2e81837fc20fcb143e58b6ce534e761b83d2461f637117d529e6434412f6 SHA512 7beb8e8685e79f4ac9623546002a8b15ae16afa4c2a1a292e50d786f758265042f2c8e297241adee9af15638a3c53a4b311182d15b26f07c657ec34c655ee3e9 WHIRLPOOL bbf65f364d1836c58e8463f70ffd932510d5f05e0a6193037f85a2bf00c1d43a4037e493d995018c25319a298d540966367b62425a5d232289c43180a809ba09
 MISC metadata.xml 754 SHA256 73824ede219103ca6d5ab2736451ad4f5af1edc833371baeac9d77e0835ffcf7 SHA512 72f8f6a877d7a73c75dbd6b0838e94a8d5636750d0cd4af84da44d9c3f89724a22f4bc083851cf43942ae4d39072a654201861d9874b1cf74ebe7b499b94c7f9 WHIRLPOOL 852f39fadd454dea8383732e78b2d68ae4c935a7c82c2876a5f5273cfa381676a5dd59e1f0d8fe095f6f454b1628b5e6ef8782b7ff186a169234aa96e72f2971
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn1cAACgkQcaHudmEf86ph+gCfT7Sn/rO3aYLAOHd55eApI1fB
-xXoAn2LAg6NR99LMpLE8B5Uolvov0ata
-=I68K
+iQIcBAEBCAAGBQJUUqqcAAoJEPGu1DbS6WIAXncP/2xF7n+4gZgY4sbj+LNeyxp2
+UPfRXyDIo8HR5yFJks4+ANofxUA1Jewlfystj2/nhv1iILyUD6iy11AaAnE1F/Bf
+N9abzZMcaBJ1E4aPHcefd89+LbXfDqSSxr02b+2m1PfjZ7itgZmNYPVH9B6nbgVs
+cKlW2+wS+MKH67iNH3qwNzjfLrV/93vEYfucvj9s2hzhsJrDjRo1mFnEdMpPefY4
+zq3bYm80pZmQrQ6toewzfyQPJchLjKpXMB/S6c2FgKXyMZR49ncS5k4n9kI8oHiP
+xG2G64K4Jrjtvqn+2/jfGCMc0L26FcKtOpfNVfSOLl676W/ykXoKbhxt/ApRuYo3
+ucoqKmpTFEaffPQ+DxFsLGKIxM0Cn995C8yaFJSJi4h3SNJQZPMqD146Bnt+sAwS
+ISvjTXaSIFcHNm3ix3ibH9++52MPmBaKQDHk7VvX/K5c7YoSBjUh+7RbmKYQhOWV
+XfXJ/fatZPuKQuCqx+TB1SBqg/+it7c4UilhgPx7lx//f9EUKkhrAffw1AQSTOmE
+tBJyp+4D9zhJcOcrE3rdRUNbq2WhDkMwMeOC0zN72Dd2At3P9sWZToQN+SUPFBZU
+lW+rygd8Irotnd/AzVpPPLd6nn0HvB1m8EIz4Nz7H4MrQy2mxWsuRMfSB97qFXwf
+/05w0SitP9c2seuYTLTs
+=c9sY
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch
new file mode 100644
index 000000000000..7615b8b5d73f
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch
@@ -0,0 +1,12 @@
+don't set the -rpath flag to the install dir as this breaks DESTDIR
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -287,7 +287,7 @@
+ 
+ # Don't hack RPATH unless libdir points somewhere that is not on the
+ # minimum default load path.
+-if env["shared"]:
++if env["shared"] and env["chrpath"]:
+     if env["libdir"] not in ["/usr/lib", "/lib"]:
+         env.Prepend(RPATH=[installdir('libdir')])
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 73e6e2bdbe7b..47ff9d0eec07 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.16 2014/07/30 19:41:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.17 2014/10/30 21:16:11 vapier Exp $
 
 EAPI="5"
 
@@ -26,7 +26,7 @@ SLOT="0"
 
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
-	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+	geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
 	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
 	tripmate tsip ublox
 )
@@ -61,7 +61,7 @@ fi
 src_prepare() {
 	# Make sure our list matches the source.
 	local src_protocols=$(echo $(
-		sed -n '/GPS protocols/,/Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+		sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
 	) )
 	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
 		eerror "Detected protocols: ${src_protocols}"
@@ -70,7 +70,7 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
-	epatch "${FILESDIR}"/${PN}-3.10-rpath.patch
+	epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
 
 	# Avoid useless -L paths to the install dir
 	sed -i \