Version bump.

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

4 files changed, 288 insertions, 15 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 3be1dd58c004..5ae6f47bfbac 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.124 2014/10/30 21:23:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.125 2014/10/30 21:32:38 vapier Exp $
+
+*gpsd-3.11 (30 Oct 2014)
+
+  30 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/gpsd-3.11-no-ntpshm.patch, +gpsd-3.11.ebuild:
+  Version bump.
 
   30 Oct 2014; Mike Frysinger <vapier@gentoo.org>
   +files/gpsd-3.10-nmea-disabled.patch, gpsd-3.10.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 039a7ed657f1..7aae56b48374 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -11,6 +11,7 @@ AUX gpsd-3.10-nmea-disabled.patch 1818 SHA256 371bff4f18b23f6f93b0a237c7043eaaa9
 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-hotplug-config.patch 655 SHA256 48541d13623a0d6991dbbb0e53ce4c8c9e7abb54d9cef0e0d3a02d36f3ee158f SHA512 1d94510798f67b899232ff4c06deebdf0495da31ae8eddeef9133c841fbc9cfcaed4be484ded9bc4502c4489b4f6fd0c9665a9a07dee06345c4d713bafd6c97c WHIRLPOOL cc01b407a17702cfea75cd20fedf336c3720e005049dd660a43284820391fadacb769399fbb92017b3127e707cfed4c4cea887b9c8a437b7ec27f68dd6820820
+AUX gpsd-3.11-no-ntpshm.patch 3209 SHA256 6afdca4a6b76c4a76e5f7708a49e8c287da52821580990befcffdbf3bda95f8f SHA512 84e80a7f01fcdd0e9ab33acaad47117f9221dba9e7ac57380bb70368d9eda9e8c6a5af111a75f8f24943fcac6d9ddf42f4fbc7f7e44d44f7a36d18f2e31b13ad WHIRLPOOL 993bcd3c0db418062cc1eca2178441b191178e72d45aef50a9b8d7034f16761dfb87bf44aaf777e66e94532b05f9275832a9e99b11944cc062f28d617734e9ee
 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
@@ -39,6 +40,7 @@ AUX gpsd.init-2 937 SHA256 6478f168255ed9613440dedd192bbcab43c263b11229f6df46931
 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.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
+DIST gpsd-3.11.tar.gz 1579600 SHA256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee SHA512 bf600ea99635d415916c2a3043f56e61bda023ba320a15f33cd47b375c772dbec69aa941c4729914ccd6a868488cd6bd9f35d4067af9e353def743f45636e6f4 WHIRLPOOL 12a9fde832d611d129f48919d10c4a48f7da1e664d49844d4317e3b9511dee9810884f4b23036ebf576e7870b56091767a4f6c0237a8091643abb637642ee2b8
 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
 DIST gpsd-3.8.tar.gz 1516959 SHA256 5f9add9a378a3cd1c0f641e0def49fc3f14fb700c9fca573e07d17b3e5957c23 SHA512 9df968db33346852c9779ce4670d97c77f018c3254661cc709a30b693f1a10602f5f08eb1d2c19dab46747a6f88f9d8be7464d3ea854f3bfc760cc94c3b2e57a WHIRLPOOL 64feb051b2aa637d6da978221f84f046078c29f43f1b68429cd617fb773b8b539a34948e215f18b372050b9e50c0f9c68d22f2b9ec20207899bebb9048e30270
