Simplify gpsd ebuild and use the latest available version.

sci-geosciences/gpsd/gpsd-2.38.ebuild

Index: sci-geosciences/gpsd/gpsd-2.38.ebuild
diff --git a/sci-geosciences/gpsd/gpsd-2.38.ebuild b/sci-geosciences/gpsd/gpsd-2.38.ebuild
index 558d009421136500fa034fb5b423b3e43ee34fe8..3193d297a1d40e71dda95518e118b2a1611279db 100644
--- a/sci-geosciences/gpsd/gpsd-2.38.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.38.ebuild
@@ -11,62 +11,33 @@ SRC_URI="mirror://berlios/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm x86"

[rochberg, 2011/01/07 18:45:24]

It seems like we should somehow differentiate ourselves from the portage ebuild
since we've ripped so much of it out.

At the very least, we should add a comment explaining that we've simplified a
bunch.

[vb, 2011/01/07 21:39:11]

Done.

 
-IUSE="dbus garmin minimal ntp ocean python tntc usb X"
+IUSE="dbus ntp usb"
 
-RDEPEND="X? (
-		x11-libs/libXmu
-		x11-libs/libXext
-		x11-libs/libXp
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libXpm
-		x11-libs/libXaw
-	)
-	python? ( dev-lang/python )
-
-	dbus? ( >=sys-apps/dbus-0.94
+RDEPEND="dbus? ( >=sys-apps/dbus-0.94
 		>=dev-libs/glib-2.6
 		dev-libs/dbus-glib )
-	ntp? ( net-misc/ntp )
-	usb? ( virtual/dev-manager )"
+	 ntp? ( net-misc/ntp )
+	 usb? ( virtual/dev-manager )"
 
 DEPEND="${RDEPEND}
-	X? (
-		x11-proto/xproto
-		x11-proto/xextproto
-	)
-	!minimal? (
-		dev-libs/libxslt
-		sys-libs/ncurses
-	)"
+	python? ( dev-lang/python )"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# add -lm to setup.py again (see bug #250757)
-	sed -i \
-		-e "s:, gpspacket_sources:, gpspacket_sources, libraries=['m']:g" \

[rochberg, 2011/01/07 18:45:24]

Why don't we need to do this?  Did upstream gpsd fix it?

[vb, 2011/01/07 21:39:11]

I guess so - there is no compilation/linking errors anymore.

-		-e "s:geoid.c\"]:geoid.c\"], libraries=['m']:g" \
-		setup.py || die "sed 1 failed"
-	# fix Garmin text struct
-	sed -i -e "s:RTCM2_PACKET;:RTCM2_PACKET,:g" \
-		drivers.c || die "sed 2 failed"
-	# add missing include file (see bug #162361)
-	sed -i -e "s:gps.h libgpsmm.h:gps.h libgpsmm.h gpsd_config.h:g" \
-		Makefile.am || die "sed 3 failed"
 
