diff options
Diffstat (limited to 'sci-geosciences/gpsd')
-rw-r--r-- | sci-geosciences/gpsd/Manifest | 16 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch | 12 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch | 73 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch | 143 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch | 11 | ||||
-rw-r--r-- | sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch | 11 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.17-r3.ebuild | 171 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.17-r4.ebuild | 175 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.18.1.ebuild | 192 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.19.ebuild | 192 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.20.ebuild | 189 | ||||
-rw-r--r-- | sci-geosciences/gpsd/gpsd-3.21.ebuild | 24 |
12 files changed, 17 insertions, 1192 deletions
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest index b2122f3216e8..2ac6e295ce23 100644 --- a/sci-geosciences/gpsd/Manifest +++ b/sci-geosciences/gpsd/Manifest @@ -1,22 +1,8 @@ -AUX gpsd-3.17-do_not_rm_library.patch 630 BLAKE2B ca14382bd2a15a6dad255d52484fb3b4cfaa33e6d4d452d1f205e8854e4d7c2e2804dced5617fb2e3f6c207676bb7e0c30ec243d2ad718c2a3458739c4dbeda2 SHA512 70a1db3b2f478885fd0035a8c812f9ddf5230de4ede77c12a6bf3d81d744a902a4c5e14b788f97d9c653e1384653af1cdf849f72b0eb2f49030776c413c60d42 -AUX gpsd-3.17-scons-print.patch 2793 BLAKE2B 6b475dced3a034ee28d4b85c5897f598af02b795b407ec92b5c9938dc45d760cc5a7806e9ece477378462cb2285ae0089a2ef1c23119030e9ca79534c02e40e5 SHA512 1a4883241b0f0126311921ea552d4b090dd5e4e51b42ef865a5afeae4732b27f6057d9389ab6319c9e62d096f26533c28096ac71fb481f478a3bb3b70ffc6d63 -AUX gpsd-3.17-scons-py3.patch 5575 BLAKE2B 7c666c5cc155a95c93e9c871d6233db698cea37a8dde64de39dfdf1fa1a166224d5ed5e72a664c98a363717084a22c9d7359eaa7e13f8fcb11c1225127b7c421 SHA512 091cf7b6c3b283cb5ccdf293f50df639358c7c7ca501cab813cc8439285fc54fd6adcf6b4ae557c1ceeed07dc96e762ec4a8ca703988289885c6a06c205c1859 -AUX gpsd-3.18.1-do_not_rm_library.patch 629 BLAKE2B 21add51d3bceccedf6a9f4f210d608c5fdfb61406484b640ba24aae1f63b38943157f4e6164e39bb30d631ff22870715929f626ecd21fa13426eb7dabcd78ee8 SHA512 91f1a4b9301f220b7d21b446886cfdd0ec67b0568712bb8c82101d10b2d7da6ce142d06c42803a4e611fb039386e092628986db80fa60838d7aac3387e255eed -AUX gpsd-3.19-do_not_rm_library.patch 623 BLAKE2B 340fe4d4f05feea02d087ff069500dfa747f2441aee65e02568955cda5397fa57a44adde03cf8a4f03893dc413eabd79243b478bba1f4b1d149540de2a248126 SHA512 44f3efef561bbc9b3f974699da0f4183d5b7693c7c1651957b285fc541f517b56c95562fa401c4ee030241b9c6ef43a530b4964871f38ba9412d2777640eb28c AUX gpsd-3.21-scons_conditional_python_scripts.patch 1629 BLAKE2B 7011d0bc1dd2062ad8cd0ab7e009039184e66c2b72c99d77fb43d296359e52b5e3d202df698640a305462437ed124c46876a7661793facfefc65cad71072648c SHA512 6b33ea7b13ef2a3ddcf534acb827f2da592eb585535b6d6b3f9d2c3fa9edafc4c5cc577c5e3f0d1fe1afd44aeea9618b3f839fadeb2b630379fb3dfb9d71d2d5 AUX gpsd-3.3-setup.py 448 BLAKE2B 159a212afe7600a9835a03bd87130820a154147aab83c32500108df1d81726d571c7d21e3ac7729c0054859297b71ab42f6cb6c6e487242a46f8d0d91f7c5b0f SHA512 4036bac7c095ba89795b565461bda8f282b7e1476867437db2beabeb1ba3a2a1b5a5b748acaa9ee1a2df693d854654e07f86610f387995abd0b057d3684b651b AUX gpsd.conf-2 198 BLAKE2B c72808d1b43c8f1d97d97369d3f95fe2726a7972ea08915dcd35e82f543265cd457646405b00bd15e45b4a131c5f8d0efefb910be6013476ba7b052650298934 SHA512 75dbfe39eb900cc9587dd70794ee77ae2230765bbede47760ca227145aa3f2290b6995335ffcfeae6cd86f56b01ca87367548f4fbcf810aff1bc012b7416deef AUX gpsd.init-2 825 BLAKE2B 340bd992093d81067cef4329e50e4daa6e663ae214e560080ee58f99fbde742272979ca8b843c47ad6f1c2038d5bcab5c7886a963881bcf09079fb1ec1730aae SHA512 51319247eb78c3021d3eb897cb5d6026cc09d46a532a245a835459ed525947ffb6239f08126dd7e344de52e3b0387226bce060191ec3f14f99fc9f255d96f8ea -DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1 -DIST gpsd-3.18.1.tar.gz 9031595 BLAKE2B 170863740c7281ea111c3f4db2dfeb67f4366da7e9e8d2f7f3bbddacbc9d2083558379b1fe60c9293c31a6428288d205aba565694fedde6f1dfe67999a6782c6 SHA512 b381b177fcd29089a61aa11f5df2c67473720a6bbc5590ca1c4fda627331c407de01c62caceeddae780626b9a02392e9a770d52a143357e1babdcc2fbff0ed38 -DIST gpsd-3.19.tar.gz 10581777 BLAKE2B 0801919c968b8027c357047dabdc8587e1d5950cb0d80f89d6d62678a11b3dfc76a6a89ae59123680dac3188a695d0c37618d3f83280f5e584e10c1fa9a5dc03 SHA512 c9f9a9ff65759f852771ec4cf97ab15343c9176a149dd5ea6c2e2dc18b47aa7c7bf9ff1f2e8523121564d33a34ae6aa08169c5454847b4fe7848e616fd20a814 -DIST gpsd-3.20.tar.gz 3600835 BLAKE2B 6c9a3540de1be9191a601d6666c18c79e8e8913a3b4455448bafd0fa81e3a1859bd4851d42c3d06aed48fd0910060919f87a661d02fec44c001e9a393d8658e6 SHA512 557ef5e5f3b511da4fc441f4bb2e0cd2e23c2981e8b3ce2999973767a04fde070d3ec6f14af60d0e471320078e9f4d1144e5796e7927975ecfbd55fc97f470a9 DIST gpsd-3.21.tar.xz 2620396 BLAKE2B 366d1857f7ff63e087ac1bec8c95d997cd8d48a60d5548c1644748e1ed20334f45a4fb279bc26c61481cc3dea0244eb0aaca0ba562838a3b5de15da5d1d82502 SHA512 a45416c31ee891a84203aea786b6385ea5f557a406d898a8facdde78d120199b7e7db8f86ab8c395f6ca90965940355fa19413b2b918642fd8c7df219745233e -EBUILD gpsd-3.17-r3.ebuild 4707 BLAKE2B 856de5c3f6f684e1777ade59ad372d8fdf2e0c43824f3a9303f1f6be2cbbdf74cbb01f7348d9fe77511b979d97ef7e2cdad0b8b9bb84863e80d5ed225aade9ff SHA512 f55bdf4ed92208d488e71b94e2edd562427ae495d07f609be88a6c5c172a89cdedf76199eb4d136d4f81917ba874bbec0caf5f4abf1b5732d8ab7520932864ec -EBUILD gpsd-3.17-r4.ebuild 4888 BLAKE2B 0e9f549feb461ef812e823c310604967f12482bcd03f569f7146a254bcc8e422ec2d3dcb444af4f989b42caaca8fc027504287b26564e0551e055f7bb1fac349 SHA512 18746122b46198d686a1a19d78b51ea489b9a20e3838438c383a96eec1b351080e03d38f6cd647781915818ee5270c9cfb1bb255dc4f246b57ac5aae9a52a19f -EBUILD gpsd-3.18.1.ebuild 5449 BLAKE2B 8c05e5183d169603b61d8329ae794cb98b24b805cfdfe1ac32407d644a77049ebec31f31074c33bc189179c4cb3370eb826bff5a540a593c876f588ad0a7a9fa SHA512 16ec24d6b3b5f6a709aa68c5a69c675fe961ad0fbc6e7ed0c8cf1eef0a8288cfe2d602a08e6d53cb423c470810b7567ba76c2013526bf36078c767077d1d33e3 -EBUILD gpsd-3.19.ebuild 5455 BLAKE2B f432f96eeae1cca54265927e5ea431d489bbee690048fb9f423ca29176e5aa56d0e1d60d9a82694b4da2911ba63105b2f71ba32f1c757435a33d5d2d7224892e SHA512 bcb17fd87f8ecdc0047a4990d34bc730a67b5bdba8571a0d4a37f3f654283576bc7bcbd746e41373eefdd06041f478993b2acb4030f081cb5aacc01e1b9b973d -EBUILD gpsd-3.20.ebuild 5374 BLAKE2B c82108bce746e73568011f7dc8c9c042a86151ac47a28566fbd3b5a6054fb2af3128c3fb928139d590797f5d11a05390bdfa4b0f728574634b03406dcfc8d7b5 SHA512 cdc68b867abfb9e60afba81471f045d9ad80a36469229f3bbcb4bd3c4124fc9b3c31aca880651be78d4131f251d897a7d458b2d96cad3e396216f66586c937d4 -EBUILD gpsd-3.21.ebuild 5548 BLAKE2B fb31544edb5a91d65c29745ca7d9cd5679b496e25f1d3f3c019f3d2488f375dd83e5fc674b808bb4a7bc0d11455e2c69fbf372854e29e292f0b442f7ea925559 SHA512 85548df1afaa3d8325427cbebf167238228e39adb850a9efbf3e83e12c009b02460fadf4a2c87c080a9b42a537a20daf1c8cf39416ce52c79b75374088af414d +EBUILD gpsd-3.21.ebuild 5658 BLAKE2B e22ae37add6ff5ac203fbb48448816f475ee20d9990c9c54664e669c4d45da6a100043e986e2976582c4648a5793011935a6e6366d99357b36c3545aa2065853 SHA512 951727357db685523d7c7ab179ab887a534b8f46fe12056da635567d1bc8b9b1077121abd3a6a2a98ce460891dfa327dc77ccd884417abb685ee2af1f4f4f67b EBUILD gpsd-9999.ebuild 5522 BLAKE2B 9127fcc0421eabd1eca09f8bbd6494a008a0990aa4669d80d87024df6f421638a9662b937a12ea03cae4c7e189c00bdbe4a3fc78fe4529634ef4ff12cd8b11e0 SHA512 8375fdb71754aeecb7c58fe02e8082db4a0f57c9b04809d4fdf88756cf35c7c6a2eff34ed6e806b6843c88b662362441a98d7d20529d2aa0e1ad64bbce5178cf MISC metadata.xml 950 BLAKE2B 1187055e96b7b5f0288f76fafbe2b1afd29729365fbf30b7e8120830db76193aa544815fd348058ef59351d1c097747684ae022b0ec7df0f655c0a9e3f4d7449 SHA512 87fdd329ffe13ec6aee16b877b355b2aac2267e8262b30ab5ab04307bc50797e1e3da8328a540a0484b06cbbd2f643f084e556ce32cc01b37c97d0f8f1b6be2a diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch deleted file mode 100644 index 83e2907fca5b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.17-do_not_rm_library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/SConstruct b/SConstruct -index c0f083a..4a98580 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1646,7 +1646,6 @@ binaryinstall.append(env.Install(installdir('sbindir'), sbin_binaries)) - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version)) - # Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib, libgps_version)) diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch deleted file mode 100644 index 4d94d05f4284..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-print.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ed205512dd05a7dd4b0dab8af760d13e9efbbb25 Mon Sep 17 00:00:00 2001 -From: Fred Wright <fw@fwright.net> -Date: Sat, 7 Oct 2017 19:54:55 -0700 -Subject: [PATCH] Fixes SConstruct for SCons 3.0.0. - -SCons 3.0.0 introduced a bug where the print_funtion future import is -inflicted on the SConstruct script, making 'print' as a statement -illegal. This is expected to be fixed in SCons 3.0.1, but in the -meantime it's necessary to switch to the print_function mode for -compatibility. Fortunately, there were only three print statements in -the whole file. - -This is not a complete Python 3 fix; it simply restores correct -operation when running SCons under Python 2. - -TESTED: -Arraged to test all three print() instances under OSX. -Tested "scons build-all check" under OSX, Ubuntu, CentOS, Fedora, -FreeBSD, OpenBSD, and NetBSD. ---- - SConstruct | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 4923ad8cdae3..040103cff387 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -23,6 +23,13 @@ - # * Out-of-directory builds: see http://www.scons.org/wiki/UsingBuildDir - # * Coveraging mode: gcc "-coverage" flag requires a hack - # for building the python bindings -+# * Python 3 compatibility in this recipe -+ -+# Since SCons 3.0.0 forces print_function on us, it needs to be unconditional. -+# This is recognized to be a bug in SCons, but we need to live with it for now, -+# and we'll need this for eventual Python 3 compatibility, anyway. -+# Python requires this to precede any non-comment code. -+from __future__ import print_function - - # Release identification begins here - gpsd_version = "3.18~dev" -@@ -375,7 +382,7 @@ if env.GetOption("silent"): - - def announce(msg): - if not env.GetOption("silent"): -- print msg -+ print(msg) - - # DESTDIR environment variable means user prefix the installation root. - DESTDIR = os.environ.get('DESTDIR', '') -@@ -1546,8 +1553,8 @@ def substituter(target, source, env): - content = content.replace(s, t) - m = re.search("@[A-Z]+@", content) - if m and m.group(0) not in map(lambda x: x[0], substmap): -- print >>sys.stderr, "Unknown subst token %s in %s." \ -- % (m.group(0), sfp.name) -+ print("Unknown subst token %s in %s." % (m.group(0), sfp.name), -+ file=sys.stderr) - tfp = open(str(target[0]), "w") - tfp.write(content) - tfp.close() -@@ -2191,7 +2198,7 @@ def validation_list(target, source, env): - if '-head' not in page: - fp = open(page) - if "Valid HTML" in fp.read(): -- print os.path.join(website, os.path.basename(page)) -+ print(os.path.join(website, os.path.basename(page))) - fp.close() - Utility("validation-list", [www], validation_list) - --- -2.19.1 - diff --git a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch b/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch deleted file mode 100644 index d6154c47687b..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.17-scons-py3.patch +++ /dev/null @@ -1,143 +0,0 @@ -From b2ba8d5ade0f9d55c2b51ca41d9c9604662452ad Mon Sep 17 00:00:00 2001 -From: Robert Norris <rw_norris@hotmail.com> -Date: Mon, 12 Feb 2018 14:16:17 -0800 -Subject: [PATCH] SConstruct: Allow building for Python 3 - -Still usable with Python 2 - -Tested: -scons build-all check - -Debian Unstable with python 2.7.14 -OpenSUSE Tumbleweed with python 3.6.4 ---- - SConstruct | 30 ++++++++++++++++-------------- - 1 file changed, 16 insertions(+), 14 deletions(-) - -diff --git a/SConstruct b/SConstruct -index c6a309ec3c30..17b47e21342f 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -370,7 +370,7 @@ for flag in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]: - - - # Keep scan-build options in the environment --for key, value in os.environ.iteritems(): -+for key, value in os.environ.items(): - if key.startswith('CCC_'): - env.Append(ENV={key: value}) - -@@ -476,6 +476,8 @@ if env['sysroot']: - env.MergeFlags({"LINKFLAGS": ["--sysroot=%s" % env['sysroot']]}) - - # Build help -+def cmp(a, b): -+ return (a > b) - (a < b) - - Help("""Arguments may be a mixture of switches and targets in any order. - Switches apply to the entire build regardless of where they are in the order. -@@ -859,9 +861,9 @@ else: - "dbus_export": ["libdbus-1"], - } - -- keys = map(lambda x: (x[0], x[2]), boolopts) \ -- + map(lambda x: (x[0], x[2]), nonboolopts) \ -- + map(lambda x: (x[0], x[2]), pathopts) -+ keys = list(map(lambda x: (x[0], x[2]), boolopts)) \ -+ + list(map(lambda x: (x[0], x[2]), nonboolopts)) \ -+ + list(map(lambda x: (x[0], x[2]), pathopts)) - keys.sort() - for (key, help) in keys: - value = env[key] -@@ -998,7 +1000,7 @@ else: - if env['python']: # May have been turned off by error - env['PYTHON'] = target_python_path - env['ENV']['PYTHON'] = target_python_path # For regress-driver -- py_config_vars = ast.literal_eval(py_config_text) -+ py_config_vars = ast.literal_eval(py_config_text.decode()) - py_config_vars = [[] if x is None else x for x in py_config_vars] - python_config = dict(zip(PYTHON_CONFIG_NAMES, py_config_vars)) - -@@ -1387,7 +1389,7 @@ else: - - python_objects = {} - python_compiled_libs = {} -- for ext, sources in python_extensions.iteritems(): -+ for ext, sources in python_extensions.items(): - python_objects[ext] = [] - for src in sources: - python_objects[ext].append( -@@ -1417,7 +1419,7 @@ Platform: UNKNOWN - python_egg_info = python_env.Textfile(target="gps-%s.egg-info" - % (gpsd_version, ), - source=python_egg_info_source) -- python_built_extensions = python_compiled_libs.values() -+ python_built_extensions = list(python_compiled_libs.values()) - python_targets = python_built_extensions + [python_egg_info] - - env.Command(target="packet_names.h", source="packet_states.h", action=""" -@@ -1624,14 +1626,14 @@ if env['xgps']: - "xgpsspeed.1": "gps.xml", - "xgps.1": "gps.xml", - }) --all_manpages = base_manpages.keys() + python_manpages.keys() -+all_manpages = list(base_manpages.keys()) + list(python_manpages.keys()) - - man_env = env.Clone() - if man_env.GetOption('silent'): - man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter - manpage_targets = [] - if manbuilder: -- for (man, xml) in base_manpages.items() + python_manpages.items(): -+ for (man, xml) in list(base_manpages.items()) + list(python_manpages.items()): - manpage_targets.append(man_env.Man(source=xml, target=man)) - - # Where it all comes together -@@ -1682,7 +1684,7 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] - if not env['python']: - python_install = [] - else: -- python_module_dir = python_libdir + os.sep + 'gps' -+ python_module_dir = str(python_libdir) + os.sep + 'gps' - python_extensions_install = python_env.Install(DESTDIR + python_module_dir, - python_built_extensions) - if ((not env['debug'] and not env['profiling'] -@@ -1695,7 +1697,7 @@ else: - python_progs_install = python_env.Install(installdir('bindir'), - python_progs) - -- python_egg_info_install = python_env.Install(DESTDIR + python_libdir, -+ python_egg_info_install = python_env.Install(DESTDIR + str(python_libdir), - python_egg_info) - python_install = [python_extensions_install, - python_modules_install, -@@ -1712,7 +1714,7 @@ if qt_env: - - - maninstall = [] --for manpage in base_manpages.keys() + python_manpages.keys(): -+for manpage in list(base_manpages.keys()) + list(python_manpages.keys()): - if not manbuilder and not os.path.exists(manpage): - continue - section = manpage.split(".")[1] -@@ -2198,7 +2200,7 @@ htmlpages = Split(''' - www/writing-a-driver.html - ''') - --webpages = htmlpages + asciidocs + map(lambda f: f[:-3], glob.glob("www/*.in")) -+webpages = htmlpages + asciidocs + list(map(lambda f: f[:-3], glob.glob("www/*.in"))) - - www = env.Alias('www', webpages) - -@@ -2376,7 +2378,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"): - if ".gitignore" in distfiles: - distfiles.remove(".gitignore") - distfiles += generated_sources -- distfiles += base_manpages.keys() + python_manpages.keys() -+ distfiles += list(base_manpages.keys()) + list(python_manpages.keys()) - if "packaging/rpm/gpsd.spec" not in distfiles: - distfiles.append("packaging/rpm/gpsd.spec") - --- -2.19.1 - diff --git a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch deleted file mode 100644 index 0500f385d79d..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.18.1-do_not_rm_library.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-3.18.1/SConstruct.orig 2018-10-19 12:45:40.000000000 -0700 -+++ gpsd-3.18.1/SConstruct 2019-10-02 11:49:00.848685223 -0700 -@@ -1796,8 +1796,6 @@ # third-party client programs should not - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, - libgps_version)) --# Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), diff --git a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch b/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch deleted file mode 100644 index 8008dd54fe9c..000000000000 --- a/sci-geosciences/gpsd/files/gpsd-3.19-do_not_rm_library.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpsd-3.19/SConstruct.orig 2019-07-01 19:00:17.000000000 -0700 -+++ gpsd-3.19/SConstruct 2019-10-02 11:49:06.080655901 -0700 -@@ -1980,8 +1980,6 @@ # third-party client programs should not - binaryinstall.append(env.Install(installdir('bindir'), bin_binaries)) - binaryinstall.append(LibraryInstall(env, installdir('libdir'), libgps_shared, - libgps_version)) --# Work around a minor bug in InstallSharedLib() link handling --env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), )) - - if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild deleted file mode 100644 index 98c43cc1ab7f..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python2_7 ) -SCONS_MIN_VERSION="1.2.1" - -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" - inherit git-2 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="http://catb.org/gpsd/" - -LICENSE="BSD" -SLOT="0/23" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver - oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt - tripmate tsip ublox -) -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X" -RESTRICT="!test? ( test )" -REQUIRED_USE="X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" - -RDEPEND=" - >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez ) - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - ncurses? ( sys-libs/ncurses:= ) - ntp? ( || ( - net-misc/ntp - net-misc/ntpsec - net-misc/chrony - ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - python? ( ${PYTHON_DEPS} ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-devel/bc )" - -# xml packages are for man page generation -if [[ ${PV} == *9999* ]] ; then - DEPEND+=" - app-text/xmlto - =app-text/docbook-xml-dtd-4.1*" -fi - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort - ) ) - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then - eerror "Detected protocols: ${src_protocols}" - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" - die "please sync ebuild & source" - fi - - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch - - # Avoid useless -L paths to the install dir - sed -i \ - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ - SConstruct || die - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_setup - # Extract python info out of SConstruct so we can use saner distribute - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs | tail -1) - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") - sed \ - -e "s|@VERSION@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - myesconsargs=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - chrpath=False - gpsd_user=gpsd - gpsd_group=uucp - nostrip=True - manbuild=False - shared=$(usex !static True False) - $(use_scons bluetooth bluez) - $(use_scons cxx libgpsmm) - $(use_scons debug clientdebug) - $(use_scons dbus dbus_export) - $(use_scons ipv6) - $(use_scons latency-timing timing) - $(use_scons ncurses) - $(use_scons ntp ntpshm) - $(use_scons ntp pps) - $(use_scons X python) - $(use_scons qt5 qt) - $(use_scons shm shm_export) - $(use_scons sockets socket_export) - $(use_scons usb) - ) - - use X && myesconsargs+=( xgps=1 ) - use qt5 && myesconsargs+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) - done -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons - - use python && distutils-r1_src_compile -} - -src_install() { - DESTDIR="${D}" escons install $(usex udev udev-install "") - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - use python && distutils-r1_src_install -} - -pkg_preinst() { - # Run the gpsd daemon as gpsd and group uucp; create it here - # as it doesn't seem to be needed during compile/install ... - enewuser gpsd -1 -1 -1 "uucp" -} diff --git a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild deleted file mode 100644 index 814c85acb356..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.17-r4.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python2_7 ) -SCONS_MIN_VERSION="1.2.1" - -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git" - inherit git-2 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="http://catb.org/gpsd/" - -LICENSE="BSD" -SLOT="0/23" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver - oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt - tripmate tsip ublox -) -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X" -RESTRICT="!test? ( test )" -REQUIRED_USE="X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" - -RDEPEND=" - >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez ) - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - ncurses? ( sys-libs/ncurses:= ) - ntp? ( || ( - net-misc/ntp - net-misc/ntpsec - net-misc/chrony - ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - python? ( ${PYTHON_DEPS} ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-devel/bc )" - -# xml packages are for man page generation -if [[ ${PV} == *9999* ]] ; then - DEPEND+=" - app-text/xmlto - =app-text/docbook-xml-dtd-4.1*" -fi - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort - ) ) - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then - eerror "Detected protocols: ${src_protocols}" - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" - die "please sync ebuild & source" - fi - - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch - epatch "${FILESDIR}"/${P}-scons-print.patch - epatch "${FILESDIR}"/${P}-scons-py3.patch - - # Avoid useless -L paths to the install dir - sed -i \ - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ - SConstruct || die - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_setup - # Extract python info out of SConstruct so we can use saner distribute - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs | tail -1) - # Handle conditional tools manually. #666734 - use X && pybins+="+ ['xgps', 'xgpsspeed']" - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") - sed \ - -e "s|@VERSION@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - myesconsargs=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - chrpath=False - gpsd_user=gpsd - gpsd_group=uucp - nostrip=True - manbuild=False - shared=$(usex !static True False) - $(use_scons bluetooth bluez) - $(use_scons cxx libgpsmm) - $(use_scons debug clientdebug) - $(use_scons dbus dbus_export) - $(use_scons ipv6) - $(use_scons latency-timing timing) - $(use_scons ncurses) - $(use_scons ntp ntpshm) - $(use_scons ntp pps) - $(use_scons X python) - $(use_scons qt5 qt) - $(use_scons shm shm_export) - $(use_scons sockets socket_export) - $(use_scons usb) - ) - - use X && myesconsargs+=( xgps=1 ) - use qt5 && myesconsargs+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) - done -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons - - use python && distutils-r1_src_compile -} - -src_install() { - DESTDIR="${D}" escons install $(usex udev udev-install "") - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - use python && distutils-r1_src_install -} - -pkg_preinst() { - # Run the gpsd daemon as gpsd and group uucp; create it here - # as it doesn't seem to be needed during compile/install ... - enewuser gpsd -1 -1 -1 "uucp" -} diff --git a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild b/sci-geosciences/gpsd/gpsd-3.18.1.ebuild deleted file mode 100644 index 466deda4514c..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.18.1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_6 ) -SCONS_MIN_VERSION="2.3.0" - -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" - inherit git-r3 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="https://gpsd.gitlab.io/gpsd/" - -LICENSE="BSD" -SLOT="0/24" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip - oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq - superstar2 tnt tripmate tsip ublox -) -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X" -REQUIRED_USE="X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - gpsd_protocols_isync? ( gpsd_protocols_ublox ) - gpsd_protocols_ublox? ( python ) - gpsd_protocols_greis? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez ) - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - ncurses? ( sys-libs/ncurses:= ) - ntp? ( || ( - net-misc/ntp - net-misc/ntpsec - net-misc/chrony - ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - python? ( ${PYTHON_DEPS} ) - gpsd_protocols_ublox? ( dev-python/pyserial ) - gpsd_protocols_greis? ( dev-python/pyserial ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-devel/bc )" - -# xml packages are for man page generation -if [[ ${PV} == *9999* ]] ; then - DEPEND+=" - app-text/xmlto - =app-text/docbook-xml-dtd-4.1*" -fi - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort - ) ) - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then - eerror "Detected protocols: ${src_protocols}" - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" - die "please sync ebuild & source" - fi - - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch - # Merged upstream - #epatch "${FILESDIR}"/${P}-scons-print.patch - #epatch "${FILESDIR}"/${P}-scons-py3.patch - - # Avoid useless -L paths to the install dir - sed -i \ - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ - SConstruct || die - - default - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_setup - python_export - - # Extract python info out of SConstruct so we can use saner distribute - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs | tail -1) - # Handle conditional tools manually. #666734 - use X && pybins+="+ ['xgps', 'xgpsspeed']" - use gpsd_protocols_ublox && pybins+="+ ['ubxtool']" - use gpsd_protocols_greis && pybins+="+ ['zerk']" - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") - sed \ - -e "s|@VERSION@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - myesconsargs=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - chrpath=False - gpsd_user=gpsd - gpsd_group=uucp - nostrip=True - manbuild=False - shared=$(usex !static True False) - $(use_scons bluetooth bluez) - $(use_scons cxx libgpsmm) - $(use_scons debug clientdebug) - $(use_scons dbus dbus_export) - $(use_scons ipv6) - $(use_scons latency-timing timing) - $(use_scons ncurses) - $(use_scons ntp ntpshm) - $(use_scons ntp pps) - $(use_scons python) - $(use_scons qt5 qt) - $(use_scons shm shm_export) - $(use_scons sockets socket_export) - $(use_scons usb) - ) - - use X && myesconsargs+=( xgps=1 xgpsspeed=1 ) - use qt5 && myesconsargs+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) - done -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons - - use python && distutils-r1_src_compile -} - -src_install() { - DESTDIR="${D}" escons install $(usex udev udev-install "") - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - # Cleanup bad alt copy due to Scons - rm -rf "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps* - find "${D}"/usr/local/ -type d -delete - # Install correct multi-python copy - use python && distutils-r1_src_install - -} - -pkg_preinst() { - # Run the gpsd daemon as gpsd and group uucp; create it here - # as it doesn't seem to be needed during compile/install ... - enewuser gpsd -1 -1 -1 "uucp" -} diff --git a/sci-geosciences/gpsd/gpsd-3.19.ebuild b/sci-geosciences/gpsd/gpsd-3.19.ebuild deleted file mode 100644 index 881256686bca..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.19.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{6,7,8} ) -SCONS_MIN_VERSION="2.3.0" - -inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" - inherit git-r3 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="https://gpsd.gitlab.io/gpsd/" - -LICENSE="BSD" -SLOT="0/24" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip - oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq - superstar2 tnt tripmate tsip ublox -) -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X" -REQUIRED_USE="X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - gpsd_protocols_isync? ( gpsd_protocols_ublox ) - gpsd_protocols_ublox? ( python ) - gpsd_protocols_greis? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez ) - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - ncurses? ( sys-libs/ncurses:= ) - ntp? ( || ( - net-misc/ntp - net-misc/ntpsec - net-misc/chrony - ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - python? ( ${PYTHON_DEPS} ) - gpsd_protocols_ublox? ( dev-python/pyserial ) - gpsd_protocols_greis? ( dev-python/pyserial ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-devel/bc )" - -# xml packages are for man page generation -if [[ ${PV} == *9999* ]] ; then - DEPEND+=" - app-text/xmlto - =app-text/docbook-xml-dtd-4.1*" -fi - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort - ) ) - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then - eerror "Detected protocols: ${src_protocols}" - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" - die "please sync ebuild & source" - fi - - epatch "${FILESDIR}"/${P}-do_not_rm_library.patch - # Merged upstream - #epatch "${FILESDIR}"/${P}-scons-print.patch - #epatch "${FILESDIR}"/${P}-scons-py3.patch - - # Avoid useless -L paths to the install dir - sed -i \ - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ - SConstruct || die - - default - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_setup - python_export - - # Extract python info out of SConstruct so we can use saner distribute - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs | tail -1) - # Handle conditional tools manually. #666734 - use X && pybins+="+ ['xgps', 'xgpsspeed']" - use gpsd_protocols_ublox && pybins+="+ ['ubxtool']" - use gpsd_protocols_greis && pybins+="+ ['zerk']" - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])") - local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])") - sed \ - -e "s|@VERSION@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "s|@GPS_CLIENT_SOURCES@|${client}|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - myesconsargs=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - chrpath=False - gpsd_user=gpsd - gpsd_group=uucp - nostrip=True - manbuild=False - shared=$(usex !static True False) - $(use_scons bluetooth bluez) - $(use_scons cxx libgpsmm) - $(use_scons debug clientdebug) - $(use_scons dbus dbus_export) - $(use_scons ipv6) - $(use_scons latency-timing timing) - $(use_scons ncurses) - $(use_scons ntp ntpshm) - $(use_scons ntp pps) - $(use_scons python) - $(use_scons qt5 qt) - $(use_scons shm shm_export) - $(use_scons sockets socket_export) - $(use_scons usb) - ) - - use X && myesconsargs+=( xgps=1 xgpsspeed=1 ) - use qt5 && myesconsargs+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) ) - done -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons - - use python && distutils-r1_src_compile -} - -src_install() { - DESTDIR="${D}" escons install $(usex udev udev-install "") - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - # Cleanup bad alt copy due to Scons - rm -rf "${D}"/usr/local/$(get_libdir)/python*/site-packages/gps* - find "${D}"/usr/local/ -type d -delete - # Install correct multi-python copy - use python && distutils-r1_src_install - -} - -pkg_preinst() { - # Run the gpsd daemon as gpsd and group uucp; create it here - # as it doesn't seem to be needed during compile/install ... - enewuser gpsd -1 -1 -1 "uucp" -} diff --git a/sci-geosciences/gpsd/gpsd-3.20.ebuild b/sci-geosciences/gpsd/gpsd-3.20.ebuild deleted file mode 100644 index 8953467697c5..000000000000 --- a/sci-geosciences/gpsd/gpsd-3.20.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python3_{6,7,8} ) -SCONS_MIN_VERSION="2.3.0" - -inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" - inherit git-r3 -else - SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" -fi - -DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" -HOMEPAGE="https://gpsd.gitlab.io/gpsd/" - -LICENSE="BSD" -SLOT="0/25" - -GPSD_PROTOCOLS=( - aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar - gpsclock greis isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip - oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq - superstar2 tnt tripmate tsip ublox -) -IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/+gpsd_protocols_} -IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency-timing ncurses ntp python qt5 +shm +sockets static test udev usb X" -REQUIRED_USE="X? ( python ) - gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) - gpsd_protocols_isync? ( gpsd_protocols_ublox ) - gpsd_protocols_ublox? ( python ) - gpsd_protocols_greis? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - qt5? ( cxx )" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-user/gpsd - >=net-misc/pps-tools-0.0.20120407 - bluetooth? ( net-wireless/bluez ) - dbus? ( - sys-apps/dbus - dev-libs/dbus-glib - ) - ncurses? ( sys-libs/ncurses:= ) - ntp? ( || ( - net-misc/ntp - net-misc/ntpsec - net-misc/chrony - ) ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - ) - python? ( ${PYTHON_DEPS} ) - gpsd_protocols_ublox? ( dev-python/pyserial ) - gpsd_protocols_greis? ( dev-python/pyserial ) - usb? ( virtual/libusb:1 ) - X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( sys-devel/bc )" - -# xml packages are for man page generation -if [[ ${PV} == *9999* ]] ; then - DEPEND+=" - app-text/xmlto - =app-text/docbook-xml-dtd-4.1*" -fi - -src_prepare() { - # Make sure our list matches the source. - local src_protocols=$(echo $( - sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort - ) ) - if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then - eerror "Detected protocols: ${src_protocols}" - eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}" - die "please sync ebuild & source" - fi - - # Avoid useless -L paths to the install dir - sed -i \ - -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ - SConstruct || die - - #Fix systemd binary paths - sed -i -e 's/local\///' 'systemd/gpsd.service' - sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' - - default - - use python && distutils-r1_src_prepare -} - -python_prepare_all() { - python_setup - - # Extract python info out of SConstruct so we can use saner distribute - pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; } - local pybins=$(pyvar python_progs | tail -1) - # Handle conditional tools manually. #666734 - use X && pybins+="+ ['xgps', 'xgpsspeed']" - use gpsd_protocols_ublox && pybins+="+ ['ubxtool']" - use gpsd_protocols_greis && pybins+="+ ['zerk']" - local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct) - local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])" || die "Unable to extract packet types") - # Post 3.19 the clienthelpers were merged into gps.packet - sed \ - -e "s|@VERSION@|$(pyvar gpsd_version)|" \ - -e "s|@URL@|$(pyvar website)|" \ - -e "s|@EMAIL@|$(pyvar devmail)|" \ - -e "s|@SCRIPTS@|${pybins}|" \ - -e "s|@GPS_PACKET_SOURCES@|${packet}|" \ - -e "/@GPS_CLIENT_SOURCES@/d" \ - -e "s|@SCRIPTS@|${pybins}|" \ - "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die - distutils-r1_python_prepare_all -} - -src_configure() { - scons_opts=( - prefix="${EPREFIX}/usr" - libdir="\$prefix/$(get_libdir)" - udevdir="$(get_udevdir)" - rundir="/run" - chrpath=False - gpsd_user=gpsd - gpsd_group=dialout - nostrip=True - manbuild=False - shared=$(usex !static True False) - bluez=$(usex bluetooth) - libgpsmm=$(usex cxx) - clientdebug=$(usex debug) - dbus_export=$(usex dbus) - ipv6=$(usex ipv6) - timing=$(usex latency-timing) - ncurses=$(usex ncurses) - ntpshm=$(usex ntp) - pps=$(usex ntp) - python=$(usex python) - # force a predictable python libdir because lib vs. lib64 usage differs - # from 3.5 to 3.6+ - $(usex python python_libdir="${EPREFIX}"/python-discard "") - qt=$(usex qt5) - shm_export=$(usex shm) - socket_export=$(usex sockets) - usb=$(usex usb) - ) - - use X && scons_opts+=( xgps=1 xgpsspeed=1 ) - use qt5 && scons_opts+=( qt_versioned=5 ) - - # enable specified protocols - local protocol - for protocol in ${GPSD_PROTOCOLS[@]} ; do - scons_opts+=( ${protocol}=$(usex gpsd_protocols_${protocol}) ) - done -} - -src_compile() { - export CHRPATH= - tc-export CC CXX PKG_CONFIG - export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS} - escons "${scons_opts[@]}" - - use python && distutils-r1_src_compile -} - -src_install() { - DESTDIR="${D}" escons install "${scons_opts[@]}" $(usex udev udev-install "") - - newconfd "${FILESDIR}"/gpsd.conf-2 gpsd - newinitd "${FILESDIR}"/gpsd.init-2 gpsd - - # Cleanup bad alt copy due to Scons - rm -rf "${D}"/python-discard/gps* - find "${D}"/python-discard/ -type d -delete - # Install correct multi-python copy - use python && distutils-r1_src_install - -} diff --git a/sci-geosciences/gpsd/gpsd-3.21.ebuild b/sci-geosciences/gpsd/gpsd-3.21.ebuild index 6cbd9be5a865..c5109b205bda 100644 --- a/sci-geosciences/gpsd/gpsd-3.21.ebuild +++ b/sci-geosciences/gpsd/gpsd-3.21.ebuild @@ -6,14 +6,14 @@ EAPI=7 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python3_{6..9} ) -inherit eutils udev multilib distutils-r1 scons-utils toolchain-funcs +inherit distutils-r1 scons-utils toolchain-funcs udev if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://gitlab.com/gpsd/gpsd.git" inherit git-r3 else SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86" fi DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients" @@ -94,13 +94,18 @@ src_prepare() { -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \ SConstruct || die - #Fix systemd binary paths - sed -i -e 's/local\///' 'systemd/gpsd.service' - sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' + # Fix systemd binary paths + sed -i -e 's/local\///' 'systemd/gpsd.service' || die + sed -i -e 's/local\///' 'systemd/gpsdctl@.service.in' || die default - use python && distutils-r1_src_prepare + if use python ; then + distutils-r1_src_prepare + else + # We're using escons, bug #734352 + python_setup + fi } python_prepare_all() { @@ -185,8 +190,11 @@ src_install() { newinitd "${FILESDIR}"/gpsd.init-2 gpsd # Cleanup bad alt copy due to Scons - rm -rf "${D}"/python-discard/gps* - find "${D}"/python-discard/ -type d -delete + if use python ; then + rm -rf "${ED}"/python-discard/gps* || die + find "${ED}"/python-discard/ -type d -delete || die + fi + # Install correct multi-python copy use python && distutils-r1_src_install } |