Version bump.

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

7 files changed, 290 insertions, 23 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 030fa441a2f3..f18e2533edc3 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.94 2013/03/02 23:21:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.95 2013/03/11 17:24:59 vapier Exp $
+
+*gpsd-3.8 (11 Mar 2013)
+
+  11 Mar 2013; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.8-ldflags.patch,
+  +files/gpsd-3.8-libgps.patch, +files/gpsd-3.8-udev.patch, +gpsd-3.8.ebuild,
+  gpsd-9999.ebuild:
+  Version bump.
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> gpsd-2.95-r1.ebuild,
   gpsd-2.96-r1.ebuild, gpsd-3.6.ebuild, gpsd-3.7.ebuild, gpsd-9999.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 1599037fcd90..1265fb2bce01 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -22,35 +22,38 @@ AUX gpsd-3.5-clock.patch 1655 SHA256 89d1b866cfacb1044a5afe6dc00d588846a31b629fa
 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-3.8-ldflags.patch 476 SHA256 83f95296c58ecd63d7ff3a9ca69973613c7f95623b33f45efd92aed095b79c52 SHA512 58cf1622d223ea997543484d7643b15335e3766a58be384a8c8906da097b2bc8c884d739b141b8d060f326f2cb4c43fd72f52aba4714cb023579b77a08c3cda0 WHIRLPOOL cd916dd97e2b1722f5a9f4be457308bc416775d5919c682fa15db02147bc72ef214ea59e5b20b80ca7a705243c30b6de80899edc013e6c560bcabb5ddd8235c8
+AUX gpsd-3.8-libgps.patch 1279 SHA256 ff11d4664b87e7b3c3b1a717d416614c6372e9fbaa5e4ccdf087d58ef3e1fb2e SHA512 34fc7857ea7e609effcf4666afdc90972cf27e938b98d34dcfa687be9a220f37b259457165b6d360d6ddb51582718df6f1e2a45e5ea945b06cf78d7cd6d9daf3 WHIRLPOOL 7c526ee5bc9e83441104c28f07c3205ed387f0332d80a81950bbf3de4b3b4a2b43a303f058a30f96471d5a32a41cb807ecca0e526ba45897bed536eb00598546
+AUX gpsd-3.8-udev.patch 1301 SHA256 7726de4fa7b0e0aeb4e7a2c84f103c7e8c296370351b420839acea14f88b278b SHA512 da6ea22cf280a58cad441e0e71bdb65406a7f44850927a96a4579d788e585c5c6658814a1bb4300eed6bc65fd02d487a4cd423446a601ec5e8a64c92dbfe6038 WHIRLPOOL 9b9f2c86d5172dd393e333b5831880819215e6c95e67b66f92afe756a2f11bd622164f563c61925aeb66d8675a19cf28dd73b1ee4ff0fdb5ad1aca1501ba2180
 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 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