+	# Drop extensions requiring Python.
+	sed -i -e 's:^\s\+Extension("gps\.\(packet\|clienthelpers\)",.*$:#:' \
+		setup.py || die "sed failed"
 	eautoreconf
 }
 
 src_compile() {
-
-	local my_conf="--enable-shared --with-pic --enable-static \
-		--disable-fast-install"
-		# --enable-superstar2 is missing a header file
+	local max_clients="5"
+	local max_devices="2"
+	local my_conf="--enable-shared --with-pic --enable-static"
 
 	use python && distutils_python_version
 
@@ -76,110 +47,19 @@ src_compile() {
 		my_conf="${my_conf} --disable-ntpshm --disable-pps"
 	fi
 
-	if use minimal; then
-		local max_clients="5"
-		local max_devices="2"
-		if ! use ntp; then
-			my_conf="${my_conf} --disable-pps --disable-ntpshm"
-		fi
-		my_conf="${my_conf} --enable-squelch --without-x \
-		--enable-max-devices=${max_devices} \
-		--enable-max-clients=${max_clients}"
+	my_conf+=" --enable-max-devices=${max_devices}\
+		   --enable-max-clients=${max_clients}"
 
-		WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
+	WITH_XSLTPROC=no WITH_XMLTO=no econf ${my_conf} \
 		$(use_enable dbus) $(use_enable ocean oceanserver) \
-		$(use_enable tntc tnt) $(use_enable python) \
+		$(use_enable tntc tnt) \
 		$(use_enable garmin garmintxt) || die "econf failed"
-	else
-		econf ${my_conf} $(use_enable dbus) $(use_enable tntc tnt) \
-		$(use_enable ocean oceanserver) $(use_enable python) \
-		$(use_enable garmin garmintxt) $(use_with X x) \
-		|| die "econf failed"
-	fi
-
-	# still needs an explicit linkage with the math lib (bug #250757)
-	append-ldflags -Wl,-z,-defs -Wl,--no-undefined
 
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
-
 	make DESTDIR="${D}" install || die "make install failed"
-
-	if ! test -x "${D}"usr/sbin/gpsd; then
-		ewarn "gpsd link error detected; please re-emerge gpsd."
-	fi
-
-	if use usb ; then
-		insinto /etc/hotplug/usb
-		doins gpsd.usermap
-		exeinto /etc/hotplug/usb
-		doexe gpsd.hotplug
-		insinto /etc/udev/rules.d
-		doins "${FILESDIR}"/99-gpsd-usb.rules
-		keepdir /var/run/usb # needed for REMOVER

[rochberg, 2011/01/07 18:45:24]

Comment that we've taken out all the hotplug/udev stuff for now?

[vb, 2011/01/07 21:39:11]

Done.

-	else
-		newconfd "${FILESDIR}"/gpsd.conf gpsd
-		newinitd "${FILESDIR}"/gpsd.init gpsd
-	fi
-
-	if use X && ! use minimal ; then
-		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
-
-	use python && distutils_src_install
-
-	dodoc INSTALL README TODO
-
-	# add missing dgpsip-servers and capabilities files
-	insinto /usr/share/${PN}
-	doins dgpsip-servers gpscap.ini
-
-	if use minimal; then
-		doman gpsctl.1 sirfmon.1 gpsd.8 gps.1 cgps.1 cgpxlogger.1 gpspipe.1
-		use python && doman gpsprof.1
-	else
-		diropts "-m0644"
-		dobin logextract
-		use python && dobin striplog
-	fi
-}
-
-pkg_postinst() {
-	elog ""
-	elog "This version of gpsd has broken support for the SuperStarII"
-	elog "chipset which is currently disabled."
-	elog ""
-	elog "Other than the above, all default devices are enabled, and all"
-	elog "optional devices and formats are controlled via USE flags."
-	elog ""
-	elog "Recent versions of udev (>=udev-115 or so) should have correct"
-	elog "usb device detection and startup of gpsd (ie, without hotplug)."
-	elog ""
-	elog "Certain GPS devices also require the corresponding kernel options"
-	elog "to be enabled, such as USB_SERIAL_GARMIN, or a USB serial driver"
-	elog "for an adapter such as those that come with Deluo GPS units (eg,"
-	elog "USB_SERIAL_PL2303). Straight serial devices should always work,"
-	elog "even without udev/hotplug support."
-	elog ""
-	elog "Note: the supplied gpsd udev rules are now device-specific, so"
-	elog "if your device isn't detected correctly, please use lsusb or"
-	elog "another suitable tool to determine the proper device IDs and"
-	elog "use the commented rules to fill in the blanks for your device."
-	elog ""
-	elog "Please see this post about the new capabilities database:"
-	elog ""
-	elog "http://lists.berlios.de/pipermail/gpsd-dev/2009-January/006333.html"
-	elog ""
-	elog "on current hardware, adding new hardware, etc.  Read the above"
-	elog "and the INSTALL doc for more information on supported hardware,"
-	elog "and make sure udev has the right group permissions set on the"
-	elog "devices if using USB (it should Do The Right Thing (TM))..."
-	elog ""
+        insinto /etc/init || die "insinto failed"
+        doins "${FILESDIR}/gpsd.conf" || die "doins failed"
 }