[patch] gpsd-2.96-r1_to_3.1.diff

gpsd-2.96-r1_to_3.1.diff (text/plain), 2.65 KB, created by Ed Wildgoose on 2011-09-09 16:42:55 UTC

--- /usr/portage/sci-geosciences/gpsd/gpsd-2.96-r1.ebuild	2011-07-18 08:31:24.000000000 +0100
+++ gpsd-3.1.ebuild	2011-09-09 17:24:43.000000000 +0100
@@ -5,12 +5,13 @@
 EAPI=3
 
 PYTHON_DEPEND="2:2.6"
+SCONS_MIN_VERSION="1.2.1"
 
-inherit python base autotools
+inherit base eutils python scons-utils
 
 DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients."
 HOMEPAGE="http://gpsd.berlios.de/"
-SRC_URI="mirror://berlios/gpsd/${P}bis.tar.gz"
+SRC_URI="mirror://berlios/gpsd/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,7 +25,7 @@
 	IUSE_GPSD_PROTOCOLS+=" gpsd_protocols_${protocol}"
 done
 
-IUSE="${IUSE_GPSD_PROTOCOLS} dbus ipv6 ntp qt4 test udev"
+IUSE="${IUSE_GPSD_PROTOCOLS} debug dbus ipv6 ntp qt4 test udev"
 
 # those harddeps are de-facto automagicall
 RDEPEND="
@@ -43,12 +44,8 @@
 	=app-text/docbook-xml-dtd-4.1*
 	test? ( sys-devel/bc )"
 
-PATCHES=(
-	"${FILESDIR}/2.95-disable-strip.patch"
-	"${FILESDIR}/${PV}-fix-ldflags.patch"
-	"${FILESDIR}/${PV}-fix-tests.patch"
-	"${FILESDIR}/${PV}-pkgconfig.patch"
-)
+#PATCHES=(
+#)
 
 pkg_setup() {
 	python_set_active_version 2
@@ -57,42 +54,34 @@
 	enewuser gpsd -1 -1 -1 "uucp"
 }
 
-src_prepare() {
-	base_src_prepare
-	eautoreconf
-}
-
-src_configure() {
+src_compile() {
 	local myopts
 
 	# enable specified protocols
 	for protocol in ${GPSD_PROTOCOLS}; do
-		myopts+=" $(use_enable gpsd_protocols_${protocol} ${protocol})"
+		myopts+=" $(use_scons gpsd_protocols_${protocol} ${protocol})"
 	done
 
 	if ! use qt4 ; then
-		myopts+=" --disable-libQgpsmm --disable-libgpsmm"
+		myopts+=" libQgpsmm=False libgpsmm=False"
 	fi
 
-	# --disable-bluetooth: considered experimental -> disable
-	# Hack to make it not generate docs on the fly; xmlto is
-	# needed for man pages (xsltproc is only needed for web pages)
-	WITH_XMLTO=yes WITH_XSLTPROC=no econf \
-		--disable-dependency-tracking \
-		--disable-bluetooth \
-		--disable-static \
-		--enable-gpsd-user=gpsd \
-		--enable-gpsd-group=uucp \
-		$(use_enable dbus) \
-		$(use_enable ipv6) \
-		$(use_enable ntp ntpshm) \
-		$(use_enable ntp pps) \
+	escons \
+		gpsd-user=gpsd \
+		gpsd-group=uucp \
+		strip=False \
+		$(use_scons debug) \
+		$(use_scons dbus dbus-export) \
+		$(use_scons ipv6) \
+		$(use_scons ntp ntpshm) \
+		$(use_scons ntp pps) \
 		${myopts}
 }
 
 src_install() {
-	# no it can't be done using emake cause it is non-compliant
-	make DESTDIR="${D}" install || die
+	# STRIP= is a hack to prevent the scons build stripping binaries. 
+	# gpsd 3.1+ expected to support strip flag to control stripping
+	DESTDIR="${D}" STRIP="/bin/true" escons prefix="/usr/" install || die
 
 	if use udev ; then
 		insinto /lib/udev/rules.d/