Version bump.

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

5 files changed, 221 insertions, 21 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 1dfcf541956e..feda4c1d9cbc 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.126 2015/02/18 19:43:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.127 2015/02/27 18:11:55 vapier Exp $
+
+*gpsd-3.13 (27 Feb 2015)
+
+  27 Feb 2015; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.13-ntpshm.patch,
+  +gpsd-3.13.ebuild, gpsd-9999.ebuild:
+  Version bump.
 
   18 Feb 2015; Mike Frysinger <vapier@gentoo.org> gpsd-9999.ebuild:
   Update build to match latest git.
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 4808611faefb..b6ba93c6a9b0 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -13,6 +13,7 @@ AUX gpsd-3.10-udev-install.patch 1400 SHA256 02eed61a8f91e62304ab5c26d87e1db7263
 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.13-ntpshm.patch 589 SHA256 799a490829a75f4da579175e649027e853de2aa028fa3be9658767512ce090c4 SHA512 0c92bae73429151fac42f07af45b560a0eb24608d576bdcb53e8047e94b6a4a1b038fab0cc45fee03c7563905479d2bc99bd95f99af32ae3afb5d796bb04e16f WHIRLPOOL 6175be892b6f1a4ac365525600ee353f8f0140633418c558e46673bdb09e22f44b0e741cf1686601b28b10387440ee5b27138d9e9d43daf10712c143358aa457
 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
@@ -41,6 +42,7 @@ DIST gpsd-2.95.tar.gz 1385681 SHA256 832343a53921a8371efa540ba57c91dadedda445e57
 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.13.tar.gz 1382857 SHA256 d30bbe31ef9f89d2c281197c64204bcff255883462318250f913444ae00874c1 SHA512 339e752ae6a06272082e8a4f97915001aeee4deecd956ace1be862f9e3734b7663407c4a6a41ac00e7de195771da55fb26b93ec152abd8251a0d7a13cb8ad51e WHIRLPOOL 94da0e11c7a0c33f3215f5de836f8739c394a03c561933abff9ce325e4238f4d85e29f664f592e7c09ba16d35e92b5e275a75090e5600a01d983fa81f12fa3af
 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
@@ -49,28 +51,29 @@ EBUILD gpsd-2.95-r1.ebuild 2693 SHA256 aa39e075e617e24172982a2b655c52ea39f6a6fee
 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.13.ebuild 4829 SHA256 5d817a442e216055bae2c8101e5f08768a6d309a5db9fe215da5efb9db2b6a72 SHA512 95b0d95b0e7f328d6293726f59430035065ce49912e61ce4a7fb8f08b1aef90f848bd1bd82e3afa1cb1a43f3018d070642346411ba0bef03394dfa6338bbce8b WHIRLPOOL 2135846a2f20db8c47d3b28fe5b3407bf78e4b4bba7c58aeafebd022f00aa6b4ab4da81b2c8a12ea3fae3df94ad17a94b041e05d244af1979cfe3f8913cea71c
 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 4774 SHA256 91f33ffb59a1fc2a1cac4bd371e10669f63066e92bc88d9e6ac671b4c504adcf SHA512 b4a01c6a63b74088230e1a8a5a602b1e194547f3134c0554112756526360b8021c76699180d06991b0c98d0da0c13cc2658c03c9231a2e062d653895ee34aca8 WHIRLPOOL e790effb80d7ca5430359013943e84a8620249b03dc5fc2b3f78e4ccc7f716c8228296f88ee62999f0b3770a5c78a388439f725355499e1335386dc28f3f9dc0
