Version bump.

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

5 files changed, 422 insertions, 15 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index f460f0c0b9b5..c4a8cb6bb299 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.85 2012/05/21 22:37:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.86 2012/05/23 14:20:01 vapier Exp $
+
+*gpsd-3.6 (23 May 2012)
+
+  23 May 2012; Mike Frysinger <vapier@gentoo.org> +files/gpsd-3.6-debug.patch,
+  +files/gpsd-3.6-rpath.patch, +gpsd-3.6.ebuild:
+  Version bump.
 
 *gpsd-3.5 (21 May 2012)
 
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 7c30f30dcd80..94191c67c6aa 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -19,6 +19,8 @@ AUX gpsd-3.4-gpsmon-lm.patch 980 RMD160 661751e70335bcb21f8e51091e18a115d9428328
 AUX gpsd-3.4-no-man-gen.patch 506 RMD160 b4ac5a9624fe930e65a194c8afad37d7db868add SHA1 8fb51e5468700022a3147705950679ee42469f69 SHA256 3faa5bc64b10cbfb2435b952bad4a0e1f8a37a85501a3859f6da0b838c4e1762
 AUX gpsd-3.4-strptime.patch 688 RMD160 e1ca75c916072bdd5eea196a7925f87bc0fc982c SHA1 c99ec5ba7dcba81223058b64bb92a2d421f79237 SHA256 df6eadfa97cf120c76738f6742c5bec6abbc28fdfe6f25239369cbfdcf8783e6
 AUX gpsd-3.5-clock.patch 1655 RMD160 ddd907c832d0274c624afdd1bf35707d6d26f631 SHA1 77331703848c1b815b14f396e6bbeb0dda3ad760 SHA256 89d1b866cfacb1044a5afe6dc00d588846a31b629fa7cd6b85a5a079bed098c5
+AUX gpsd-3.6-debug.patch 8754 RMD160 a2976cea791c4ba18df44f081aa7a455cbeb01d4 SHA1 ac2d397d5d1796519d23f892ede39dc3e996c74c SHA256 afac1c615bd82cd6d88d4aab7f0c30572db3dfe9978fbde56981e6d3882e004f
+AUX gpsd-3.6-rpath.patch 418 RMD160 f7b6928334d7616dd5164548eca2f45a83b81f20 SHA1 e3a4cb65d68b816e841e014d4fe9958eb714b6e8 SHA256 a838afc86b19ae5615a7e4babc141468df2ee3ab97027528aab5b1e7a87e75a1
 AUX gpsd.conf-2 314 RMD160 e345c8504b020da4b4a0310b59112ba6eb178dce SHA1 d0499491a762e46e7d76854109266b36c1f22c0b SHA256 2d9ab242319f24dac14d53b57b222b288dfbac10cbdf31c9aecbb65cf03c72dc
 AUX gpsd.init-2 861 RMD160 c1d5a0fd107e3f4bc36a936cbae133c39b8828f7 SHA1 cf08caee2826e7b35d00762c475755bd0ae84d12 SHA256 6b6e3b23d95acd7326e3982509302dbef005e143bb46557c573aca1c0e2cb672
 DIST gpsd-2.95.tar.gz 1385681 RMD160 c9e8d3b7ff73c655d65f0f6e329ca7ff241b10f6 SHA1 af1f575c8ec3a2db7a71c35f2296fd339a4a1ff3 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae
@@ -26,29 +28,31 @@ DIST gpsd-2.96bis.tar.gz 1554605 RMD160 ea09b73709627f95470dbd023e5ffc48209fde6a
 DIST gpsd-3.3.tar.gz 1401206 RMD160 73442e2bccac87a7ba4349ec63c443edbf05a131 SHA1 82a2ffe825c30c2152f2696221dbeeb82a4e9dd5 SHA256 1dbc1813f94f7f05fbf3341bf0154bae26903d1fb90c33b63d5458373ea931b9
 DIST gpsd-3.4.tar.gz 1422890 RMD160 f7cddc018b5b6834a097bbefbddb2b0a3844b203 SHA1 b942902479238f8a3eaa1955299d97461e93081a SHA256 79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f
 DIST gpsd-3.5.tar.gz 1436256 RMD160 5d79e9bae1fa9d96c6104ebbec4386fbe1102a9a SHA1 b280012200a72b745b70ed44c635fccc8dc88cfd SHA256 5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171