@@ -46,28 +48,29 @@ DIST gpsd-3.9.tar.gz 1518775 SHA256 d9b24be838b48db5e8eba66f74edf32d1982fe0fb018
 EBUILD gpsd-2.95-r1.ebuild 2693 SHA256 aa39e075e617e24172982a2b655c52ea39f6a6feec8d68d802923d133d92d17b SHA512 6cdba64f83d9ced8d1945a441513f346dc8b9071276e124d2e06bdbfdb17d563866043952272bd35fa2721c131710db99d7489ca68db0a1467baa4a01929b365 WHIRLPOOL 74c64b25c1a6530f3c9b7e06854c76c6c6afb11f006eb242779b42285ff2aa352e414d33ca06f37847ff03647c09a2a87cac384a62b1ed0602ceaf892d33bd85
 EBUILD gpsd-2.96-r1.ebuild 2859 SHA256 cb95d754215de8d91b1be0966af79955b0a4821b781624a54195bdd5eeb52e71 SHA512 449c41ef2612a5fd5f82aa197518b99d00350e4cae617ad7213870783b9a028b21c3a5b81dee0b7c1d1e421b3047c3bca379803c978617d393c00a8bdede8290 WHIRLPOOL 568ea491346fe40fcf4f1e5569ead37f27f277b51be721519dca00f5869f51aeb6fdad80d296115f4a1db1b5251b9dbeb8a484739c00e29b66f7c32040816f61
 EBUILD gpsd-3.10.ebuild 4921 SHA256 d9e6e82151a2cd941a57206c531092f255351f388ec5c8842a6e90516e79d1ff SHA512 b58634dabaa02c4668e11d0a72dac3bccac6a07b29a182404eb52e9b7c43f075b6b72fd879205b310d69053b17dda1b6fa1363ad98b6140f1db19740e3ff6037 WHIRLPOOL 9d27ca30152a65726a90159560d74389cb6c53159b65fa5ec5b44cd539f29c57c8b70a12e158a40d32fc9ec42cd8f0a77bd1e2ae4be15abc59b2241da6736707
+EBUILD gpsd-3.11.ebuild 4871 SHA256 8ce639537fb0e5e6fc2b267e6c86cfc7c02dd8ac92109352be7b197f6fc7fcdd SHA512 505a8f721ca583e57b7304f1e72f1efdff3d28c7162b30a8c1373e218f450865649d861196ef73d54131a0ae66d5da4d96c8265770704bafa7789d1453860063 WHIRLPOOL 4924a3a61c9e1bd3ba21031ba586c78282edf514f4cb576a719141f7bf2381c1409e001184e27c93b8a9db4d054894145d112fbd92fc376901a16c795289dc23
 EBUILD gpsd-3.6.ebuild 4453 SHA256 7f7cc4bab424de317a785b4a449a0961caa61c0906fc82704918519d1f75ffa9 SHA512 c72e47ea5761d950cce63fd38e7db0d466a1bbefa11f01606f5f951ad4ab5b2c62531cc12a97f0a5b6de7e7d83b3aaa35d4601065f5e7fd9de4ecac0ed042c70 WHIRLPOOL 3459745c055336841665536e97449f33adb284a810c223b0013dccc384353f10d7c495b8487d41865472d3dd3b7f0d1df2a502f99e95fcb90ed7d75de3616842
 EBUILD gpsd-3.7.ebuild 4633 SHA256 40fdbc2adc62a477c954ed0f532f7e4ce5166dadc2b62215af6de10e926f8418 SHA512 0a7f13b7422a5c94f9b36e2c29c79a69d24fd0f522435c710a31868b971152991a1ea189cd0145a03e7bf548f05672fb4b78171c0c1243c4f4275940220a37db WHIRLPOOL 7adc09fb55c698c53c066217ebfd005a0fb7bf1de5c368a9feed480ac0b6c7ccd017638de2f692bb1ba90fb14188dcac58d5dbcd67e18255e36c80114dbdc558
 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 4835 SHA256 a662e3030f44c910a8582c6087092773e8a56fe51e85c29e1793e5421f6957e6 SHA512 fef5d457121a11bbdd8c0d9b9db578b113c90b1e208d013af11e76f0062a09c6e00a2e59ef38feb6f79b849bc907a19a34af0a909b2bd152e7eafd821b2f9ed5 WHIRLPOOL 14946f90dd7de16a059faf8a3f328bee33b9318cff0d7f7155e27b23d05ac653324db1bf7e95c4e97384befe9b8133fb9346ff502b92e27b6a6a2afc99d503c8
