Add fix from upstream for building w/nmea driver disabled #493022 by n1ghtmare.

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

4 files changed, 78 insertions, 17 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index c70a01d075b4..3be1dd58c004 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.123 2014/10/30 21:20:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.124 2014/10/30 21:23:08 vapier Exp $
+
+  30 Oct 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/gpsd-3.10-nmea-disabled.patch, gpsd-3.10.ebuild:
+  Add fix from upstream for building w/nmea driver disabled #493022 by
+  n1ghtmare.
 
   30 Oct 2014; Mike Frysinger <vapier@gentoo.org>
   +files/gpsd-3.11-hotplug-config.patch, files/gpsd.init-2, gpsd-9999.ebuild:
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index d3631a140e45..039a7ed657f1 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -7,6 +7,7 @@ AUX 2.96-fix-ldflags.patch 1000 SHA256 a83e03fa5b7b4286724339f44d4933427b7e80cea
 AUX 2.96-fix-tests.patch 944 SHA256 2dced865a8a8951855b9ee8fc5586aa9be3f0c7513c8299c4632ca32a31d2074 SHA512 85bd3561cc7f629a9828689fa9af829613a21494554ec7c368de07d04724bbbdd4a5f8c52151d38c11bb93be7b01cfc1a67eb438594b49a698737a6d689dcf06 WHIRLPOOL 6980836670c29f5a43f9688ead4b17317ced433c6d6e885101dd952a53f2b694462e33f32bd4c91c576e11db72c0c24b846b71376877ff1c63992611a1af815a
 AUX 2.96-pkgconfig.patch 1377 SHA256 8b20899afd3e0e391664461ef359eef1ed6bfc49ba633c90e683178637359e15 SHA512 8980cf5ab6b2706d3fa99ce70dbedc7f4582e0488b88a4da092280453c865608f4d58d49bdc113209de5a3b8334dacac89cef075b4d86c6dbc05176df431b552 WHIRLPOOL 1c1ccc235c3fc55df3160c9540a6eaf8c98bac5fb98d5a7e350d67a20285625fc25ee3892b0b520d2434f2e8cb792a33225f238b7ba8651d1d11f8422562995f
 AUX gpsd-3.10-dbus.patch 888 SHA256 ddff0fd7adc970af01815f01e644278d81135d2421735253c6991f682cdd92ad SHA512 26a8259f5d18ada712220c537a09d4488a908755190a11470fca36a9d2a2b83be264803d29e6aec1377dca4ad5a465283eaedff5d2f318c1cba57f3506e88a7d WHIRLPOOL e1c4654ba9e567a216762994919620d3147c1faef364137a163f73a29de3fa5b7f61a771459d5b97d69b7a1f44be6e72dd14c9c199149c7f28bf056f961b1bec
+AUX gpsd-3.10-nmea-disabled.patch 1818 SHA256 371bff4f18b23f6f93b0a237c7043eaaa98cf7dc4537dc4abc9f6d681bf46ad6 SHA512 e4e4653cb5cb4f6477a58b0cdc27de74c138cdb09af01eb922b276c6286d95171e460aa9a749f360b556e463e0aeca33008ba0dc3d8771934380261eb8c750ad WHIRLPOOL 1c2171600dc7578ed35257d0edc7e99d191c891b726f0fdd62f9e7839f754b143fe505af363ef13393aedb4443ebea17a1c3f63ef010b545df859868bc5ba2b2
 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