+DIST gpsd-3.6.tar.gz 1449822 RMD160 d067eb8114b8a6241fa9ff3c955655ece5b66361 SHA1 aef663ee532a8ebe38521f9f3a889bfb253d2046 SHA256 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc
 EBUILD gpsd-2.95-r1.ebuild 2674 RMD160 3cfe82ffac9f57d771b6728420d106debd49c22e SHA1 86ba4ecde7158a24c535675036f638c9f6683ecc SHA256 d8e81c1b8b9531fc59ea1c9da7710c76c23802faec8e6d404732ed557058ed7b
 EBUILD gpsd-2.96-r1.ebuild 2840 RMD160 75cc21a587c3ef12bb891f8a2dc7ee30fa7cfb1f SHA1 bdf8663fb324ca8ddbe81b58348d12b6a03174ca SHA256 04bab92bbe716753ff6bcd719fa958e32440e7bcc219c6d409936edda0fed695
 EBUILD gpsd-3.3-r1.ebuild 4271 RMD160 1082fd6fda6c9ee12c5b9ae6c4f8508753906c6a SHA1 9f11ddb5d5d2828a36353421aa05c6e8dda0442a SHA256 faf8236ab66713d04d11a2f4d5cd6d8e62e303e922289ecbb915c9adf0d57108
 EBUILD gpsd-3.3.ebuild 4145 RMD160 454a2da60f501ac74e252c7ea24c974b1fef01df SHA1 71da34e59fbb43815fed0653af9e3290ddef9da7 SHA256 2eea0510ce1e65d67cd65a41a7191bee6f0d0dfdc4eb5a6f218ed61a4bc47186
 EBUILD gpsd-3.4.ebuild 4520 RMD160 c24b952ac74aac3a654008a0cdd2e79b3ad148dd SHA1 464a72037c5b9d3d6a746d02708e1922ce378a29 SHA256 3a3f9910ed99342f62326cf4f2e59d36b9d4f2868e330fb5c72ad8e8e556ac20
 EBUILD gpsd-3.5.ebuild 4431 RMD160 09d54c080a66b4eb60c140b624c597c17b0afa54 SHA1 265cb3a3da1120a1db68af2453237e81fbb65fd1 SHA256 7d703c80d7e43ff75f3db8006b24491c5de5eaeda0af507789258e91e9197e9b
+EBUILD gpsd-3.6.ebuild 4428 RMD160 3040781bee25bc2e717030e1bb824842b3a85273 SHA1 d77fda4da713e70b3a56e9806d1ad57f779f5414 SHA256 f2040ee0b84bdd07033a7f7337864fe4458b9a07684a9112d4d22cd3703f091c
 EBUILD gpsd-9999.ebuild 4432 RMD160 7e96cfa6124c31d681686894dc239e2045b28f24 SHA1 28b11c523416048e7b10dfd89d98e1180c696ea6 SHA256 425140da3bba06134416578ddd9ce0541f11eb51226a93913f27121dcd2bd0a3
-MISC ChangeLog 15551 RMD160 5c897cea25ec2ceb56e698d7e92600007e0a18ac SHA1 b56b015f9724abb499c968bceb5ff69c0b60ee2c SHA256 e2c662357217b6df3cd03f1b5e6b9b7e8537d7848f082864df65bc0d0212bac7
+MISC ChangeLog 15721 RMD160 8756f9803d3247e48077bd0bbf7b15d933548503 SHA1 051494b71bc4650d351a0331ca31fb1399c42a4e SHA256 a131ead165daca568e27491a12d2ee57b465f6e98eadcc140980afccd06f279a
 MISC metadata.xml 755 RMD160 5b1284e2e50fbcd3f84fa388c3980298d74bfbfd SHA1 de24f0892fb828f2cb8c64aae6a0f7a53cb5239e SHA256 62975e20eaea76bd26e07faaffc0409ff0474fb57b2556040538c4ca4e553d48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPusPbAAoJELEHsLL7fEFWXTgP+gM2KebaVv4HnoVINsvyLRIg