-MISC ChangeLog 21389 SHA256 fbf6ea4c4bb8dd837d0a916ffe4b3f64324043d16b5157d081d35f5d4ace0696 SHA512 1af5ed53df866a4c0d4fb405c2aa7583045d5dba459b2ce578a134e67c979ecbc70990a2a2de377424168ffc21ad07f46de5b82f2cc4b1983129ee5fdf1950c2 WHIRLPOOL 2b18558b4314df4aa69a872dd21fe3c5d2c9b28ae0d5719e87fecb7b77ed2d6979fbd154fa466067a1345992b2d2414719f4e00df5374b191d8fd7dc99843eeb
+MISC ChangeLog 21537 SHA256 ed08a4f3e309c1ae96331a9ca5e2eaa67b5783930997e8f4b9ca850d556a2f25 SHA512 287cf694ccc862677cbe5f4336788605567008277778fe15323c7e83e35b7f4a66423890690f180faf4ee6683174ea4aad06d2ea4569b1095790ac73ceed9ae7 WHIRLPOOL 1f9d9919cff6e346ec974d2f8f38c31fc8bbc0b6886cd7d8bf5e4a89dbcdef49d72a57c78444918a2d68e48d93726566e80b0ce8a79c8502e17c853b69d70ef7
 MISC metadata.xml 754 SHA256 73824ede219103ca6d5ab2736451ad4f5af1edc833371baeac9d77e0835ffcf7 SHA512 72f8f6a877d7a73c75dbd6b0838e94a8d5636750d0cd4af84da44d9c3f89724a22f4bc083851cf43942ae4d39072a654201861d9874b1cf74ebe7b499b94c7f9 WHIRLPOOL 852f39fadd454dea8383732e78b2d68ae4c935a7c82c2876a5f5273cfa381676a5dd59e1f0d8fe095f6f454b1628b5e6ef8782b7ff186a169234aa96e72f2971
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUUqw+AAoJEPGu1DbS6WIAr6kP/3bI5tdUyIQSm3zIhwTx4Cdb
-UNwDCOmORvK0mmGJyNCJu0+7Y0wpzfAjuhuH0vhTsktTbSBjYrMsRsVC8q1fkPpb
-rGS9XQ8WGgvBSZYrVbvYlH/CyYTtdY+lPH7M/7av18boXpbarfB2Qp4UtnRmz2j6
-9dkLJ3SBRPhzC887pC5DOAZcWTsvOkQIjmc1uLn2e+eAnoicowIywNp9tDBUJwVm
-I2Mwsa7g+J2Tc9trPc2pOkPVrr6KHAretMEwPWkVMBzNTUyuzZjTDvOdfP4TGy92
-BuQwXN1HZQPjqTpI1qrWbSzGznvGltE+ousg6kQGdUEvY5OxCMezXEGDMMLLub5m
-cHaVydLSIgRmY6zy8UbYzhWKnQm9mKiVha1c7v2YqMTm3OgcisGID1uQQ41PWIDP
-Zl1uyokaUiM+HFtfn5Dtn8Ftwn6DzZJFcMnxD7iosLABm8jhWrflZE8kj38xkleJ
-RTxUy8w4+z3aI3yoELpUdA9l19HCQHYR7OtLSIbot6z28hCclQ4TlYoX2+CYHEgv
-x1wApcWXBp5956yf3dpY7wjIa4DwlfFQF20v1LvRjhU3nIqwawh15mnaZWfuWSso
-3Sv6lXj90jUM888onsZxyERe2n9CRZ5p+AlV/s2mVtMTba0+4yYiJsiS8ozKUul2
-AhRMJlAR0uROAAyyp2cp
-=PcBB
+iQIcBAEBCAAGBQJUUq54AAoJEPGu1DbS6WIASmAP/18OX8cm71ylgYcbWpg+OlJy
+cpc7/e/9EqeYHB5thZlvKhT0MJqi5Doal6phWQQDKBS3gaR3gsvpc4oVe9Oyobjm
+BSLGuRAAxw93siG3I6qPB+3+ucGbpVbGH9sk7ZH/9ya7saf73XX0Nptr1DUCvLSL
+pkz0a192wLGXUQ29QOk7XzCob52zljlKPI5bOJkKfQibEjfM8oKY9h/q1OgEMWOY
+4mOVLsOngSJ3MQlExlZCFBjziTuYvRgsQAsEYuta7PEC8jhbZl60BJ3yi3wYG88m
+ZOwNbouRG0OaGXCI14YA3J5Ns0JYB2APwrxZm1bmNd4Xq7dawcdvwJm9AwBWh9be
+yKr6QOToiYv+zBLtVTAWVgQy6tEyKBRAXjSQ0lYwSwdqoFyagU8imgPIebDqZIkC
+roX+hOj/PsYsMDX2/gSY1CCjWQmQ86DokTxnW2xSUfUTtQSv5YjWJNJ09pNphhX4
+CRC6mgmk6czmP18/8+Apjed6Gt2IQwoygzoTyL3K6I1lz5x9Pdpvqh2D6+O0l7Iy
+CX2IS2Ytk2jUUrBboMuc/O1jwtJ0Xa7Gt7K7vQGbbYr2aiNrwK6DMmQIXGotEt3p
+SDSjpm7J9OuYAVI7Ted/UUd1zietkVx/YrXYcn4tyCxBZ/gi757JlNqu2oE1qioT
+eSFaLLWtCoRjuk2zlWWy
+=EZtV
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.11-no-ntpshm.patch b/sci-geosciences/gpsd/files/gpsd-3.11-no-ntpshm.patch
new file mode 100644
index 000000000000..c53eeca907b0
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.11-no-ntpshm.patch
@@ -0,0 +1,97 @@
+From 80cd103396fcd1185a476761bfb267ce12f64b32 Mon Sep 17 00:00:00 2001
+From: Simon Dawson <spdawson@gmail.com>
+Date: Mon, 25 Aug 2014 10:31:18 +0100
+Subject: [PATCH] Fix build error when ntpshm is false
+
+The build fails as follows
+
+libgpsd_core.c: In function 'ntpshm_latch':
+libgpsd_core.c:1660:24: error: 'const struct gps_type_t' has no member named 'time_offset'
+  || device->device_type->time_offset == NULL)
+                        ^
+libgpsd_core.c:1663:33: error: 'const struct gps_type_t' has no member named 'time_offset'
+  fix_time += device->device_type->time_offset(device);
+                                 ^
+scons: *** [libgpsd_core.os] Error 1
+
+The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+---
+ libgpsd_core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libgpsd_core.c b/libgpsd_core.c
+index 6ec08a4..f7e8075 100644
+--- a/libgpsd_core.c
++++ b/libgpsd_core.c
+@@ -1638,6 +1638,7 @@ void gpsd_zero_satellites( /*@out@*/ struct gps_data_t *out)
+ #endif
+ }
+ 
++#ifdef NTPSHM_ENABLE
+ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
+ /* latch the fact that we've saved a fix */
+ {
+@@ -1668,5 +1669,6 @@ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
+     device->last_fixtime.clock = td->clock.tv_sec + td->clock.tv_nsec / 1e9;
+ #endif /* S_SPLINT_S */
+ }
++#endif /* NTPSHM_ENABLE */
+ 
+ /* end */
+-- 
+2.1.2
+
+From 48caee55069bdb7f7115e1930ace3914f4ddfe3b Mon Sep 17 00:00:00 2001
+From: Simon Dawson <spdawson@gmail.com>
+Date: Wed, 3 Sep 2014 18:43:31 +0100
+Subject: [PATCH] Complete wrapping of ntpshm_latch function in #ifdef
+ NTPSHM_ENABLE
+
+Currently, the build fails as follows
+
+gpsmon.o: In function `gpsmon_hook':
+gpsmon.c:(.text+0x8b0): undefined reference to `ntpshm_latch'
+collect2: error: ld returned 1 exit status
+scons: *** [gpsmon] Error 1
+
+Addresses Sacannah bug #43129: ntpshm patch is incomplete.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+---
+ gpsd.h-tail | 2 ++
+ gpsmon.c    | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gpsd.h-tail b/gpsd.h-tail
+index 7b62ce1..7b44f91 100644
+--- a/gpsd.h-tail
++++ b/gpsd.h-tail
+@@ -857,7 +857,9 @@ extern unsigned int ais_binary_encode(struct ais_t *ais, /*@out@*/unsigned char
+ extern void ntpshm_context_init(struct gps_context_t *);
+ extern void ntpshm_session_init(struct gps_device_t *);
+ extern int ntpshm_put(struct gps_device_t *, int, struct timedrift_t *);
++#ifdef NTPSHM_ENABLE
+ extern void ntpshm_latch(struct gps_device_t *device,  /*@out@*/struct timedrift_t *td);
++#endif /* NTPSHM_ENABLE */
+ extern void ntpshm_link_deactivate(struct gps_device_t *);
+ extern void ntpshm_link_activate(struct gps_device_t *);
+ 
+diff --git a/gpsmon.c b/gpsmon.c
+index c812063..909f271 100644
+--- a/gpsmon.c
++++ b/gpsmon.c
+@@ -734,8 +734,10 @@ static void gpsmon_hook(struct gps_device_t *device, gps_mask_t changed UNUSED)
+ 
+     report_unlock();
+ 
++#ifdef NTPSHM_ENABLE
+     /* Update the last fix time seen for PPS. FIXME: do this here? */
+     ntpshm_latch(device, &td);
++#endif /* NTPSHM_ENABLE */
+ }
+ /*@+observertrans +nullpass +globstate +compdef +uniondef@*/
+ 
+-- 
+2.1.2
diff --git a/sci-geosciences/gpsd/gpsd-3.11.ebuild b/sci-geosciences/gpsd/gpsd-3.11.ebuild
new file mode 100644
index 000000000000..fc4801ca3a2a
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.11.ebuild
@@ -0,0 +1,167 @@
+# 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-3.11.ebuild,v 1.1 2014/10/30 21:32:38 vapier Exp $
+
+EAPI="5"
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_6,2_7} )
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils-r1 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=(
+	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+	geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+	tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+	gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+	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? ( dev-qt/qtgui:4 )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	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
+
+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
+	) )
+	if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+		eerror "Detected protocols: ${src_protocols}"
+		eerror "Ebuild protocols:   ${GPSD_PROTOCOLS[*]}"
+		die "please sync ebuild & source"
+	fi
+
+	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
+	epatch "${FILESDIR}"/${PN}-3.11-hotplug-config.patch
+	epatch "${FILESDIR}"/${PN}-3.11-no-ntpshm.patch
+
+	# Avoid useless -L paths to the install dir
+	sed -i \
+		-e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+		SConstruct || die
+
+	use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+	python_export_best
+	# Extract python info out of SConstruct so we can use saner distribute
+	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-r1_python_prepare_all
+}
+
+src_configure() {
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(get_udevdir)"
+		chrpath=False
+		gpsd_user=gpsd
+		gpsd_group=uucp
+		strip=False
+		python=False
+		manbuild=False
+		shared=$(usex !static True False)
+		$(use_scons bluetooth bluez)
+		$(use_scons cxx libgpsmm)
+		$(use_scons debug clientdebug)
+		$(use_scons dbus dbus_export)
+		$(use_scons ipv6)
+		$(use_scons latency_timing timing)
+		$(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-r1_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-r1_src_install
+		# Delete all X related packages if user doesn't want them
+		if ! use X ; then
+			rm "${ED%/}"/usr/bin/xgps* || die
+		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"
+}