[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd-3.3-release-rev.patch gpsd-3.3-udev-install.patch gpsd-3.3-setup.py

[gentoo-commits] gentoo-x86 commit in sci-geosciences/gpsd/files: gpsd-3.3-release-rev.patch gpsd-3.3-udev-install.patch gpsd-3.3-setup.py

[Mike Frysinger (vapier)]

vapier      11/11/20 06:59:00

  Added:                gpsd-3.3-release-rev.patch
                        gpsd-3.3-udev-install.patch gpsd-3.3-setup.py
  Log:
  Version bump #380883 by Andreas K. Hüttel and Ed Wildgoose.  Add USE=X support for #369261 by Patrick.
  
  (Portage version: 2.2.0_alpha75/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch?rev=1.1&content-type=text/plain

Index: gpsd-3.3-release-rev.patch
===================================================================
taken from upstream repo & tweaked; drop with 3.4 release

From c96ffb7733b56a8c5c20d473d8fd83b62b6abfde Mon Sep 17 00:00:00 2001
From: Bernd Zeimetz <bernd@bzed.de>
Date: Thu, 10 Nov 2011 22:18:07 +0100
Subject: [PATCH] SConstruct: Use gpsd_version as revision for releases.

---
 SConstruct |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index d367403..3d95e7e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -978,12 +978,15 @@ env.Command(target="ais_json.i", source="jsongen.py", action='''\
     chmod a-w $TARGET''')
 
 # generate revision.h
-(st, rev) = commands.getstatusoutput('git describe')
-if st != 0:
-    from datetime import datetime
-    rev = datetime.now().isoformat()[:-4]
+if 'dev' in gpsd_version:
+    (st, rev) = commands.getstatusoutput('git describe')
+    if st != 0:
+        from datetime import datetime
+        rev = datetime.now().isoformat()[:-4]
+else:
+    rev = gpsd_version
 revision='#define REVISION "%s"\n' %(rev.strip(),)
-env.NoClean(env.Textfile(target="revision.h", source=[revision]))
+env.Textfile(target="revision.h", source=[revision])
 
 # generate pps_pin.h
 pps_pin = env['pps_pin']
-- 
1.7.6.1




1.1                  sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch?rev=1.1&content-type=text/plain

Index: gpsd-3.3-udev-install.patch
===================================================================
From b0513cd2e44705058ffdaa7a9c3f32371e9fcd5b Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 17 Nov 2011 23:44:06 -0500
Subject: [PATCH] use DESTDIR with udev install

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 SConstruct |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index 1f99740..b7a98e4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1505,9 +1505,10 @@ if env['python']:
 # is plugged in.
 
 Utility('udev-install', '', [
-    'cp $SRCDIR/gpsd.rules /lib/udev/rules.d/25-gpsd.rules',
-    'cp $SRCDIR/gpsd.hotplug /lib/udev/',
-    'chmod a+x /lib/udev/gpsd.hotplug',
+    'mkdir -p ' + DESTDIR + '/lib/udev/rules.d',
+    'cp $SRCDIR/gpsd.rules ' + DESTDIR + '/lib/udev/rules.d/25-gpsd.rules',
+    'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + '/lib/udev/',
+    'chmod a+x ' + DESTDIR + '/lib/udev/gpsd.hotplug',
         ])
 
 Utility('udev-uninstall', '', [
-- 
1.7.6.1




1.1                  sci-geosciences/gpsd/files/gpsd-3.3-setup.py

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-setup.py?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gpsd/files/gpsd-3.3-setup.py?rev=1.1&content-type=text/plain

Index: gpsd-3.3-setup.py
===================================================================
from distutils.core import setup, Extension

setup(
	name = "gps",
	version = @VERSION@,
	description = 'Python libraries for the gpsd service daemon',
	url = @URL@,
	author = 'the GPSD project',
	author_email = @EMAIL@,
	license = "BSD",
	ext_modules=[
		Extension("gps.packet", @GPS_PACKET_SOURCES@, include_dirs=["."]),
		Extension("gps.clienthelpers", @GPS_CLIENT_SOURCES@, include_dirs=["."]),
	],
	packages = ['gps'],
	scripts = @SCRIPTS@,
)