-p/UtssUdzT51nwh8zFDjAhJ2YU84bYjq3kgunBV7vw5xukTpBN8CVhme201+ThIL
-UOEgJABgkC31uPzNfjen0RrCOd86LqyxboP/W4x8sS54kJxIJj/G2Sz1w9JvAQgk
-Pb8k+G6Cczs+bx9mYfitTLw7Y3qXxz/WTwT4A7MiiRupLW9fKAYH60Z7dV02dCja
-Ie8uApqI1EWIMVy1015zK3fakjGwcxU7Q5jAc0Y5cbXMGEYUV2CcfOJ6xfvgWJpr
-0qmYaFpvUrairnaGgCFQWyx4bNW8O/cCur2w4Amh/+sB8x+8E7g2QorLuRIGmvk4
-P8hDiApFnazadtwI22HtBDdPlcXHjhPsRsveHTP+V0kz9WxJLnntw4qi5KmT5sSK
-HKr5ELO++BiRcocK/R7kmHQicPctSNHPM1TrD+nZiGBHOxXmXA1RiPHS1BT5XGyt
-kh8ik3ReRG044qb1rMr53uoLg6oicxvcnk5/Gk7eV8vUMWdvNVkxFqgnzolwrqou
-SKmOk+H0+qcJbirCETfCix5jh76qB6eO8INQt2nDzC2YKAd5xnyA26Pelt0OPGLM
-38jqRd261mzjm4pDfY1s0sdssmHEAxlu2L4lLtoPqJSXssGGTTASA7Qc3947CssB
-SQefXAJMzofMAC5VVNkj
-=yVRc
+iQIcBAEBAgAGBQJPvPJfAAoJELEHsLL7fEFWNxsP/1aR7RfWFG+9emOoucdoaRi2
+f56h3/BvV/CFj26F+dLnawSPNFw9E/eSMYcq0lc8P7H+ZIVl44r1KClRWa8N4sge
+JvVU51vUvMnUPRxLPFTf8BOOznEqMHeDhJDYbF2OSc0lC66YfS02HjIZJoEUXSFP
+vsfVZQDXzWagejHptauTez2hzcHzCJormnQIxMWZfvT1rHovF4qr+Fq4Zs/Mzu+D
+PXLMI2gFODcwPiqa3cCbsLbsXzAfXcZKwCnZjcvGbGSioHSKGIJVKTtqdCa44j9w
+EhjzV3z1ES7bZjLSYZQi0nsWhndu3aur/pTmTOlyLe5BxvJzJKLuKLw79LXexUCz
+iGMfhLteiqdS+jPty2rjAJvgBhfdepw4EjBbzJRbNlKu+8xvrhNkkX2VUZi2zvyh
+0qQ0sClpmzyE2UWQLOWVZVTyGKMWZJbGL7ixao4UsEyPJcoy0SxACMnQLP38oxNI
+QG27BcR3Lr51JsviORYMfhQrMBCcmVtE1p87W18DDW6a96Th2oTb9AzTB2SHwKMi
+GaPv8wAeqcbyL5dpdGqQunXUGA3MRLZ8Msi1WosyGcdo4V7RrGzji2uwX3kPFoo5
+YOI/b02y+WABQ4SZ5yLv0FRVf6B7MPglj8rCqWRFEGG7Di4FbsBMBZW6TUK4RYRN
+6lNRp7fFixI9GfCrV7Ia
+=8vG7
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.6-debug.patch b/sci-geosciences/gpsd/files/gpsd-3.6-debug.patch
new file mode 100644
index 000000000000..ecaf717b7391
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.6-debug.patch
@@ -0,0 +1,221 @@
+From 07ecfcc72d977cfd364f0337032d5be7a0ff64e0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 23 May 2012 10:09:26 -0400
+Subject: [PATCH] nmea2000: fix build failures when debugging is disabled
+
+When debugging is disabled, there is no libgps_debuglevel, so building
+this driver fails with:
+driver_nmea2000.c: In function 'print_data':
+driver_nmea2000.c:50:10: error: 'libgps_debuglevel' undeclared (first use in this function)
+
+Add some ifdef to this driver to fix that, and change the return type
+of print_data to void since it always returns 0 and no one ever checks
+the return value.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ driver_nmea2000.c |   45 +++++++++++++++++++++++----------------------
+ 1 files changed, 23 insertions(+), 22 deletions(-)
+
+diff --git a/driver_nmea2000.c b/driver_nmea2000.c
+index 1db6686..b3d2734 100644
+--- a/driver_nmea2000.c
++++ b/driver_nmea2000.c
+@@ -44,8 +44,9 @@ typedef struct PGN
+ FILE *logFile = NULL;
+ #endif /* of if LOG_FILE */
+ 
+-static int print_data(unsigned char *buffer, int len, PGN *pgn)
++static void print_data(unsigned char *buffer, int len, PGN *pgn)
+ {
++#ifdef LIBGPS_DEBUG
+     /*@-bufferoverflowhigh@*/
+     if ((libgps_debuglevel >= LOG_IO) != 0) {
+ 	int   l1, l2, ptr;
+@@ -67,7 +68,7 @@ static int print_data(unsigned char *buffer, int len, PGN *pgn)
+         gpsd_report(LOG_IO,"%s\n", bu);
+     }
+     /*@+bufferoverflowhigh@*/
+-    return(0);
++#endif
+ }
+ 
+ static gps_mask_t get_mode(struct gps_device_t *session)
+@@ -84,7 +85,7 @@ static gps_mask_t get_mode(struct gps_device_t *session)
+ 
+ static gps_mask_t hnd_059392(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -92,7 +93,7 @@ static gps_mask_t hnd_059392(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_060928(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -100,7 +101,7 @@ static gps_mask_t hnd_060928(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_126208(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -108,7 +109,7 @@ static gps_mask_t hnd_126208(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_126464(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -116,7 +117,7 @@ static gps_mask_t hnd_126464(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_126996(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -124,7 +125,7 @@ static gps_mask_t hnd_126996(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129025(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ 
+     /*@-type@*//* splint has a bug here */
+@@ -140,7 +141,7 @@ static gps_mask_t hnd_129025(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129026(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ 
+     session->driver.nmea2000.sid[0]  =  bu[0];
+@@ -161,10 +162,10 @@ static gps_mask_t hnd_126992(unsigned char *bu, int len, PGN *pgn, struct gps_de
+     //uint8_t        sid;
+     //uint8_t        source;
+ 
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ 
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ 
+     //sid        = bu[0];
+@@ -187,7 +188,7 @@ static gps_mask_t hnd_129539(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ {
+     gps_mask_t mask;
+ 
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ 
+     mask                             = 0;
+@@ -222,7 +223,7 @@ static gps_mask_t hnd_129540(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ {
+     int         l1, l2;
+ 
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ 
+     session->driver.nmea2000.sid[2]           = bu[0];
+@@ -261,7 +262,7 @@ static gps_mask_t hnd_129029(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ {
+     gps_mask_t mask;
+ 
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ 
+     mask                             = 0;
+@@ -326,7 +327,7 @@ static gps_mask_t hnd_129029(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129038(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -334,7 +335,7 @@ static gps_mask_t hnd_129038(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129039(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -342,7 +343,7 @@ static gps_mask_t hnd_129039(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129040(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -350,7 +351,7 @@ static gps_mask_t hnd_129040(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129794(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -358,7 +359,7 @@ static gps_mask_t hnd_129794(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129798(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -366,7 +367,7 @@ static gps_mask_t hnd_129798(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129802(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -374,7 +375,7 @@ static gps_mask_t hnd_129802(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129809(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+@@ -382,7 +383,7 @@ static gps_mask_t hnd_129809(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ 
+ static gps_mask_t hnd_129810(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+-    (void)print_data(bu, len, pgn);
++    print_data(bu, len, pgn);
+     gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+     return(0);
+ }
+-- 
+1.7.8.6
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.6-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.6-rpath.patch
new file mode 100644
index 000000000000..ecff094e4a9f
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.6-rpath.patch
@@ -0,0 +1,13 @@
+don't set the -rpath flag to the install dir as this breaks DESTDIR
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -268,7 +268,7 @@ def installdir(dir, add_destdir=True):
+ 
+ # Honor the specified installation prefix in link paths.
+ env.Prepend(LIBPATH=[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.6.ebuild b/sci-geosciences/gpsd/gpsd-3.6.ebuild
new file mode 100644
index 000000000000..89841abb45d1
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.6.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.6.ebuild,v 1.1 2012/05/23 14:20:01 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 )
+	qt4? ( x11-libs/qt-gui )"
+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.6-debug.patch
+	epatch "${FILESDIR}"/${PN}-3.6-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() {
+	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
+}