+DIST gpsd-3.8.tar.gz 1516959 SHA256 5f9add9a378a3cd1c0f641e0def49fc3f14fb700c9fca573e07d17b3e5957c23 SHA512 9df968db33346852c9779ce4670d97c77f018c3254661cc709a30b693f1a10602f5f08eb1d2c19dab46747a6f88f9d8be7464d3ea854f3bfc760cc94c3b2e57a WHIRLPOOL 64feb051b2aa637d6da978221f84f046078c29f43f1b68429cd617fb773b8b539a34948e215f18b372050b9e50c0f9c68d22f2b9ec20207899bebb9048e30270
 EBUILD gpsd-2.95-r1.ebuild 2677 SHA256 601cc86fbd92ed07a2ed567c7b83d1fb1f153dac33d81c3c587c3949fb685ce5 SHA512 d7d41eaecf53390b44a87c81d7526b8254c20a5fe6ef93c835d78d386f9f09695c4a511e0c54c5e16f81e5d490972f3bc3c989f406287e23bc5234dcf9b37a1b WHIRLPOOL 65982b451326fc79727ed5139094cf3e86a0e6e21eda96e4776db63fee55f86d932acea2824b93131994e37edfafffef804811e67e8c5d54282902173a6e5800
 EBUILD gpsd-2.96-r1.ebuild 2843 SHA256 0cbac9e58788391572d823ef1f7febae91cdefbde5824d3cc2398721c2097db3 SHA512 043a2e24698d7a02d72cc9fa5b6bb23e24fc875f8719c48aec8cad8d9a7326d0f337d6d6b5a21587072642b48476d1a01699261cb0aed9b191fff20a03a69d8b WHIRLPOOL 67b29ea48b5aaccf5bd1c91e40dfdc152fa0bf5d0027303456ed4563f7d9862b531c9adf7d05f898f4d78781ed7754051886ea785fd9f04ed2a686584875638a
 EBUILD gpsd-3.6.ebuild 4452 SHA256 993f9eb7c4086131600a791079ac88ac0cd7204412abaa140d279a17404a2e07 SHA512 1fc00ca20b7ec143cb5ae8acd767e0382f1d5020e472a3eb0e20cb1b137995c21e7ba67302435c4bf61eed31861ec4daad6651f1a48309be960f99bd051ad9cd WHIRLPOOL fa876c2507ae3d0e565c97abb1dcd401a3e4d4a3c525f9dc3f1dd461aaf0bf792ea4cb9dbff48be355e17c3cf8b2d06f1b00dea606f3e6790a7c4e994601f318
 EBUILD gpsd-3.7.ebuild 4525 SHA256 40e717b93d3016d0920322609d1e60bfa4feab79e999aa79b6c327604a7c0cc5 SHA512 d6945070320bf154c05518fd1558ce173ab9ab535e3ec5e2790ff97fb747088171f9aa251c924f2d187454640066160b30959586334920d49553dc2fd28990f6 WHIRLPOOL 86006bc068006d3c8ad59dd19e9165bd8b8de5c27edb46319c4dfcc55a47ee9a94ec466c0d8dee9f6a6a3d0638aa1968441666c36185478bbc4a5bb363ab6b95