@@ -44,29 +45,29 @@ DIST gpsd-3.8.tar.gz 1516959 SHA256 5f9add9a378a3cd1c0f641e0def49fc3f14fb700c9fc
 DIST gpsd-3.9.tar.gz 1518775 SHA256 d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a SHA512 082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f WHIRLPOOL 1d3c70bfe5b4b8dec5dc4119287afb7ca4f426041f49c43b167b9e7f85c3995bfcb3bbf777cbe479ef353f1d485e54c891e732fd6871b6dbe9874d8d3c7fa6d1
 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 4863 SHA256 c58f6d58067bc5ff72f848e86fd91ab1ad6cb67a20c22d5ddcefcabd01543ce3 SHA512 73a2b0f9d07d8f05a1040cd2dc30c44baa7887f21718e4b9b9efce5880af08fc22240714ef0bdd04a535414cf6c5fe56b576991c463b75754175a85c13bea57b WHIRLPOOL 78cba9044d7f07014094ecc53cc18d36d3e1e25a4a5d4fb3b3d86b815640e86113fadd61a7422f89f0ccb1aaed3da08e00803fd285caf5bb250074e36f591fc1
+EBUILD gpsd-3.10.ebuild 4921 SHA256 d9e6e82151a2cd941a57206c531092f255351f388ec5c8842a6e90516e79d1ff SHA512 b58634dabaa02c4668e11d0a72dac3bccac6a07b29a182404eb52e9b7c43f075b6b72fd879205b310d69053b17dda1b6fa1363ad98b6140f1db19740e3ff6037 WHIRLPOOL 9d27ca30152a65726a90159560d74389cb6c53159b65fa5ec5b44cd539f29c57c8b70a12e158a40d32fc9ec42cd8f0a77bd1e2ae4be15abc59b2241da6736707
 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 21196 SHA256 d55c40b5bdd5405a2840ec1553d9ad9e2a2c03138576228b9cb9e7b7804563b5 SHA512 bb5fc4d127de477c1cd67e9e264bb32c3375134f78b67c1a5fb926a294bc6544151c823db98c2bc2d2d141990f2632c3b151860f2348cb4953f9b96a31ea63a5 WHIRLPOOL 9f34cb6dd8b4a20b37e797273ce2cba861153974e4c5fa03270b92f2e1794fb14a0f7486deeb524dea970198b87794601ef9670e2261d2e0198fff04189200a7
