summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles/base')
-rw-r--r--profiles/base/ChangeLog5
-rw-r--r--profiles/base/make.defaults4
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 994ecd5621ac..92c20318e200 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for Gentoo base-profile
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.610 2013/11/19 10:12:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.611 2013/11/23 04:25:55 vapier Exp $
+
+ 23 Nov 2013; Mike Frysinger <vapier@gentoo.org> make.defaults:
+ Add ublox to GPSD_PROTOCOLS.
19 Nov 2013; Tim Harder <radhermit@gentoo.org> package.use.mask:
Mask racket USE flag for app-editors/(g)vim.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 5797d7555470..d97f3840cd24 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -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/profiles/base/make.defaults,v 1.106 2013/08/23 17:52:23 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.107 2013/11/23 04:25:55 vapier Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -66,7 +66,7 @@ COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog"
# Tomáš Chvátal <scarabeus@gentoo.org> (26 Oct 2010)
# By default enable all protocols for average GPS user
-GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx"
+GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ublox ubx"
# Benedikt Böhm <hollow@gentoo.org> (27 Nov 2007)
# Sane defaults for built-in apache modules