-MISC ChangeLog 21642 SHA256 0c59dd558a25c5365403f3d43799442de0a675d2aa2047ac6b75ec6b13101e91 SHA512 40592279ff6b3aee8ff6a4e3246aad48bc8dfe76d49b8fc0a58bb83d1b07d0ae803f5da6744a5feed8ef35de59edde7168d83d09291ac01f130b6e8fc23695f5 WHIRLPOOL 349053e5613a877c0b485f38067eb17dfae28bf6261731fc230903a76a06e6b2df075a8f3a62a2f30d71b22defa428c0bc1a58771801d1d75c11b5dfa5c09e5a
+EBUILD gpsd-9999.ebuild 4784 SHA256 e921725a43ae486d45e6e5dd066506e91df6072efca4b372faa8b1d600f25240 SHA512 100a13ed156a843b0a7165abfe93bacb8e38f6b8971d2495d33fc5d857513a8ad25b4b09e64c7c16d6d506295bc87baf12ce3ca72a6d6b461570a4436a6cc82d WHIRLPOOL ff2818ac3a09674e28e2ee10b96b9ce8635a06a25f9ef1f09ee5ac41cca6c076f8b61fb1abcdff58a90777f7fcf99e98eee8ac6c0615498cdef26eec85754c3f
+MISC ChangeLog 21805 SHA256 3e93a05c5f73935cab8211509a948adb2a3fd7525d7cfc30258f5bf51a70be1e SHA512 dfb03db0989734f00ca9683b324dd7cd3a160c75f9a8c673d5ee275e80291ce6201139b5f5b50068917a9c6de1715490c2dab49b559d7abc3aa182595b272c72 WHIRLPOOL 4fe72df487cacfcd635280244d6d0b9c6f8be7f29391acb9fb160fdd5da90ae05ffbe94489e5259ddbab6a1777782f4587179088f2dd58327fdbbe2d64ebea5d
 MISC metadata.xml 754 SHA256 73824ede219103ca6d5ab2736451ad4f5af1edc833371baeac9d77e0835ffcf7 SHA512 72f8f6a877d7a73c75dbd6b0838e94a8d5636750d0cd4af84da44d9c3f89724a22f4bc083851cf43942ae4d39072a654201861d9874b1cf74ebe7b499b94c7f9 WHIRLPOOL 852f39fadd454dea8383732e78b2d68ae4c935a7c82c2876a5f5273cfa381676a5dd59e1f0d8fe095f6f454b1628b5e6ef8782b7ff186a169234aa96e72f2971
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU5OtpAAoJEPGu1DbS6WIArvUP/iIVhL/OLcoKGiZSAqf6X7C1
-3G5a+QjiUvP80TCMWKpO3FkGiR7ZrdpZecYkp+ODWPE/L3xgeBq6gJmWfLUM1NNE
-YUoa174lv/P6GtqqQBHqOdqZsKt/x/WRitFAoRRGwGBfEgwr1WHBgMHEIUv7lJNX
-giWYjQ1kHvesl/xdr9aqTxyTNxaHurGg6RRD+QCeZsqApBvcSSIXaKvIUnAyV5J4
-6wRzyrJXoWisM+ZCgErkY9KdYXxilBjvCVbaf2y6hTol+YB+bvuwOfhAyfzrl9hs
-q9Tv6H1tRlp8jQTcW2jV/gLwtRgNrHclMMRoFNA157wU/tG/IhJZVK7GEOaqPru0
-2f2up2LS3mtm9LU1I+RtFNbvq9VIYRfI7AaghifjhAfxI9RFfLcS/bOvkyRqqfQw
-Z0ORBJnlZZKoBjawrgWJHbNIF0anWEAYUbkE1+U63h/sRuH2naHNMEE1FCsU3x0t
-NjiofNV4SFsG3QMtg26DTkw1Dkishaxk5BsgoULSmY3nGF20IrYL5RD5tY5OIsHS
-QfncEb+ptyZq/ge3Wl9zGyXRQIkVb489akZhcPY/r6jLK8SJS2RsM78m267jxEZq
-1ZHW7YxnTjclpx+oOfUnw1xV8JdQjAut/IzNDfPlM2eZYTrrdFLX8fy1Ygusl3fs
-yGetVpBKe7HwzzpETC3v
-=GgMT
+iQIcBAEBCAAGBQJU8LNsAAoJEPGu1DbS6WIANcwP/02WbpOA/AwZfoR9j7/39bji
+OiECBaEwV/ZyOGxrlughVdDfB76pXw/l/BYGbqgm6VGm0njmWK5U7CpFOO+UrvH1
+p3nJDz7aaptH2sH3X3PM4NF/kNJkkgRB4xaFKObisOV4YeHLPCMjrMmELiF+ldcl
+68s4KmXkLKI1P5w3oO0sv2aPQ398uIC89OWpBq3gWg+5X/+Ojrq/flXAU+z+vmNe
+hZkueBbEy7C+3lhC7GvhSmwDEUa2dk68tf4mebC0IkYmo7IsxvNvA8cbJb+DQS2m
+D5UYr7KBkZoMMt2oukWnPHJT3dIqdkZE4kRdV0ktbV+CLss9loKz6Vzh4l4Clha1
+JQ3XcS4lAYQFQntNdSMxZxSnXxZg2qKuOcfbrAvzX9hxvuZXhY6tv6tav6Oc9qKX
+ZgyQSBsGPirnlfALUaCY5PdtBfpqG9M1rYIqFB3rfhan48R7cXHMPygWmozXzvUn
+0ysb/2/A2TD+fwus8m9NzLGdDyj7ASL7uw6WJl6NwGd0OIV8K9XUk94rr4VSOx1N
+F5BtS8Iq32BKGFwDK5oBWfFfBP6pQIN0u+bpljZU5VpKqByPHv/ria/zYsGVB4Ms
+5Ygw7in6A/lAffc9OXVriD9t7sj004v/u5p+EevTvbfzXsMSJUtKfUGdbAzbAZpi
+jtXVZaYlLnBLvyrr98AK
+=QcFv
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.13-ntpshm.patch b/sci-geosciences/gpsd/files/gpsd-3.13-ntpshm.patch
new file mode 100644
index 000000000000..c931ad1aa21f
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.13-ntpshm.patch
@@ -0,0 +1,25 @@
+From 861d148321aafa3f7dadb1da4f507da83ba2f846 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 26 Feb 2015 17:39:23 -0500
+Subject: [PATCH] ntpshm: fix status type
+
+---
+ ntpshm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ntpshm.h b/ntpshm.h
+index c8cd3b6..45648a8 100644
+--- a/ntpshm.h
++++ b/ntpshm.h
+@@ -60,7 +60,7 @@ enum segstat_t {
+     OK, NO_SEGMENT, NOT_READY, BAD_MODE, CLASH};
+ 
+ struct shm_stat_t {
+-    int status;
++    enum segstat_t status;
+     struct timespec tvc, tvr, tvt;
+     int precision;
+     int leap;
+-- 
+2.3.0
+
diff --git a/sci-geosciences/gpsd/gpsd-3.13.ebuild b/sci-geosciences/gpsd/gpsd-3.13.ebuild
new file mode 100644
index 000000000000..1c5f576f1ade
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.13.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.13.ebuild,v 1.1 2015/02/27 18:11:55 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 nmea0183 nmea2000 ntrip
+	oceanserver oncore passthrough 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.13-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 | tail -1)
+	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@|${pybins}|" \
+		"${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
+		nostrip=True
+		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"
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 834289988bc5..5e195d67069f 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.19 2015/02/18 19:43:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.20 2015/02/27 18:11:55 vapier Exp $
 
 EAPI="5"
 
@@ -27,8 +27,8 @@ SLOT="0"
 GPSD_PROTOCOLS=(
 	aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
 	geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
-	oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
-	tripmate tsip ublox
+	oceanserver oncore passthrough 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"
@@ -84,7 +84,7 @@ 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 pybins=$(pyvar python_progs | tail -1)
 	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'])")
@@ -95,7 +95,7 @@ python_prepare_all() {
 		-e "s|@SCRIPTS@|${pybins}|" \
 		-e "s|@GPS_PACKET_SOURCES@|${packet}|" \
 		-e "s|@GPS_CLIENT_SOURCES@|${client}|" \
-		-e "s|@SCRIPTS@|$(pyvar python_progs)|" \
+		-e "s|@SCRIPTS@|${pybins}|" \
 		"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
 	distutils-r1_python_prepare_all
 }