+MISC ChangeLog 21389 SHA256 fbf6ea4c4bb8dd837d0a916ffe4b3f64324043d16b5157d081d35f5d4ace0696 SHA512 1af5ed53df866a4c0d4fb405c2aa7583045d5dba459b2ce578a134e67c979ecbc70990a2a2de377424168ffc21ad07f46de5b82f2cc4b1983129ee5fdf1950c2 WHIRLPOOL 2b18558b4314df4aa69a872dd21fe3c5d2c9b28ae0d5719e87fecb7b77ed2d6979fbd154fa466067a1345992b2d2414719f4e00df5374b191d8fd7dc99843eeb
 MISC metadata.xml 754 SHA256 73824ede219103ca6d5ab2736451ad4f5af1edc833371baeac9d77e0835ffcf7 SHA512 72f8f6a877d7a73c75dbd6b0838e94a8d5636750d0cd4af84da44d9c3f89724a22f4bc083851cf43942ae4d39072a654201861d9874b1cf74ebe7b499b94c7f9 WHIRLPOOL 852f39fadd454dea8383732e78b2d68ae4c935a7c82c2876a5f5273cfa381676a5dd59e1f0d8fe095f6f454b1628b5e6ef8782b7ff186a169234aa96e72f2971
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUUqumAAoJEPGu1DbS6WIAsYwP/jMI+8GmlShddiXwx2RmJLE+
-L0/qDaDUA7+8jgpv80/R4s3srdZWHsVhM3X0KUpVkjl2CbTU22412loPBMj0jPoh
-2YfdGlR/lds8eyJI1Sx/VNQ02RwFgS3ZPFSnbReaNuSpd9q6apf496eUkbKsSS3A
-qwEyUxt0waqminuSm/xEJ8KSl7cZGYVPKYi9rWQwfYgwJ0wqEnOmpMIEdrMJ/sJI
-muJ+LRxlUoI7oXiBgQtFVZ5FY3V+saXXkw6MZqOPbs00HOvuwSxfiUsnQYD1TVh1
-wwWv1/TXFj3ku0VSuYDPkJf3AeZbWaY+1mpWY0+R5+K63zyQ5LFn5FWSv0XlQaHG
-78c4MZvDunt2cBkLEsdTttTYzQNfZLu5ZOSpHSMA384mri7sYDHpb65IPxKIpPFz
-R7C8DrI5/nIy5GVQBUE1DBaVB7iHW0vqqX8tFibKj7WJBAMDTIJWlw5sESs7L0oj
-ejYBHnrW3hLi3GdFnABwUwA1quqhp0bCIZo2IxnWE92BWS28LctZS7CfN3DvlTnJ
-B/u6811KnrZPwMpIASLNs72I2PsxdlPjB0hhmzJtqNlejmMh5/1x3XnB4CKuRDUq
-uw9vixI53Crz9f1Z/P5lqUJv23/bKge5swIo82T7XFSJ5OAyJQK/ADXAYv90RWXy
-8ZiRgBu3kwnjy/AzZ3h4
-=5aHh
+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
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch b/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch
new file mode 100644
index 000000000000..e87eff8a5644
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/493022
+
+From c31095e1562494a74d56b46fcc01541d1444cd5c Mon Sep 17 00:00:00 2001
+From: Simon Dawson <spdawson@gmail.com>
+Date: Sun, 8 Dec 2013 10:31:25 +0000
+Subject: [PATCH] gpsmon: fix build when nmea is false
+
+When nmea is False and ncurses support is enabled, the build fails as
+follows.
+
+gpsmon.o: In function `gpsmon_hook':
+gpsmon.c:(.text+0x974): undefined reference to `driver_nmea0183'
+collect2: error: ld returned 1 exit status
+scons: *** [gpsmon] Error 1
+scons: building terminated because of errors.
+
+The problem appears to be a failure to protect use of the driver_nmea0183
+variable with appropriate #ifdef guards.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
+---
+ gpsmon.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gpsmon.c b/gpsmon.c
+index de1f14b..b030979 100644
+--- a/gpsmon.c
++++ b/gpsmon.c
+@@ -36,7 +36,9 @@ extern struct monitor_object_t garmin_mmt, garmin_bin_ser_mmt;
+ extern struct monitor_object_t italk_mmt, ubx_mmt, superstar2_mmt;
+ extern struct monitor_object_t fv18_mmt, gpsclock_mmt, mtk3301_mmt;
+ extern struct monitor_object_t oncore_mmt, tnt_mmt, aivdm_mmt;
++#ifdef NMEA_ENABLE
+ extern const struct gps_type_t driver_nmea0183;
++#endif /* NMEA_ENABLE */
+ 
+ /* These are public */
+ struct gps_device_t session;
+@@ -477,9 +479,11 @@ static void select_packet_monitor(struct gps_device_t *device)
+      */
+     if (device->packet.type != last_type) {
+ 	const struct gps_type_t *active_type = device->device_type;
++#ifdef NMEA_ENABLE
+ 	if (device->packet.type == NMEA_PACKET
+ 	    && ((device->device_type->flags & DRIVER_STICKY) != 0))
+ 	    active_type = &driver_nmea0183;
++#endif /* NMEA_ENABLE */
+ 	if (!switch_type(active_type))
+ 	    longjmp(terminate, TERM_DRIVER_SWITCH);
+ 	else {
+-- 
+2.1.2
+
diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild
index 35be2a4f066e..97981f2904dd 100644
--- a/sci-geosciences/gpsd/gpsd-3.10.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.10.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-3.10.ebuild,v 1.2 2014/07/30 19:41:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-3.10.ebuild,v 1.3 2014/10/30 21:23:08 vapier Exp $
 
 EAPI="5"
 
@@ -73,6 +73,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.10-rpath.patch
 	epatch "${FILESDIR}"/${PN}-3.10-dbus.patch
 	epatch "${FILESDIR}"/${PN}-3.10-udev-install.patch
+	epatch "${FILESDIR}"/${PN}-3.10-nmea-disabled.patch #493022
 
 	# Avoid useless -L paths to the install dir
 	sed -i \