-EBUILD gpsd-9999.ebuild 4526 SHA256 f8fc905de5fa42c04fea599485b7129259c0a8bd44cbe739e7762d7f04f74878 SHA512 1b7750d899730807aeec08b46ab878b8c2a5659094eb2d92e27d7fac6d24ba1fd3b941faa98a22d2b4fa00989f75b7597c816f47bcc0cb810484dbaf49ca5cc5 WHIRLPOOL 8dea3f449e601ea6fd6e31c801b39b25ad9a696ea63907f6442c60a79e31b2e782f71451c60058a0f1806df1ba4ff29e7947d3dd1390d97aceee0ffae43b2640
-MISC ChangeLog 17156 SHA256 242a1b3802dcf365a9882dcbbb6bdb9d0a3d4ec24a5008465295dc778802dacd SHA512 6237e03e19a91e0db6b0a5cdf9b0903160f416cf8adcacd881d6226d67ce0ea2e378f0ddd145fdc498d3404bac96c7af17a36de5eaabf9d3331ad496242b0926 WHIRLPOOL 2175047b5ae84b014ea8b4402b68d24dffa99b83ed047122ea205d4d1d67eda7153c898e86fd790ae116934e2e4934f5c92e86aebb6fa44152a26d46f6971e0b
+EBUILD gpsd-3.8.ebuild 4504 SHA256 d76ff0934da6fcf8b171cb5204e5c37d7a7a385683e74a36023bb02c9a4e1364 SHA512 ad41c946219db543b1de0f5b7a655b35deb726452c8779a17627b6dfffd4db5d5d7a46b8d9b304655f86c693f1c2767589e289a372a8ee1ea7da701202f1259d WHIRLPOOL 27c3173437a99625626695d577ef4dc53575188b4801a606b7945c42bc8c31657952666edbe8d0bede6e05357a8ffddfc7abc097e3e3f6c6152a69b2b6076fbe
+EBUILD gpsd-9999.ebuild 4505 SHA256 3fc9b62dfedd60081791f9894ccb5e1638b516750630b167d07dc011db92bdea SHA512 fda2e8a4451baf688d047511a3646ca5160dc30d3f49eb81622562b03f94b9c385029b64f2a7f45d008fff17ee058050008d4da732c21d1c823201f1a458edac WHIRLPOOL b54439eb054b7d36600ad5b7af4be518bb34796e2e82a6fbec72690da7a6f0fb07424e7395b1b7e89298e65cac8687943f8657b35a3b625ea80ec5af2b7f13d5
+MISC ChangeLog 17375 SHA256 15424114741731fbfcf2de5657f8d69924ade879a0c1ec6b3e79683c666dbbf3 SHA512 1e1431914aa18cc6dc79c7169e220cd9b589736c648289b6fb5c9816e9fc8dce1d1ca003ea6ca583b9cd57f00934f3506550448292d2f411549af3cfab5d7167 WHIRLPOOL 15e4ea7fd37c41b891dd1f9cd3ffc2d9e6cb641ba125bd429596ab1cfb5fe3ed9b0fc70d7d0b41994023351022341bb49440d82e5c7d6540695a70c4b528563a
 MISC metadata.xml 664 SHA256 3615a81e06997009a7da3ef6739cb39d7dfa2bf975440cb6b4980a4f7091f739 SHA512 33202cf42a64139579df02af7c4f08439e6218e766116204a4cb1c9b70f8a8e4bc8de3ee0349cbeb91d34c4bd1bc52d22306ec336411ec07c40eb441ea7de35d WHIRLPOOL bcdcc972d7cf4f719a11ed23025c4170c517eb122b21140a434d14b00b52cdee91b0a86a2513cc1bcc37e0675384c62c8f0754317c97626d0d2dca59f4897983
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMolvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88MnAP/3XI4DiBSGrzGi0q8lVl97fS
-L8EgALS8T7z/u6eXEGTxiVPoFPNhBwulMZySGVS7EdnzTvNrMJisYmWrhcklr2Jd
-aejUx/FNI845k8ycrUbv4Gz1i4i8aujLk+040CBVEysauyXtn29hF4LDFVYaCSBD
-Sg7YTHDWjybspjKZHC1GWSGAq2FONvw6JuzfWre511OTlkAN0LhnNwVd7gjPvPKQ
-KGXZjXao8aevZVWRWg3BVgZAfyTywvWDaPIU5uns4EOtq+/S2IvJLn0ozJTmt2sw
-+Rrrb7ZSSxSHENTHvcYlhVwbOEW3Ix9Is9onFNDm4SmrJz2Gj8u/Ydwv3XNEvMQ4
-e5NuEaTNARaKoMO0TQjR3v7c2TJO9OuKTcH68zCei4VlvkYYuUAR9HBfoXftEqBL
-n0MzQAMtXD8Dunux9SBI8pgg61yu8DhRqEGqxVeVFZxeY2pZRZywakoLBY79Ht65
-LB7HIJYk6gka7+PN6q9QvJ7TeY0A4ntoOM/A/1d1z6IDRi1kiL4IN7lptHrzUk34
-yO1TV0vnxsDGL/N+nLu3RSX8EL9BiQ6itLr0ZIfJIKjr1Tns1FHVlzDKZMpv3A99
-3ZoKvt+mvrtTU3SKsai6D9rznTz5Ex9FVZLVlvWNZIuhIZcm+2TBqqTX6oweQWiS
-Ljd/XT6vAK7FIFMaS7zo
-=eUSB
+iQIcBAEBCAAGBQJRPhQLAAoJELEHsLL7fEFW8ZoP/iVtK2ki7UEDM4PmwvNSO0pb
+zYX4/H7VCcq+mhuRFMZGa1kpPLiZY7/negu8UJNikNUqJ+GZWkg1NoUkEWuZ7qzh
+cSzaf7eDIaeggYfs94VastDank64BfFmzG8sbJHRhdHV0Ggj9guRsPCmMo4XTsNR
+AwFfb/VO0TlSzH7nufBi3KoMHEIeB4h9chalJaHdxV4/C8rgCWPV7QFuwwLtucJd
+tOyHJoYXz0TF3nlsRDGjWFa/OzG5S7AYRd0LYkeYgRLICNKv9pkuBSSiDfYV2ZT4
+kq5RKbaVbQ7GoXhApOEyhd16kxjQGhtAuFI4sdQpQyJzoq8VHjfSbYdg0BFrpR3R
+Sd1BM/HGqI+Z1VMO5ekZpoj3l3jcmWw8qT4unIuLLUqUSqOJ47r2/9Yha4jpF7g3
+DTgGjN7LkQ4KZRr9bfimhh3rE3hY/5mJvcwgJMta44VSRPpuoJ83v9GRp8ijxA/F
+ptRWxSAj4r9kRKQPrZ4VbHUNcmuBaihEb6metiI4DUsaOQI5AqpQQ91wiubDJuMu
+7PqF7RXzI0yfPa7/pRYRn2LsQzMf7VRhPZGGzDv2b7VUDOeOWXQHKsbf6+VOejHU
+Xe/hnHw1PyL+Ll8KQMswgYiplRsV12BITCWoSoXCjaXcOOyY4NPwTJjiE11okNp4
+RrtOO2S571jcNhhPJ40H
+=oXkl
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch b/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch
new file mode 100644
index 000000000000..b41be8b66e54
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/391299
+
+split up linking flags into multiple arguments
+
+--- gpsd-3.8/SConstruct
++++ gpsd-3.8/SConstruct
+@@ -214,7 +214,7 @@
+             env.Replace(**{j: os.getenv(i)})
+ for flag in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+     if os.environ.has_key(flag):
+-        env.MergeFlags({flag : [os.getenv(flag)]})
++        env.MergeFlags({flag : Split(os.getenv(flag))})
+ 
+ 
+ # Placeholder so we can kluge together something like VPATH builds.
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-libgps.patch b/sci-geosciences/gpsd/files/gpsd-3.8-libgps.patch
new file mode 100644
index 000000000000..ba22d2bda0e0
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.8-libgps.patch
@@ -0,0 +1,38 @@
+From da2369a8e72578b5c5636adb78accd8bf66b3311 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 11 Mar 2013 12:35:34 -0400
+Subject: [PATCH] libgps.a: fix building w/dbus support
+
+The current libgps.a logic doesn't pass down pkg-config output from
+dbus and such which breaks building when compiling:
+
+gcc -o libgps_dbus.o -c -D_GNU_SOURCE -Wextra -Wall -Wno-uninitialized \
+	-Wno-missing-field-initializers -Wcast-align -Wmissing-declarations \
+	-Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type \
+	-O2 libgps_dbus.c
+libgps_dbus.c:26:23: fatal error: dbus/dbus.h: No such file or directory
+compilation terminated.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index e5d1f54..a56fa9b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -886,7 +886,9 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs + caplibs
+ #          linking
+ # The final executable will build but not be portable.
+ 
+-env.StaticLibrary(target = 'libgps.a', source = libgps_sources)
++env.StaticLibrary(target='libgps.a',
++                  source=libgps_sources,
++                  parse_flags=dbus_libs + rtlibs)
+ 
+ # Source groups
+ 
+-- 
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-udev.patch b/sci-geosciences/gpsd/files/gpsd-3.8-udev.patch
new file mode 100644
index 000000000000..f6b783e5c3cf
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.8-udev.patch
@@ -0,0 +1,38 @@
+From 2e7d2e22935950ece32ff3acd6837c79800752dd Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 11 Mar 2013 13:21:14 -0400
+Subject: [PATCH] fix DESTDIR handling with udev rules install again
+
+Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR
+logic when upgrading the udev path handling.
+
+It also slightly broke the mkdir setup by not creating the rules.d
+subdir under the udev path.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index a56fa9b..1c187f3 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1662,10 +1662,10 @@ if env['python']:
+ # is plugged in.
+ 
+ Utility('udev-install', 'install', [
+-    'mkdir -p ' + env['udevdir'],
+-    'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules',
+-    'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'],
+-    'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug',
++    'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d',
++    'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules',
++    'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
++    'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug',
+         ])
+ 
+ Utility('udev-uninstall', '', [
+-- 
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/gpsd-3.8.ebuild b/sci-geosciences/gpsd/gpsd-3.8.ebuild
new file mode 100644
index 000000000000..e8889933bb59
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.8.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.8.ebuild,v 1.1 2013/03/11 17:24:59 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 udev 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? ( dev-qt/qtgui:4 )"
+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
+
+pkg_setup() {
+	use python && python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
+	epatch "${FILESDIR}"/${PN}-3.8-udev.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)"
+		udevdir="$(udev_get_udevdir)"
+		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 52a39dd3f169..b9874f5ff884 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8 2013/03/02 23:21:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-9999.ebuild,v 1.9 2013/03/11 17:24:59 vapier Exp $
 
 EAPI="4"
 
@@ -61,8 +61,9 @@ 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.8-ldflags.patch
+	epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
+	epatch "${FILESDIR}"/${PN}-3.8-udev.patch
 	epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
 	epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
 
@@ -90,14 +91,13 @@ src_prepare() {
 			"${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
 		distutils_src_prepare
 	fi
-
-	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" gpsd.rules SConstruct || die
 }
 
 src_configure() {
 	myesconsargs=(
 		prefix="${EPREFIX}/usr"
 		libdir="\$prefix/$(get_libdir)"
+		udevdir="$(udev_get_udevdir)"
 		chrpath=False
 		gpsd_user=gpsd
 		gpsd_group=uucp