cleaned up minimal use logic and updated for bug #211456

(Portage version: 2.1.4.1)

2 files changed, 46 insertions, 28 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index b73223546488..3b9d7548282d 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.29 2008/02/23 20:03:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.30 2008/03/01 21:35:42 nerdboy Exp $
+
+  01 Mar 2008; Steve Arnold <nerdboy@gentoo.org> gpsd-2.36.ebuild:
+  Cleaned up minimal use logic and updated for bug #211456; updated version
+  of 2.34-r1 waiting for user testing.
 
 *gpsd-2.36 (23 Feb 2008)
 
diff --git a/sci-geosciences/gpsd/gpsd-2.36.ebuild b/sci-geosciences/gpsd/gpsd-2.36.ebuild
index 07b4793976b8..de25c65b79d0 100644
--- a/sci-geosciences/gpsd/gpsd-2.36.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.36.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.36.ebuild,v 1.1 2008/02/23 20:03:58 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.36.ebuild,v 1.2 2008/03/01 21:35:42 nerdboy Exp $
 
-inherit eutils autotools distutils
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools distutils flag-o-matic
 
 DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients."
 HOMEPAGE="http://gpsd.berlios.de/"
@@ -28,9 +31,7 @@ RDEPEND="X? (
 		virtual/motif
 	)
 	python? ( dev-lang/python )
-	app-text/xmlto
-	dev-libs/libxslt
-	sys-libs/ncurses
+
 	dbus? ( >=sys-apps/dbus-0.94
 		>=dev-libs/glib-2.6
 		dev-libs/dbus-glib )
@@ -41,13 +42,14 @@ DEPEND="${RDEPEND}
 	X? (
 		x11-proto/xproto
 		x11-proto/xextproto
+	)
+	!minimal? (
+		dev-libs/libxslt
+		sys-libs/ncurses
 	)"
 
 RESTRICT="test"
 
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF=2.5
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -70,20 +72,25 @@ src_compile() {
 
 	if use minimal; then
 	    local max_clients="5"
-	    local max_devices="1"
-	    my_conf="${my_conf} --enable-squelch --disable-pps"
-	    my_conf="${my_conf} --enable-max-clients=${max_clients} \
+	    local max_devices="2"
+	    if ! use ntp; then
+		my_conf="${my_conf} --disable-pps"
+	    fi
+	    my_conf="${my_conf} --enable-squelch --without-x \
 		--enable-max-devices=${max_devices} \
-		--without-x"
+		--enable-max-clients=${max_clients}"
+
+	    WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
+		$(use_enable dbus) $(use_enable italk) \
+		$(use_enable itrax) $(use_enable python) \
+		|| die "econf failed"
 	else
-	    my_conf="${my_conf} $(use_with X x)"
+	    econf ${my_conf} $(use_enable dbus) $(use_enable italk) \
+		$(use_enable itrax) $(use_enable python) $(use_with X x) \
+		|| die "econf failed"
 	fi
-
-	econf ${my_conf} $(use_enable dbus) $(use_enable python) \
-	    $(use_enable italk) $(use_enable itrax) \
-	    || die "econf failed"
-	    # Support for the TNT digital compass is currently broken
-	    # $(use_enable tntc tnt)
+	# Support for the TNT digital compass is currently broken
+	# $(use_enable tntc tnt)
 
 	emake || die "emake failed"
 }
@@ -109,6 +116,9 @@ src_install() {
 	    insinto /etc/X11/app-defaults
 	    newins xgps.ad Xgps
 	    newins xgpsspeed.ad Xgpsspeed
+	else
+	    rm "${D}usr/share/man/man1/xgpsspeed.1.bz2" \
+		"${D}usr/share/man/man1/xgps.1.bz2"
 	fi
 
 	diropts "-m0644"
@@ -119,7 +129,12 @@ src_install() {
 	    doexe gps.py gpsfake.py gpspacket.so
 	fi
 
-	dodoc AUTHORS INSTALL README TODO
+	if use minimal; then
+	    doman gpsctl.1 gpsflash.1 gpspipe.1 gpsd.8 gps.1
+	    use python && doman gpsprof.1 gpsfake.1 gpscat.1
+	fi
+
+	dodoc INSTALL README TODO
 
 	# add missing include file (see bug #162361)
 	insinto /usr/include
@@ -129,7 +144,7 @@ src_install() {
 pkg_postinst() {
 	einfo ""
 	einfo "This version of gpsd has broken the support for the TNT compass"
-	einfo "so it is temporarily disabled.  If you need it, stay with the"
+	einfo "and Garmin so they are disabled.  If you need it, stay with the"
 	einfo "previous version for now.  The minimal flag now removes X and"
 	einfo "enables the embedded device (ie, small footprint) support, but"
 	einfo "you'll need to modify the ebuild if you need to change either"
@@ -138,15 +153,14 @@ pkg_postinst() {
 	einfo "recent versions of udev (>=udev-115 or so) should have correct"
 	einfo "usb device detection and startup of gpsd (ie, without hotplug)."
 	einfo ""
-	einfo "Most GPS devices will require the corresponding kernel options"
+	einfo "Different GPS devices require the corresponding kernel options"
 	einfo "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
 	einfo "for an adapter such as those that come with Deluo GPS units (eg,"
-	einfo "USB_SERIAL_PL2303).  Straight serial devices should always work,"
-	einfo "even without udev/hotplug support (assuming you have the serial"
-	einfo "drivers enabled for your hardware)."
+	einfo "USB_SERIAL_PL2303). Straight serial devices should always work,"
+	einfo "even without udev/hotplug support."
 	einfo ""
 	einfo "Read the INSTALL doc for more information on supported hardware,"
-	einfo "and make sure udev has the right group permissions set on the"
-	einfo "tty devices if using USB (it should Do The Right Thing (TM))..."
+	einfo "and make sure udev has the right group permissions set on the tty"
+	einfo "devices if using USB (it should Do The Right Thing (TM))..."
 	einfo ""
 }