summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-geosciences
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-geosciences')
-rw-r--r--sci-geosciences/bt747/Manifest1
-rw-r--r--sci-geosciences/bt747/bt747-2.0.3.ebuild63
-rw-r--r--sci-geosciences/bt747/metadata.xml18
-rw-r--r--sci-geosciences/cdat-lite/Manifest1
-rw-r--r--sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild44
-rw-r--r--sci-geosciences/cdat-lite/files/cdat-lite-6.0_rc2-QA.patch132
-rw-r--r--sci-geosciences/cdat-lite/metadata.xml9
-rw-r--r--sci-geosciences/congen/Manifest2
-rw-r--r--sci-geosciences/congen/congen-1.6.1_p2.ebuild34
-rw-r--r--sci-geosciences/congen/congen-1.6.2.ebuild34
-rw-r--r--sci-geosciences/congen/metadata.xml9
-rw-r--r--sci-geosciences/foxtrotgps/Manifest2
-rw-r--r--sci-geosciences/foxtrotgps/foxtrotgps-1.1.0.ebuild30
-rw-r--r--sci-geosciences/foxtrotgps/foxtrotgps-1.1.1.ebuild30
-rw-r--r--sci-geosciences/foxtrotgps/metadata.xml8
-rw-r--r--sci-geosciences/gdal-grass/Manifest1
-rw-r--r--sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch11
-rw-r--r--sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild41
-rw-r--r--sci-geosciences/gdal-grass/metadata.xml6
-rw-r--r--sci-geosciences/gebabbel/Manifest1
-rw-r--r--sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch15
-rw-r--r--sci-geosciences/gebabbel/gebabbel-0.4.ebuild45
-rw-r--r--sci-geosciences/gebabbel/metadata.xml11
-rw-r--r--sci-geosciences/geocode-glib/Manifest2
-rw-r--r--sci-geosciences/geocode-glib/geocode-glib-3.14.0.ebuild47
-rw-r--r--sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild49
-rw-r--r--sci-geosciences/geocode-glib/metadata.xml9
-rw-r--r--sci-geosciences/gmapcatcher/Manifest1
-rw-r--r--sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch14
-rw-r--r--sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild32
-rw-r--r--sci-geosciences/gmapcatcher/metadata.xml16
-rw-r--r--sci-geosciences/gmt/Manifest13
-rw-r--r--sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch62
-rw-r--r--sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch56
-rw-r--r--sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch27
-rw-r--r--sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch16
-rw-r--r--sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch38
-rw-r--r--sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch19
-rw-r--r--sci-geosciences/gmt/gmt-4.5.6.ebuild96
-rw-r--r--sci-geosciences/gmt/gmt-4.5.8.ebuild92
-rw-r--r--sci-geosciences/gmt/gmt-4.5.9.ebuild93
-rw-r--r--sci-geosciences/gmt/metadata.xml14
-rw-r--r--sci-geosciences/gnome-maps/Manifest2
-rw-r--r--sci-geosciences/gnome-maps/gnome-maps-3.14.2.ebuild36
-rw-r--r--sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild38
-rw-r--r--sci-geosciences/gnome-maps/metadata.xml5
-rw-r--r--sci-geosciences/googleearth/Manifest2
-rw-r--r--sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch17
-rw-r--r--sci-geosciences/googleearth/files/googleearth-mimetypes.xml21
-rw-r--r--sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild171
-rw-r--r--sci-geosciences/googleearth/metadata.xml10
-rw-r--r--sci-geosciences/gpsbabel/Manifest3
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch12
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch12
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch110
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch47
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-fix_binary_name.patch12
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch11
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch76
-rw-r--r--sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch14
-rw-r--r--sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild99
-rw-r--r--sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild99
-rw-r--r--sci-geosciences/gpsbabel/metadata.xml5
-rw-r--r--sci-geosciences/gpscorrelate/Manifest1
-rw-r--r--sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch47
-rw-r--r--sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild50
-rw-r--r--sci-geosciences/gpscorrelate/metadata.xml8
-rw-r--r--sci-geosciences/gpsd/Manifest10
-rw-r--r--sci-geosciences/gpsd/files/2.95-disable-strip.patch10
-rw-r--r--sci-geosciences/gpsd/files/2.95-fix-ldflags.patch12
-rw-r--r--sci-geosciences/gpsd/files/2.96-fix-ldflags.patch21
-rw-r--r--sci-geosciences/gpsd/files/2.96-fix-tests.patch23
-rw-r--r--sci-geosciences/gpsd/files/2.96-pkgconfig.patch37
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch32
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch54
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch13
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch40
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch27
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.11-no-ntpshm.patch97
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch12
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.13-ntpshm.patch25
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch28
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch100
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch80
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch15
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.3-msocks-init.patch33
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch49
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch39
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.3-setup.py17
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch31
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch36
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.4-cfgetispeed.patch47
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.4-chrpath.patch69
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.4-gpsmon-lm.patch29
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch13
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.4-strptime.patch26
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.5-clock.patch42
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.6-debug.patch221
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.6-rpath.patch13
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch63
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch44
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch17
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch15
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.8-libgps.patch38
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch44
-rw-r--r--sci-geosciences/gpsd/files/gpsd-3.8-udev.patch38
-rw-r--r--sci-geosciences/gpsd/files/gpsd.conf-28
-rwxr-xr-xsci-geosciences/gpsd/files/gpsd.init-239
-rw-r--r--sci-geosciences/gpsd/gpsd-2.95-r1.ebuild108
-rw-r--r--sci-geosciences/gpsd/gpsd-2.96-r1.ebuild116
-rw-r--r--sci-geosciences/gpsd/gpsd-3.10.ebuild168
-rw-r--r--sci-geosciences/gpsd/gpsd-3.11.ebuild167
-rw-r--r--sci-geosciences/gpsd/gpsd-3.13.ebuild166
-rw-r--r--sci-geosciences/gpsd/gpsd-3.15.ebuild167
-rw-r--r--sci-geosciences/gpsd/gpsd-3.6.ebuild163
-rw-r--r--sci-geosciences/gpsd/gpsd-3.7.ebuild168
-rw-r--r--sci-geosciences/gpsd/gpsd-3.8.ebuild184
-rw-r--r--sci-geosciences/gpsd/gpsd-3.9-r1.ebuild187
-rw-r--r--sci-geosciences/gpsd/gpsd-3.9.ebuild180
-rw-r--r--sci-geosciences/gpsd/gpsd-9999.ebuild165
-rw-r--r--sci-geosciences/gpsd/metadata.xml17
-rw-r--r--sci-geosciences/gpx-viewer/Manifest1
-rw-r--r--sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport24
-rw-r--r--sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild54
-rw-r--r--sci-geosciences/gpx-viewer/metadata.xml8
-rw-r--r--sci-geosciences/gpxpy/Manifest1
-rw-r--r--sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild27
-rw-r--r--sci-geosciences/gpxpy/metadata.xml11
-rw-r--r--sci-geosciences/grass/Manifest1
-rw-r--r--sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch33
-rw-r--r--sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch60
-rw-r--r--sci-geosciences/grass/files/grass-6.4.1-libpng15.patch28
-rw-r--r--sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch12
-rw-r--r--sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch13
-rw-r--r--sci-geosciences/grass/files/grass-6.4.2-configure.patch26
-rw-r--r--sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch79
-rw-r--r--sci-geosciences/grass/files/grass-6.4.2-libav-9.patch11
-rw-r--r--sci-geosciences/grass/files/grass-pkgconf.patch22
-rw-r--r--sci-geosciences/grass/grass-6.4.2.ebuild327
-rw-r--r--sci-geosciences/grass/metadata.xml11
-rw-r--r--sci-geosciences/gshhs-data/Manifest1
-rw-r--r--sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild25
-rw-r--r--sci-geosciences/gshhs-data/metadata.xml14
-rw-r--r--sci-geosciences/gshhs/Manifest1
-rw-r--r--sci-geosciences/gshhs/gshhs-1.13.ebuild42
-rw-r--r--sci-geosciences/gshhs/metadata.xml14
-rw-r--r--sci-geosciences/gtk-g-rays2/Manifest2
-rw-r--r--sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild44
-rw-r--r--sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild45
-rw-r--r--sci-geosciences/gtk-g-rays2/metadata.xml8
-rw-r--r--sci-geosciences/harmonics-dwf-free-noncomm/Manifest1
-rw-r--r--sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild24
-rw-r--r--sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml8
-rw-r--r--sci-geosciences/harmonics-dwf-free/Manifest2
-rw-r--r--sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20121224.ebuild22
-rw-r--r--sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild23
-rw-r--r--sci-geosciences/harmonics-dwf-free/metadata.xml8
-rw-r--r--sci-geosciences/josm-plugins/Manifest1
-rw-r--r--sci-geosciences/josm-plugins/josm-plugins-20101206.ebuild24
-rw-r--r--sci-geosciences/josm-plugins/metadata.xml8
-rw-r--r--sci-geosciences/josm/Manifest4
-rw-r--r--sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch34
-rw-r--r--sci-geosciences/josm/josm-5485.ebuild58
-rw-r--r--sci-geosciences/josm/josm-5608.ebuild53
-rw-r--r--sci-geosciences/josm/josm-6060.ebuild53
-rw-r--r--sci-geosciences/josm/josm-7347.ebuild74
-rw-r--r--sci-geosciences/josm/josm-9999.ebuild53
-rw-r--r--sci-geosciences/josm/metadata.xml8
-rw-r--r--sci-geosciences/libtcd/Manifest2
-rw-r--r--sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild33
-rw-r--r--sci-geosciences/libtcd/libtcd-2.2.6.ebuild33
-rw-r--r--sci-geosciences/libtcd/metadata.xml8
-rw-r--r--sci-geosciences/mapnik-world-boundaries/Manifest2
-rw-r--r--sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild28
-rw-r--r--sci-geosciences/mapnik-world-boundaries/metadata.xml8
-rw-r--r--sci-geosciences/mapnik/Manifest4
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch24
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch21
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch12
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch56
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch20
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch11
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch12
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch15
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch20
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch11
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch16
-rw-r--r--sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch11
-rw-r--r--sci-geosciences/mapnik/mapnik-2.0.1.ebuild136
-rw-r--r--sci-geosciences/mapnik/mapnik-2.0.2.ebuild136
-rw-r--r--sci-geosciences/mapnik/mapnik-2.1.0.ebuild136
-rw-r--r--sci-geosciences/mapnik/mapnik-2.2.0.ebuild131
-rw-r--r--sci-geosciences/mapnik/metadata.xml13
-rw-r--r--sci-geosciences/mapserver/Manifest1
-rw-r--r--sci-geosciences/mapserver/files/5.4.2-ldflags.patch90
-rw-r--r--sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch23
-rw-r--r--sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch89
-rw-r--r--sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch15
-rw-r--r--sci-geosciences/mapserver/files/6.1.0-php-5.4.patch69
-rw-r--r--sci-geosciences/mapserver/files/mapserver_tcl.patch-r144
-rw-r--r--sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild234
-rw-r--r--sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild221
-rw-r--r--sci-geosciences/mapserver/metadata.xml12
-rw-r--r--sci-geosciences/mc2bsbh/Manifest1
-rw-r--r--sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild29
-rw-r--r--sci-geosciences/mc2bsbh/metadata.xml7
-rw-r--r--sci-geosciences/merkaartor/Manifest3
-rw-r--r--sci-geosciences/merkaartor/files/0.17.2-includes.patch11
-rw-r--r--sci-geosciences/merkaartor/files/0.17.2-libproxy.patch12
-rw-r--r--sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch43
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild69
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild87
-rw-r--r--sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild69
-rw-r--r--sci-geosciences/merkaartor/merkaartor-9999.ebuild92
-rw-r--r--sci-geosciences/merkaartor/metadata.xml16
-rw-r--r--sci-geosciences/metadata.xml36
-rw-r--r--sci-geosciences/mkgmap/Manifest1
-rw-r--r--sci-geosciences/mkgmap/metadata.xml8
-rw-r--r--sci-geosciences/mkgmap/mkgmap-1995.ebuild34
-rw-r--r--sci-geosciences/mtkbabel/Manifest2
-rw-r--r--sci-geosciences/mtkbabel/metadata.xml12
-rw-r--r--sci-geosciences/mtkbabel/mtkbabel-0.8.2.ebuild26
-rw-r--r--sci-geosciences/mtkbabel/mtkbabel-0.8.3.1.ebuild28
-rw-r--r--sci-geosciences/opencpn-plugin-br24radar/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-br24radar/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1.ebuild30
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/Manifest2
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/metadata.xml13
-rw-r--r--sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.ebuild36
-rw-r--r--sci-geosciences/opencpn-plugin-launcher/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-launcher/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0.ebuild27
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2012.ebuild27
-rw-r--r--sci-geosciences/opencpn-plugin-objsearch/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-objsearch/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1.ebuild27
-rw-r--r--sci-geosciences/opencpn-plugin-ocpndebugger/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0.ebuild27
-rw-r--r--sci-geosciences/opencpn-plugin-statusbar/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-statusbar/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.ebuild29
-rw-r--r--sci-geosciences/opencpn-plugin-weather_routing/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-weather_routing/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.2.ebuild29
-rw-r--r--sci-geosciences/opencpn-plugin-weatherfax/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-weatherfax/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.ebuild29
-rw-r--r--sci-geosciences/opencpn-plugin-wmm/Manifest1
-rw-r--r--sci-geosciences/opencpn-plugin-wmm/metadata.xml12
-rw-r--r--sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0.ebuild27
-rw-r--r--sci-geosciences/opencpn/Manifest4
-rw-r--r--sci-geosciences/opencpn/files/opencpn-3.0.2-multilib-strict.patch12
-rw-r--r--sci-geosciences/opencpn/metadata.xml12
-rw-r--r--sci-geosciences/opencpn/opencpn-3.0.2.ebuild67
-rw-r--r--sci-geosciences/opencpn/opencpn-3.2.2.ebuild43
-rw-r--r--sci-geosciences/opencpn/opencpn-4.0.0.ebuild67
-rw-r--r--sci-geosciences/osgearth/Manifest1
-rw-r--r--sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch30
-rw-r--r--sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch13
-rw-r--r--sci-geosciences/osgearth/metadata.xml20
-rw-r--r--sci-geosciences/osgearth/osgearth-2.6.ebuild71
-rw-r--r--sci-geosciences/osm-gps-map/Manifest2
-rwxr-xr-xsci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch12
-rwxr-xr-xsci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch12
-rw-r--r--sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch10
-rw-r--r--sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch15
-rw-r--r--sci-geosciences/osm-gps-map/metadata.xml11
-rw-r--r--sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild81
-rw-r--r--sci-geosciences/osm2mp/Manifest1
-rw-r--r--sci-geosciences/osm2mp/metadata.xml8
-rw-r--r--sci-geosciences/osm2mp/osm2mp-0.80.ebuild36
-rw-r--r--sci-geosciences/osm2pgsql/Manifest4
-rw-r--r--sci-geosciences/osm2pgsql/metadata.xml16
-rw-r--r--sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild32
-rw-r--r--sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild32
-rw-r--r--sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild36
-rw-r--r--sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild36
-rw-r--r--sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild32
-rw-r--r--sci-geosciences/osmosis/Manifest1
-rw-r--r--sci-geosciences/osmosis/metadata.xml8
-rw-r--r--sci-geosciences/osmosis/osmosis-0.35.1.ebuild31
-rw-r--r--sci-geosciences/qgis/Manifest3
-rw-r--r--sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch53
-rw-r--r--sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch54
-rw-r--r--sci-geosciences/qgis/metadata.xml18
-rw-r--r--sci-geosciences/qgis/qgis-1.7.0.ebuild100
-rw-r--r--sci-geosciences/qgis/qgis-1.8.0.ebuild116
-rw-r--r--sci-geosciences/qlandkartegt-garmindev/Manifest1
-rw-r--r--sci-geosciences/qlandkartegt-garmindev/metadata.xml11
-rw-r--r--sci-geosciences/qlandkartegt-garmindev/qlandkartegt-garmindev-0.3.4.ebuild26
-rw-r--r--sci-geosciences/qlandkartegt/Manifest4
-rw-r--r--sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch32
-rw-r--r--sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch12
-rw-r--r--sci-geosciences/qlandkartegt/metadata.xml15
-rw-r--r--sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild60
-rw-r--r--sci-geosciences/qlandkartegt/qlandkartegt-1.7.7.ebuild61
-rw-r--r--sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild80
-rw-r--r--sci-geosciences/qlandkartegt/qlandkartegt-1.8.1.ebuild80
-rw-r--r--sci-geosciences/readosm/Manifest1
-rw-r--r--sci-geosciences/readosm/metadata.xml5
-rw-r--r--sci-geosciences/readosm/readosm-1.0.0.ebuild30
-rw-r--r--sci-geosciences/seawater/Manifest2
-rw-r--r--sci-geosciences/seawater/metadata.xml10
-rw-r--r--sci-geosciences/seawater/seawater-2.0.1.ebuild22
-rw-r--r--sci-geosciences/seawater/seawater-3.3.2.ebuild30
-rw-r--r--sci-geosciences/swmm/Manifest1
-rw-r--r--sci-geosciences/swmm/files/swmm-5.0.022-QA.patch14
-rw-r--r--sci-geosciences/swmm/metadata.xml8
-rw-r--r--sci-geosciences/swmm/swmm-5.0.022.ebuild53
-rw-r--r--sci-geosciences/tappy/Manifest1
-rw-r--r--sci-geosciences/tappy/metadata.xml10
-rw-r--r--sci-geosciences/tappy/tappy-0.9.0.ebuild23
-rw-r--r--sci-geosciences/tcd-utils/Manifest1
-rw-r--r--sci-geosciences/tcd-utils/metadata.xml8
-rw-r--r--sci-geosciences/tcd-utils/tcd-utils-20120115.ebuild17
-rw-r--r--sci-geosciences/tilecache/Manifest1
-rw-r--r--sci-geosciences/tilecache/files/tilecache-2.11-pil.patch21
-rw-r--r--sci-geosciences/tilecache/metadata.xml5
-rw-r--r--sci-geosciences/tilecache/tilecache-2.11-r1.ebuild33
-rw-r--r--sci-geosciences/viking/Manifest2
-rw-r--r--sci-geosciences/viking/files/1.3-autoreconf.patch12
-rw-r--r--sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch53
-rw-r--r--sci-geosciences/viking/metadata.xml25
-rw-r--r--sci-geosciences/viking/viking-1.6-r2.ebuild75
-rw-r--r--sci-geosciences/xtide/Manifest2
-rw-r--r--sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch21
-rw-r--r--sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch88
-rw-r--r--sci-geosciences/xtide/metadata.xml11
-rw-r--r--sci-geosciences/xtide/xtide-2.13.1.ebuild62
-rw-r--r--sci-geosciences/xtide/xtide-2.13.ebuild49
333 files changed, 11999 insertions, 0 deletions
diff --git a/sci-geosciences/bt747/Manifest b/sci-geosciences/bt747/Manifest
new file mode 100644
index 00000000000..d09cb2f9106
--- /dev/null
+++ b/sci-geosciences/bt747/Manifest
@@ -0,0 +1 @@
+DIST BT747_2.0.3_full.zip 10678027 SHA256 592544312e4d31826c419c051dd56b242faec7f0ca13e9da370140e123d29bb0
diff --git a/sci-geosciences/bt747/bt747-2.0.3.ebuild b/sci-geosciences/bt747/bt747-2.0.3.ebuild
new file mode 100644
index 00000000000..35a6302a423
--- /dev/null
+++ b/sci-geosciences/bt747/bt747-2.0.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit java-utils-2 java-pkg-2 java-ant-2
+
+MY_PN=BT747
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="MTK GPS Datalogger Device Control"
+HOMEPAGE="http://bt747.free.fr/"
+SRC_URI="mirror://sourceforge/${PN}/BT747_${PV}_full.zip"
+
+LICENSE="GPL-3"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="
+ >=dev-java/rxtx-2.2_pre2
+ dev-java/swing-layout:1
+ dev-java/jcalendar:1.2
+ dev-java/jcharts
+"
+RDEPEND="${COMMON_DEP}
+ dev-libs/glib:2[dbus]
+ >=virtual/jre-1.5
+"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ app-arch/unzip
+"
+
+EANT_BUILD_TARGET="dist.j2se"
+EANT_EXTRA_ARGS="-Dskip.proguard=yes
+ -Drxtxcomm.jar=lib/RXTXcomm.jar
+ -Dswing-layout.jar=lib/swing-layout.jar
+ -Djcalendar.jar=lib/jcalendar.jar"
+
+S="${WORKDIR}"
+
+java_prepare() {
+ rm -rf dist
+ cd lib
+ rm -rf r* W* c* swing-* w* jca*
+ java-pkg_jar-from rxtx-2
+ java-pkg_jar-from swing-layout-1
+ java-pkg_jar-from jcalendar-1.2
+}
+
+src_install() {
+ dodoc ChangeLog.txt README.txt
+ java-pkg_dojar dist/*.jar
+ java-pkg_jarinto /opt/${PN}-${SLOT}/lib
+ java-pkg_newjar lib/jopt-simple-2.4.1.jar jopt-simple.jar
+ java-pkg_dojar lib/swingx*.jar
+ java-pkg_dolauncher ${PN} --main bt747.j2se_view.BT747Main \
+ --java-args="-Xmx192m"
+}
diff --git a/sci-geosciences/bt747/metadata.xml b/sci-geosciences/bt747/metadata.xml
new file mode 100644
index 00000000000..3bb1317da08
--- /dev/null
+++ b/sci-geosciences/bt747/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <longdescription lang="en">
+BT747 is software that can:
+ * Download recorded position data from GPS Data Loggers based on the MTK chipset.
+ * Convert GPS position data in many formats (HTML, GPX, KML, KMZ, ...)
+ * Geotag JPG pictures and position any other filetype on the map (voice, documents, ...)
+ * Runs on Handheld Devices (Palm, WinCE, Mobile Phones supporting Java (J2ME))
+ * Runs on Desktops (Windows, MacOSX, Linux flavors)
+ * Configure MTK Chipset Based Devices and Loggers
+ * Upload AGPS(EPO) data to MTK II Chipset Based Devices and Loggers
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">bt747</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/cdat-lite/Manifest b/sci-geosciences/cdat-lite/Manifest
new file mode 100644
index 00000000000..9de625d4076
--- /dev/null
+++ b/sci-geosciences/cdat-lite/Manifest
@@ -0,0 +1 @@
+DIST cdat_lite-6.0rc2.tar.gz 3563402 SHA256 6cbfdf9b47fdbc189ca7d2819dafb6cf958116e0f6077b325c375a0ddfab2a95 SHA512 bf6bc00305d29adbb2608865a56e2fe36dde56f4d7a0e63266549ce5e74120be602ac16c3e1c02bc9216e7c613ad92697f6a61a4b02158e1bf46e178d841a90f WHIRLPOOL 9cbb784402713231c89b37eb69969ed1431848d38973eb1d3682c260509ae892c35c97a96f386713e9ff30e0d51fbe9197073aa92533b92f799b2331db61d41f
diff --git a/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
new file mode 100644
index 00000000000..ac330e0dea6
--- /dev/null
+++ b/sci-geosciences/cdat-lite/cdat-lite-6.0_rc2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk,xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit eutils distutils-r1 toolchain-funcs
+
+MY_P=${P/-/_}
+MY_P=${MY_P/_rc/rc}
+
+DESCRIPTION="Large suite of open source tools for the management and analysis of climate data"
+HOMEPAGE="http://proj.badc.rl.ac.uk/cedaservices/wiki/CdatLite"
+SRC_URI="http://ndg.nerc.ac.uk/dist/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=sci-libs/netcdf-4.0.1
+ >=sci-libs/hdf5-1.6.4
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/wxpython:2.8[${PYTHON_USEDEP}]
+ virtual/pmw[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${COMMON_DEPEND}
+ !sci-biology/ncbi-tools"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ tc-export CC FC RANLIB AR
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-QA.patch
+ find "${S}" -type l -delete || die
+ distutils-r1_src_prepare
+}
diff --git a/sci-geosciences/cdat-lite/files/cdat-lite-6.0_rc2-QA.patch b/sci-geosciences/cdat-lite/files/cdat-lite-6.0_rc2-QA.patch
new file mode 100644
index 00000000000..a00206ea739
--- /dev/null
+++ b/sci-geosciences/cdat-lite/files/cdat-lite-6.0_rc2-QA.patch
@@ -0,0 +1,132 @@
+--- cdat_lite-6.0rc2/libcdms/Makefile.in
++++ cdat_lite-6.0rc2/libcdms/Makefile.in
+@@ -44,15 +44,15 @@
+ PARMDIR=$(prefix)/lib/lats
+
+ CC = @CC@
+-CFLAGS = -I../../include @CFLAGS@ $(DEBUG) -Dgrads @GRIB2INC@ @GRIB2OPTS@
++CFLAGS = -fPIC -I../../include @CFLAGS@ -Dgrads @GRIB2INC@ @GRIB2OPTS@
+ CPPFLAGS = @CPPFLAGS@
+ DEBUG = -O
+ DEFS = @DEFS@
+ FC = @FC@
+-FFLAGS = -I../../include @FFLAGS@ $(DEBUG)
++FFLAGS = -I../../include @FFLAGS@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-LDFLAGS = -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ @GRIB2LIB@
++LDFLAGS += -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ @GRIB2LIB@
+ OS = @OS@
+ RANLIB = @RANLIB@
+
+--- cdat_lite-6.0rc2/libcdms/src/db_util/Makefile.in
++++ cdat_lite-6.0rc2/libcdms/src/db_util/Makefile.in
+@@ -38,17 +38,18 @@
+ PARMDIR=$(prefix)/lib/lats
+
+ CC = @CC@
+-CFLAGS = -I../../include @CFLAGS@ $(DEBUG) -Dgrads
++CFLAGS = -fPIC -I../../include @CFLAGS@ -Dgrads
+ CPPFLAGS = @CPPFLAGS@
+ DEBUG = -O
+ DEFS = @DEFS@
+ FC = @FC@
+-FFLAGS = -I../../include @FFLAGS@ $(DEBUG)
++FFLAGS = -I../../include @FFLAGS@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-LDFLAGS = -L../../../lib -lcdms @NCOPTS@ @DRSOPTS@ @LIBS@
++LDFLAGS += -L../../../lib -lcdms @NCOPTS@ @DRSOPTS@ @LIBS@
+ OS = @OS@
+ RANLIB = @RANLIB@
++AR ?= ar
+
+ # Shell to run make subcommands
+ SHELL = /bin/sh
+@@ -60,7 +61,7 @@
+ cdUtil.o
+
+ all: $(OBJS) FORCE
+- ar rv $(LIBRARY) $(OBJS)
++ $(AR) rv $(LIBRARY) $(OBJS)
+ $(RANLIB) $(LIBRARY)
+
+ cdTimeConv.o: cdTimeConv.c ../../include/cdmsint.h ../../include/cdms.h ../../include/cdunif.h
+--- cdat_lite-6.0rc2/libcdms/src/cdunif/Makefile.in
++++ cdat_lite-6.0rc2/libcdms/src/cdunif/Makefile.in
+@@ -47,29 +47,29 @@
+ PARMDIR=$(prefix)/lib/lats
+
+ # Set the compiler flag for the 64-bit Opteron platform
++CC = @CC@
+ ARCH=$(shell uname -m)
+ ifeq ($(ARCH),x86_64)
+- CC = gcc -fPIC -D__x86_64__
+-else
+- CC = @CC@
++ CC += -fPIC -D__x86_64__
+ endif
+
+ ifneq (@GRIB2INC@,)
+- CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ $(DEBUG) -Dgrads -I@GRIB2INC@ @GRIB2OPTS@
++ CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ -Dgrads -I@GRIB2INC@ @GRIB2OPTS@
+ else
+- CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ $(DEBUG) -Dgrads
++ CFLAGS = -I../../include -I"@NCINC@" -I@HDFINC@ -I@DRSINC@ @CFLAGS@ -Dgrads
+ endif
+
+-CPPFLAGS = @CPPFLAGS@ -DSTNDALN=1 -DBYTEORDER=@GRADS_BYTEORDER@ -DGRADS_CRAY=@GRADS_CRAY@ @QLOPTS@ @PPOPTS@ @GRIB2OPTS@
++CPPFLAGS += @CPPFLAGS@ -DSTNDALN=1 -DBYTEORDER=@GRADS_BYTEORDER@ -DGRADS_CRAY=@GRADS_CRAY@ @QLOPTS@ @PPOPTS@ @GRIB2OPTS@
+ DEBUG = -O
+ DEFS = @DEFS@
+ FC = @FC@
+-FFLAGS = -I../../include @FFLAGS@ $(DEBUG)
++FFLAGS = -I../../include @FFLAGS@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+-LDFLAGS = -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ @GRIB2LIB@
++LDFLAGS += -L../../../lib -lcdms @NCOPTS@ @HDFOPTS@ @DRSOPTS@ @LIBS@ @GRIB2LIB@
+ OS = @OS@
+ RANLIB = @RANLIB@
++AR ?= ar
+
+ # Shell to run make subcommands
+ SHELL = /bin/sh
+@@ -80,7 +80,7 @@
+ OBJS = cdunif.o cdunifint.o cdunifgen.o cdunifdrs.o cdunifgrads.o cdunifnc.o cdunifhdf.o cdunifslab.o cdunifstub.o cdunifra.o cdrra.o cdsort.o gamach.o gaio.o gaprnt.o gautil.o gaddes.o galloc.o gabufr.o gabufrtbl.o cdunifql.o @GRADS_IEEE2CRAY_OBJECT@
+
+ all: $(OBJS) FORCE
+- ar rv $(LIBRARY) $(OBJS)
++ $(AR) rv $(LIBRARY) $(OBJS)
+ cd cdunifpp; $(MAKE) DEBUG=$(DEBUG)
+ $(RANLIB) $(LIBRARY)
+
+--- cdat_lite-6.0rc2/libcdms/src/cdunif/cdunifpp/Makefile.in
++++ cdat_lite-6.0rc2/libcdms/src/cdunif/cdunifpp/Makefile.in
+@@ -37,12 +37,13 @@
+ # set to blank if you don't want to rename symbols in unpacking routines
+
+ CC = @CC@
+-CFLAGS = -I../../../include/cdunifpp -I@NCINC@ @CFLAGS@ -I../../../include $(DEBUG)
++CFLAGS = -fPIC -I../../../include/cdunifpp -I@NCINC@ @CFLAGS@ -I../../../include
+ CPPFLAGS = @CPPFLAGS@ @PPOPTS@ -Uhdf
+ LIBRARY = ../../../lib/libcdms.a
++AR ?= ar
+
+ all: $(OBJS)
+- ar rv $(LIBRARY) $(OBJS)
++ $(AR) rv $(LIBRARY) $(OBJS)
+ # (ranlib called by higher-level makefile)
+
+ %.o: %.c $(HEADERS)
+--- cdat_lite-6.0rc2/setup_util.py
++++ cdat_lite-6.0rc2/setup_util.py
+@@ -296,8 +296,6 @@
+ nc4_defs = ''
+
+ self._system('cd libcdms ; '
+- 'CFLAGS="-fPIC" '
+- 'CC=%(cc)s '
+ 'sh ./configure --disable-drs --disable-hdf '
+ '--disable-ql --with-ncinc=%(ncinc)s --with-ncincf=%(ncinc)s --with-nclib=%(nclib)s %(nc4)s'
+ % dict(ncinc=netcdf_config.netcdf_incdir, nclib=netcdf_config.netcdf_libdir,
diff --git a/sci-geosciences/cdat-lite/metadata.xml b/sci-geosciences/cdat-lite/metadata.xml
new file mode 100644
index 00000000000..0744b87d36b
--- /dev/null
+++ b/sci-geosciences/cdat-lite/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>hasufell@gentoo.org</email>
+ <name>Julian Ospald</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/sci-geosciences/congen/Manifest b/sci-geosciences/congen/Manifest
new file mode 100644
index 00000000000..03b5e5f24ca
--- /dev/null
+++ b/sci-geosciences/congen/Manifest
@@ -0,0 +1,2 @@
+DIST congen-1.6.1-r2.tar.bz2 287890 SHA256 2cdd41fc42e61603f25f34ded65f7823d9a0dda6454b791aa73d13ccd98f4058 SHA512 367f199e195e238cf5fc7349c2c0d912a4f9d2f2023b3106eb933e3799dc4624f0fd0c6fb27125c504ca22d3a723228a1d3e647e254cb1465fc6af48a2372dd6 WHIRLPOOL 48f31c041a1bc6d0088e229bcd32962507dda5e42452d8a60cb2572f0a9d7b7cf3e24c962cb6c70e85a1f0cf50c89df7f3e1baea24ec23d82b6d8484efd94403
+DIST congen-1.6.2.tar.bz2 293130 SHA256 8a8a458a2e797feb78183aa84656aad8064b8a40f0c0bb7a4d813d7d25e1f83c SHA512 21cabdf0fba8cfa8e72068db44e6db0288ce932f81f526f04421272550244de9c617dc12d2c162186cbb9f70d9a44aca48b6f132317fc2fa3c47860d2f58bad6 WHIRLPOOL d51588d177b32ad145c4594a8e8cf65814207f476708a6f5b26fefc77e994b19a9c44a3b18aa545bd735d130d096232df2488e38eb08f99b67846a66a77320db
diff --git a/sci-geosciences/congen/congen-1.6.1_p2.ebuild b/sci-geosciences/congen/congen-1.6.1_p2.ebuild
new file mode 100644
index 00000000000..b6a2efcb9cf
--- /dev/null
+++ b/sci-geosciences/congen/congen-1.6.1_p2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P=${P/_p/-r}
+DESCRIPTION="A package for generating the speeds, equilibrium arguments, and node factors of tidal constituents"
+HOMEPAGE="http://www.flaterco.com/xtide/files.html"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND=">=sci-geosciences/libtcd-2.2.3"
+RDEPEND="${DEPEND}"
+
+MAKEOPTS+=" -j1"
+
+S=${WORKDIR}/${P%_p*}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || prune_libtool_files
+}
diff --git a/sci-geosciences/congen/congen-1.6.2.ebuild b/sci-geosciences/congen/congen-1.6.2.ebuild
new file mode 100644
index 00000000000..9596a0aeec2
--- /dev/null
+++ b/sci-geosciences/congen/congen-1.6.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P=${P/_p/-r}
+DESCRIPTION="A package for generating the speeds, equilibrium arguments, and node factors of tidal constituents"
+HOMEPAGE="http://www.flaterco.com/xtide/files.html"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+DEPEND=">=sci-geosciences/libtcd-2.2.3"
+RDEPEND="${DEPEND}"
+
+MAKEOPTS+=" -j1"
+
+S=${WORKDIR}/${P%_p*}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || prune_libtool_files
+}
diff --git a/sci-geosciences/congen/metadata.xml b/sci-geosciences/congen/metadata.xml
new file mode 100644
index 00000000000..0744b87d36b
--- /dev/null
+++ b/sci-geosciences/congen/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>hasufell@gentoo.org</email>
+ <name>Julian Ospald</name>
+</maintainer>
+</pkgmetadata>
+
diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
new file mode 100644
index 00000000000..9b9bb53991b
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -0,0 +1,2 @@
+DIST foxtrotgps-1.1.0.tar.xz 375532 SHA256 275d4eb21ada3158f320cfebe8d575a3050bc73e0261a6602500050b36f9232a
+DIST foxtrotgps-1.1.1.tar.xz 378972 SHA256 47a7ccba610ccce7ecb4db67919871feda097e676a70403b9cca89259c41a581 SHA512 d8a46074701dfb6a662afa5693b5b7e1c07184ada21469ff872ef2a5afe8b439cd03b5eeb276474d9dd816ca2aa9441e21f5b64a97bb80a3a22ecc2c7a98549b WHIRLPOOL bc87a78b6f15d9490dc0b129ae4727a62bc16cd0f1febd38f4654d3eab04754970179ba91fc711ea9830fa560329d22285ba8138a3da7159bed63b79036893cc
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.1.0.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.1.0.ebuild
new file mode 100644
index 00000000000..ad3acbcc855
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit gnome2
+
+DESCRIPTION="Easy to use, fast and lightweight mapping application (fork of tangogps)"
+HOMEPAGE="http://www.foxtrotgps.org/"
+SRC_URI="http://www.foxtrotgps.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libxml2:2
+ gnome-base/gconf:2
+ gnome-base/libglade
+ media-libs/libexif
+ net-misc/curl
+ >=sci-geosciences/gpsd-2.90
+ sys-apps/dbus
+ x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
diff --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.1.1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.1.1.ebuild
new file mode 100644
index 00000000000..c52b04b1d2c
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit gnome2
+
+DESCRIPTION="Easy to use, fast and lightweight mapping application (fork of tangogps)"
+HOMEPAGE="http://www.foxtrotgps.org/"
+SRC_URI="http://www.foxtrotgps.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libxml2:2
+ gnome-base/gconf:2
+ gnome-base/libglade
+ media-libs/libexif
+ net-misc/curl
+ >=sci-geosciences/gpsd-2.90
+ sys-apps/dbus
+ x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
diff --git a/sci-geosciences/foxtrotgps/metadata.xml b/sci-geosciences/foxtrotgps/metadata.xml
new file mode 100644
index 00000000000..15f410f0302
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <longdescription lang="en">
+FoxtrotGPS is an offshoot of Marcus Bauer's excellent Free &amp; Open Source tangoGPS application, with a focus on cooperation and fostering community innovation. FoxtrotGPS is freely available to the public for use, redistribution, and modification under the terms of the GNU General Public License 2.0 (GPLv2).
+</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/gdal-grass/Manifest b/sci-geosciences/gdal-grass/Manifest
new file mode 100644
index 00000000000..a33bc6aef44
--- /dev/null
+++ b/sci-geosciences/gdal-grass/Manifest
@@ -0,0 +1 @@
+DIST gdal-grass-1.4.3.tar.gz 47527 RMD160 60e3866a44d595cbf41368adb1b968387c7852b4 SHA1 63b87ad1688cc365dc6bd6c3ccc854d0e6aa637a SHA256 ea18d1e773e8875aaf3261a6ccd2a5fa22d998f064196399dfe73d991688f1dd
diff --git a/sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch b/sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch
new file mode 100644
index 00000000000..dcf5bc40065
--- /dev/null
+++ b/sci-geosciences/gdal-grass/files/gdal-grass-makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2009-07-12 00:09:33.000000000 +0200
++++ Makefile.in 2009-07-12 00:11:09.000000000 +0200
+@@ -26,7 +26,7 @@
+ install -d $(AUTOLOAD_DIR)
+ cp $(GLIBNAME) $(AUTOLOAD_DIR)
+ cp $(OLIBNAME) $(AUTOLOAD_DIR)
+- test -d ${GRASSTABLES_DIR} || mkdir ${GRASSTABLES_DIR}
++ test -d ${GRASSTABLES_DIR} || mkdir -p ${GRASSTABLES_DIR}
+ test -d ${GRASSTABLES_DIR}/etc || mkdir ${GRASSTABLES_DIR}/etc
+ cp @GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc
+ cp @GRASS_GISBASE@/etc/datum.table @GRASS_GISBASE@/etc/datumtransform.table ${GRASSTABLES_DIR}/etc
diff --git a/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild b/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild
new file mode 100644
index 00000000000..c739c40629d
--- /dev/null
+++ b/sci-geosciences/gdal-grass/gdal-grass-1.4.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="GDAL plugin to access GRASS data"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+IUSE=""
+
+RDEPEND="
+ sci-libs/gdal
+ >=sci-geosciences/grass-6.4.0_rc6
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-makefile.patch"
+}
+
+src_configure() {
+ econf \
+ --with-grass=$(pkg-config grass --variable grassdir) \
+ --with-gdal
+}
+
+src_install() {
+ #pass the right variables to 'make install' to prevent a sandbox access violation
+ emake DESTDIR="${D}" \
+ GRASSTABLES_DIR="${D}$(gdal-config --prefix)/share/gdal/grass" \
+ AUTOLOAD_DIR="${D}/usr/$(get_libdir)/gdalplugins" \
+ install
+}
diff --git a/sci-geosciences/gdal-grass/metadata.xml b/sci-geosciences/gdal-grass/metadata.xml
new file mode 100644
index 00000000000..0fcb66048e4
--- /dev/null
+++ b/sci-geosciences/gdal-grass/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+</pkgmetadata>
+
diff --git a/sci-geosciences/gebabbel/Manifest b/sci-geosciences/gebabbel/Manifest
new file mode 100644
index 00000000000..1103ea3bce6
--- /dev/null
+++ b/sci-geosciences/gebabbel/Manifest
@@ -0,0 +1 @@
+DIST Gebabbel-0.4-Src.tar.gz 9698769 SHA256 dcf3543412525959eaad755673fa65412077735fec400e6e62b1bd2c94ec1adf SHA512 96750cf1d3e627b8071d1693c7b31a2fb056f533c6e9de09e4de3550d7a923388c6b8f9634695d19708fd509ec9da537a0b1d477554d7249204754b55dd684f2 WHIRLPOOL 9592f32467505ae4bdd7858750648aa6c798768b94d95fcc97439de5e297ec366d8098010a7085de6babd08d24880ab8c4d28844fcd9a908f89d0f83784b6d17
diff --git a/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
new file mode 100644
index 00000000000..e8064e366c9
--- /dev/null
+++ b/sci-geosciences/gebabbel/files/gebabbel-0.3-gcc45.patch
@@ -0,0 +1,15 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318579
+
+--- src/MyMainWindow.cpp
++++ src/MyMainWindow.cpp
+@@ -219,7 +219,7 @@
+
+ // Creating the toolbar
+ MainToolBar = addToolBar( tr( "Main Toolbar" ) );
+- MainToolBar->setIconSize( QSize::QSize( 16, 16 ) );
++ MainToolBar->setIconSize( QSize( 16, 16 ) );
+ MainToolBar->setAllowedAreas( Qt::TopToolBarArea );
+ MainToolBar->setMovable( false );
+
diff --git a/sci-geosciences/gebabbel/gebabbel-0.4.ebuild b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
new file mode 100644
index 00000000000..a0b0fe97a5e
--- /dev/null
+++ b/sci-geosciences/gebabbel/gebabbel-0.4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P=${P/g/G}
+
+inherit eutils qt4-r2
+
+DESCRIPTION="QT-Frontend to load and convert gps tracks with gpsbabel"
+HOMEPAGE="http://gebabbel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}-Src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4[accessibility]
+"
+RDEPEND="${DEPEND}
+ sci-geosciences/gpsbabel
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3-gcc45.patch
+)
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ qt4-r2_src_prepare
+ # do not mess with cflags
+ sed \
+ -e "/QMAKE_CXXFLAGS/s:=.*$:= ${CXXFLAGS}:g" \
+ -i *.pro || die
+}
+
+src_install() {
+ dobin bin/${PN}
+ dodoc CHANGELOG CREDITS
+}
diff --git a/sci-geosciences/gebabbel/metadata.xml b/sci-geosciences/gebabbel/metadata.xml
new file mode 100644
index 00000000000..97fe68c15d2
--- /dev/null
+++ b/sci-geosciences/gebabbel/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">gebabbel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/geocode-glib/Manifest b/sci-geosciences/geocode-glib/Manifest
new file mode 100644
index 00000000000..503ec2d35e3
--- /dev/null
+++ b/sci-geosciences/geocode-glib/Manifest
@@ -0,0 +1,2 @@
+DIST geocode-glib-3.14.0.tar.xz 352308 SHA256 a19b21a92b8cbfa29a5ae6616c2fdca8567e97480f7bb5c955905f6ae1c72010 SHA512 39cce731930b21ea351e3c032757bdec0b97ac014ae4b04997b70cfa64438bec980964cbbaa32e2bfb4c5524b9799261475594d07208c87c692b33c0cd531aa4 WHIRLPOOL 00b7f6bccd9c96ef19c1cfd66eb7f6045763a79543d042e02fbb49c2c4a506afaf3d86e961bf5cd2591012fb0df8b246694fb2a47a8a759761153dbc707da19d
+DIST geocode-glib-3.16.2.tar.xz 355424 SHA256 a551ffdbd793d54a14e709c9d02e82dde3abc14eed8065abad92275a43fe2c97 SHA512 847dc7069beafd61eb3a6f1c1ca86f2ede14ed76d018a4c2ecd75989539293bfb98795b9bb181b457c36406039ab96b678c35ccbba41e16739f96d414aa68ebe WHIRLPOOL 9597e66fcb265736b16b9b1a623d0b53797477f966b05a773f53316189888446a1b492fc5c239334500ecca6a2c443f3ac477825e04a74132d826e7dbd7b5bf9
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.14.0.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.14.0.ebuild
new file mode 100644
index 00000000000..353ae17207c
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.14.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug does not do anything useful
+
+inherit gnome2
+
+DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
+HOMEPAGE="http://git.gnome.org/browse/geocode-glib"
+
+# FIXME: should be slot 1.0 but upstream failed at renaming the libs
+# and some files conflict from previous releases.
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection test"
+
+RDEPEND="
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/json-glib-0.99.2[introspection?]
+ gnome-base/gvfs[http]
+ net-libs/libsoup:2.4[introspection?]
+ introspection? (
+ >=dev-libs/gobject-introspection-0.6.3
+ net-libs/libsoup-gnome:2.4[introspection] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=sys-devel/gettext-0.18
+ virtual/pkgconfig
+ test? ( sys-apps/dbus )
+"
+# eautoreconf requires:
+# dev-libs/gobject-introspection-common
+# gnome-base/gnome-common
+
+RESTRICT="test" # Need network #424719
+
+src_test() {
+ export GVFS_DISABLE_FUSE=1
+ export GIO_USE_VFS=gvfs
+ ewarn "Tests require network access to http://where.yahooapis.com"
+ dbus-launch emake check || die "tests failed"
+}
diff --git a/sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild b/sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild
new file mode 100644
index 00000000000..4788a04672e
--- /dev/null
+++ b/sci-geosciences/geocode-glib/geocode-glib-3.16.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no" # --enable-debug does not do anything useful
+
+inherit gnome2
+
+DESCRIPTION="GLib geocoding library that uses the Yahoo! Place Finder service"
+HOMEPAGE="http://git.gnome.org/browse/geocode-glib"
+
+# FIXME: should be slot 1.0 but upstream failed at renaming the libs
+# and some files conflict from previous releases.
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection test"
+
+RDEPEND="
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/json-glib-0.99.2[introspection?]
+ gnome-base/gvfs[http]
+ net-libs/libsoup:2.4[introspection?]
+ introspection? (
+ >=dev-libs/gobject-introspection-0.6.3
+ net-libs/libsoup-gnome:2.4[introspection] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=sys-devel/gettext-0.18
+ virtual/pkgconfig
+ test? ( sys-apps/dbus )
+"
+# eautoreconf requires:
+# dev-libs/gobject-introspection-common
+# gnome-base/gnome-common
+
+# FIXME: need network #424719, recheck
+# need various locales to be present
+RESTRICT="test"
+
+src_test() {
+ export GVFS_DISABLE_FUSE=1
+ export GIO_USE_VFS=gvfs
+ ewarn "Tests require network access to http://where.yahooapis.com"
+ dbus-launch emake check || die "tests failed"
+}
diff --git a/sci-geosciences/geocode-glib/metadata.xml b/sci-geosciences/geocode-glib/metadata.xml
new file mode 100644
index 00000000000..0b6b5da045e
--- /dev/null
+++ b/sci-geosciences/geocode-glib/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+ for introspection</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-geosciences/gmapcatcher/Manifest b/sci-geosciences/gmapcatcher/Manifest
new file mode 100644
index 00000000000..d55466b775a
--- /dev/null
+++ b/sci-geosciences/gmapcatcher/Manifest
@@ -0,0 +1 @@
+DIST mapcatcher_0.8.0.4.tar.gz 441925 SHA256 9cc969e9c4fb7fe42e7afb33b5bf60a868c626e2ec957d3003daeecdaa1dae76 SHA512 9612df238fe2c723d4668a4587fbc2028b4c83e2d6372de4f03bf696a3900114a1b08352910c3ab2dc304eb694d2a5469441fbb35d9325750298c0cb02e40734 WHIRLPOOL 9bf330218c136a6d196ff7620e5983640114ecbbf98a611a1c19abe7faf93b1ee13fea0f09e7298f41c65ed08d79acab6e5aa95d11419a9c46e0524296a34839
diff --git a/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch b/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch
new file mode 100644
index 00000000000..35efed02a32
--- /dev/null
+++ b/sci-geosciences/gmapcatcher/files/gmapcatcher-0.8.0.4-setuppy-docs.patch
@@ -0,0 +1,14 @@
+Drop docs from setup.py, distutils-r1 takes care of it.
+
+--- setup.py.orig 2013-07-25 03:24:35.987668173 +0200
++++ setup.py 2013-07-25 03:24:51.770668448 +0200
+@@ -13,8 +13,7 @@
+ description = 'Offline Map Viewer',
+ version = VERSION,
+ url = WEB_ADDRESS,
+- data_files = [('share/doc/mapcatcher', ['README', 'changelog']),
+- ('share/applications', ['gmapcatcher.desktop']),
++ data_files = [('share/applications', ['gmapcatcher.desktop']),
+ ('share/man/man1',
+ ['man/mapcatcher.1.gz', 'man/mapdownloader.1.gz']),
+ ('share/pixmaps', ['images/mapcatcher.png']),
diff --git a/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
new file mode 100644
index 00000000000..a5bb7e97c83
--- /dev/null
+++ b/sci-geosciences/gmapcatcher/gmapcatcher-0.8.0.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="An offline viewer for different map providers"
+HOMEPAGE="http://code.google.com/p/gmapcatcher/"
+SRC_URI="http://gmapcatcher.googlecode.com/files/mapcatcher_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-python/pygtk[${PYTHON_USEDEP}]
+ dev-python/pygobject[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ virtual/python-imaging[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/mapcatcher-${PV}
+PATCHES=("${FILESDIR}"/${P}-setuppy-docs.patch)
+
+src_prepare() {
+ sed -i -e "/Version=/d" -e "s/Application;//" gmapcatcher.desktop || die
+ distutils-r1_src_prepare
+}
diff --git a/sci-geosciences/gmapcatcher/metadata.xml b/sci-geosciences/gmapcatcher/metadata.xml
new file mode 100644
index 00000000000..1168f85ccde
--- /dev/null
+++ b/sci-geosciences/gmapcatcher/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>god@politeia.in</email>
+ <name>Denis M.</name>
+ <description>Maintainer, assign bugs to him</description>
+ </maintainer>
+ <maintainer>
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ <description>Proxy-Maintainer, CC him on bugs</description>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
new file mode 100644
index 00000000000..d5a8019fb3a
--- /dev/null
+++ b/sci-geosciences/gmt/Manifest
@@ -0,0 +1,13 @@
+DIST GMT4.5.6_doc.tar.bz2 25230761 SHA256 9fbdf427ef06e666d83871c9e1241e5b578906b82e5c382d38fe75dfb40645dd SHA512 97d3ab39b8f015c7488d039af1578c9187f8fdd82e8492729150afb1ec658b2e5221d92145e0776348ecfd1a720004e9766760e3a20337b00f43f309150ae302 WHIRLPOOL 36a13a4a5bfae1f660fb684c5ebb6b2785cb3bef89d2840360f0cd61e4228c7ae4f147a1fcbd83f1dcb4d40f7d1afdfad1303ae354291424ccd630ae6f1aafd1
+DIST GMT4.5.6_share.tar.bz2 43704 SHA256 364fcd62e1ed422d40399b92815e1196e916ea86f5a460cc799406754220234d SHA512 7b1ca938a291f06be83421d1324612851da74a2156bc7568da01b05f2a235eb2f36854abd4fac5c357f9e22df4f98a69410fc3e2e2117f72994db60c00780fc0 WHIRLPOOL a30b9b3bff58a0db9f70529c262c3db0a73a39aed962063f0299f3147973eae952f6edd0bbb58e4cfdb9b8530213bf16661d8970391852267354284f81a515d0
+DIST GMT4.5.6_src.tar.bz2 1134118 SHA256 f58b24320e9ffd2a2196aa68689dbc8b3bf01a13c4efc30a28aba2dd5b65e7b4 SHA512 0cb06f6be7cf6a3f586f7d9b4579d5520fb15f6ef14eec216c60aa4b3fa9a3ca3308bf4683c8cc0bcf71f3c02ba74a0f9bf296fec4c1980d10adc4ba4a12024e WHIRLPOOL e58762ee4c2dd4cc553e8e1eb0e6a972f1060221944e1cebfe712bfbda19b579e5937a4ce1937d0743978989b087246b63c2fcad730b69e5685ef63e16107edc
+DIST GMT4.5.6_suppl.tar.bz2 4137369 SHA256 572d23252055ed1e1d72f07e7aee86d92c4cd15b47fd55b0ecf39bfb7f014bee SHA512 7e1cd35da0a7f75800074cac4dd7f82ce17721953251c951c4f585f0cf159af6c2450fba20d9c02fad69ec7a689483de55cc652fcc600535255cf17ab528a027 WHIRLPOOL 55abc1471e582385420392a81c4d46c045cf85c94cbade0db6f6c9c0bb88e2a0cba7182125c686e1b4464f74ce8a06d99d4f57f55ebcccf62f538cbd29e8b646
+DIST GMT4.5.6_triangle.tar.bz2 103426 SHA256 0ef5ca66eebd1386b1f59e2577cedb2d7e68c8bff83d4b57a648d1b04026a05c SHA512 3daabba610a50e72c2e9e5dd7fb22ff02547c598ff22f40f145f3f794447cde995ddbdcd2560954478806fc5edc2af4fb59615e405622daa4292e6dc2f0e4f5e WHIRLPOOL de80a48ddfa9edb82a4312843ec604c2e78e73b756212293f88d0ae4cdaf259f6de5eae5c0178b7fed53c7f640147f1705b4f685c21f2e4840f66330eea12b0d
+DIST GSHHS2.1.1_coast.tar.bz2 4322743 SHA256 9d78154cc316553e7ade8c79792d15e97469615f67e256e91b35da4bf0e64730 SHA512 6009139cc4760925817e789e0c9980ec6bde1310f521e6f43e5643b9eba1e859bb9a23bdc4bb661e66d32f4886ad3ad93f5af76ca93ac847307f9acd37eeb332 WHIRLPOOL 6658cd37fe2db73baa629566765e1657f5ecb214ccfad88c2cff7dd0524b45f89897f87ca7a8d1698e9ebd3a7592c437764a99c333c0967fa6bc18058381f653
+DIST GSHHS2.1.1_full.tar.bz2 29916230 SHA256 a81f6cdf64cad78c36b71c550079f11ebc11305b399f2c5354dc0d4087977938 SHA512 f4759d21514a63b1cf3a65c75aeab951740091235e3f19d832ad2c09416d2ab8d516a8f5bf0f6068c81f6c18f76734c4bf3772c37406c1df5abd4ae445f3d375 WHIRLPOOL acb9edd5d4d468b8903646155a6d85f80bdebd54debc7af0f04934010fb211b4da8c94396177de7410a9c92caef02e3a3dddc9e89075dfcda34843f45b1543f8
+DIST GSHHS2.1.1_high.tar.bz2 9712697 SHA256 a19e1e4b205419d56ae3dca98a71dd0001eb5aab2ebc5f436c1d7e6e741945c7
+DIST gmt-4.5.8-non-gpl.tar.bz2 109125 SHA256 f68c9ee5d0376f0931643be9afc34f21f2f8752117c7fdfb46a7239c1acdc98f SHA512 04b3eefd1490b194d7797af86fc726dd84960d65dd955e5ddefaf6ea4ec5a98f6f00085acc0cc846aa70e986facf65221256dd6a625f918c6abe6ba0b6b06f64 WHIRLPOOL 882789617e091bd844ae2e30e80d328492d5b2a5b033ec2ac876ea2a95c0b1fb8e2b75f0d5529c4d9d20a74a2c782ebff4a8c61d53c0a651a96f0e0cb37df1e8
+DIST gmt-4.5.8.tar.bz2 39350328 SHA256 de3398acaf3ecb34f48c8a61a916c6037276793bd4b13bef376282a7731e54d4 SHA512 5bc3be1f7963df6a3035195e2123645d8a8b7a8a9aa17c89a6dd50560485706c628e0e0aca779930c4a28f2305fcc184981db728085d3373b2cad89e59d5c6fd WHIRLPOOL 2e09cd006818c3b656bacd54b9f28642993f26a5ada6d92ce52026bf0530746705fdba4a46aa44bd30855784b3f8cebc0047b2e3c683d24bdcb8d7c0025ffc69
+DIST gmt-4.5.9-non-gpl.tar.bz2 103494 SHA256 29103015063d61b5b6103775a1bd7cc56b053018bb2fa680213839a98215897b SHA512 a41cd94acbd014bed780797be1ac1b492388c7c8e0fcfc5e773e894e803a024bdc60b897589ad4db9af973f20606a87ac9cff606f0391641236bca95c0b7a4c5 WHIRLPOOL d59d894b2d6b5822a71501e51ab0e328c2fe9367c1d1c64591971004c594554fe8a692d84a1a76b84f614556f8c8d31ae83245a1c6fbc9a70aed53934272c7c1
+DIST gmt-4.5.9.tar.bz2 39325492 SHA256 9b13be96ccf4bbd38c14359c05dfa7eeeb4b5f06d6f4be9c33d6c3ea276afc86 SHA512 1edda71787fa2e1434a6891618d4523c39d04c2db285dadc66c1d52b425cfff6866c492926cae41d78d2a4e5118e8d003ef3d71d164e0c0695d71aaddb598242 WHIRLPOOL ca890bc544f0861bf722f623773d41fac294874be76b25222a71ac0f9ef725069982ca9f77c5ca7558eadcd2a8b8e8bd1a934bf467ba1ef873ccbbc1f9a024fb
+DIST gshhs-2.2.0.tar.bz2 47021761 SHA256 e6c6c93ae10c9476c33934d46f5fb54a4d12463bdfb46f8e1c2f189ed4a4dfd2 SHA512 a9c1550f24feeefbc7ae633cce41e737f8153bb7df974e942fb5b9f0c931a49707c737f34bf6316ac89aa9bf487a091ada08ca8d798e2a5385e75f3dc05fdf83 WHIRLPOOL 125aa0f8e4da1b1f62b0380250cd06ec2f5d1e0f7b8c2316feebd6a49bb229a8608156d1555e2e241772c716fc452f6c7cc38d64877e7ee44c1e76f0b09d3c59
diff --git a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
new file mode 100644
index 00000000000..f0fe4c3e833
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
@@ -0,0 +1,62 @@
+Drop manipulation of several flags:
+
+* stripping of -g from CFLAGS, as it interferes with deliberate
+ generation of debug symbols and breaks on flags like -ggdb.
+* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is
+ done as a separate step on Gentoo (and many other distros) in order
+ to faciliate retention or splitting of debug symbols.
+* Setting of optimization flags, as the user should be free to choose
+ them.
+
+2009-07-27 Martin von Gagern
+
+Reference: http://bugs.gentoo.org/279268
+
+Index: GMT4.5.0/configure
+===================================================================
+--- GMT4.5.0.orig/configure
++++ GMT4.5.0/configure
+@@ -10665,19 +10665,6 @@ if test "X$enable_debug" = "Xyes" ; then
+ echo "${ECHO_T}yes" >&6; }
+ CFLAGS="$CFLAGS -g"
+ else
+- CFLAGS=`echo $CFLAGS | sed 's/-g//'`
+- if test "$os" = "Darwin" ; then
+- LDFLAGS="$LDFLAGS -Wl,-x"
+- else
+- LDFLAGS="$LDFLAGS -s"
+- fi
+- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
+- CFLAGS="$CFLAGS -O2"
+- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
+- CFLAGS="$CFLAGS"
+- else
+- CFLAGS="$CFLAGS -O"
+- fi
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+Index: GMT4.5.0/configure.ac
+===================================================================
+--- GMT4.5.0.orig/configure.ac
++++ GMT4.5.0/configure.ac
+@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -g"
+ else
+- CFLAGS=`echo $CFLAGS | sed 's/-g//'`
+- if test "$os" = "Darwin" ; then
+- LDFLAGS="$LDFLAGS -Wl,-x"
+- else
+- LDFLAGS="$LDFLAGS -s"
+- fi
+- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
+- CFLAGS="$CFLAGS -O2"
+- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
+- CFLAGS="$CFLAGS"
+- else
+- CFLAGS="$CFLAGS -O"
+- fi
+ AC_MSG_RESULT(no)
+ fi
+ dnl -----------------------------------------------------------------
diff --git a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch b/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch
new file mode 100644
index 00000000000..07494380fdf
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch
@@ -0,0 +1,56 @@
+diff -urN GMT4.5.6/src/Makefile GMT4.5.6.new/src/Makefile
+--- GMT4.5.6/src/Makefile 2011-03-03 22:02:50.000000000 +0100
++++ GMT4.5.6.new/src/Makefile 2011-06-07 14:48:00.969500019 +0200
+@@ -195,13 +195,13 @@
+ $(RANLIB) $@
+
+ libpsl.$(SL): libpsl.a
+- $(LD) $(LD_OPT) pslib.o $(LIBS) -o $@
++ $(LD) $(LD_OPT) $(LDFLAGS) pslib.o $(LIBS) -o $@
+
+ libgmt.$(SL): libgmt.a
+- $(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@
++ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@
+
+ libgmtps.$(SL): libgmtps.a libgmt.$(SL) libpsl.$(SL)
+- $(LD) $(LD_OPT) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@
++ $(LD) $(LD_OPT) $(LDFLAGS) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@
+
+ #-------------------------------------------------------------------------------
+ # program rules
+diff -urN GMT4.5.6/src/mgd77/Makefile GMT4.5.6.new/src/mgd77/Makefile
+--- GMT4.5.6/src/mgd77/Makefile 2010-11-01 23:39:16.000000000 +0100
++++ GMT4.5.6.new/src/mgd77/Makefile 2011-06-07 14:53:46.394181616 +0200
+@@ -93,7 +93,7 @@
+ $(RANLIB) $@
+
+ libmgd77.$(SL): libmgd77.a
+- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
++ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
+
+ #-------------------------------------------------------------------------------
+ # program rules
+diff -urN GMT4.5.6/src/mgg/Makefile GMT4.5.6.new/src/mgg/Makefile
+--- GMT4.5.6/src/mgg/Makefile 2010-11-01 23:39:16.000000000 +0100
++++ GMT4.5.6.new/src/mgg/Makefile 2011-06-07 14:54:48.096410233 +0200
+@@ -95,7 +95,7 @@
+ $(RANLIB) $@
+
+ libgmt_mgg.$(SL): libgmt_mgg.a
+- $(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
++ $(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
+
+ #-------------------------------------------------------------------------------
+ # program rules
+diff -urN GMT4.5.6/src/x2sys/Makefile GMT4.5.6.new/src/x2sys/Makefile
+--- GMT4.5.6/src/x2sys/Makefile 2010-11-01 23:39:16.000000000 +0100
++++ GMT4.5.6.new/src/x2sys/Makefile 2011-06-07 14:54:15.124822433 +0200
+@@ -83,7 +83,7 @@
+ $(RANLIB) $@
+
+ libx2sys.$(SL): libx2sys.a
+- $(LD) $(LD_OPT) x2sys.o $(ALLLIB) -o $@
++ $(LD) $(LD_OPT) $(LDFLAGS) x2sys.o $(ALLLIB) -o $@
+
+ #-------------------------------------------------------------------------------
+ # program rules
diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch b/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch
new file mode 100644
index 00000000000..216149d93f7
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.8-bfr-overflow.patch
@@ -0,0 +1,27 @@
+diff --git a/src/mgd77/mgd77.c b/src/mgd77/mgd77.c
+index b27b1d9..6a25576 100644
+--- a/src/mgd77/mgd77.c
++++ b/src/mgd77/mgd77.c
+@@ -854,7 +854,7 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record)
+ case 3: strcpy (P->Parameters_Surveyed_Code, word); break;
+ case 4: strncpy (P->File_Creation_Year, word, 4);
+ strncpy (P->File_Creation_Month, &word[4], 2);
+- strncpy (P->File_Creation_Day, &word[6], 4); break;
++ strncpy (P->File_Creation_Day, &word[6], 2); break;
+ case 5: strcpy (P->Source_Institution, word); break;
+ case 6: strcpy (P->Country, word); break;
+ case 7: strcpy (P->Platform_Name, word); break;
+@@ -865,11 +865,11 @@ int MGD77_Decode_Header_m77t (struct MGD77_HEADER_PARAMS *P, char *record)
+ case 12: strcpy (P->Funding, word); break;
+ case 13: strncpy (P->Survey_Departure_Year, word, 4);
+ strncpy (P->Survey_Departure_Month, &word[4], 2);
+- strncpy (P->Survey_Departure_Day, &word[6], 4); break;
++ strncpy (P->Survey_Departure_Day, &word[6], 2); break;
+ case 14: strcpy (P->Port_of_Departure, word); break;
+ case 15: strncpy (P->Survey_Arrival_Year, word, 4);
+ strncpy (P->Survey_Arrival_Month, &word[4], 2);
+- strncpy (P->Survey_Arrival_Day, &word[6], 4); break;
++ strncpy (P->Survey_Arrival_Day, &word[6], 2); break;
+ case 16: strcpy (P->Port_of_Arrival, word); break;
+ case 17: strcpy (P->Navigation_Instrumentation, word); break;
+ case 18: strcpy (P->Geodetic_Datum_Position_Determination_Method, word); break;
diff --git a/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch b/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch
new file mode 100644
index 00000000000..5c63bb20957
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.8-impl-dec.patch
@@ -0,0 +1,16 @@
+diff --git a/src/gmt.h b/src/gmt.h
+index d4c9c20..ea6ddc5 100644
+--- a/src/gmt.h
++++ b/src/gmt.h
+@@ -34,9 +34,11 @@ extern "C" {
+
+ /* GMT is POSIX.1 COMPLIANT */
+
++/*
+ #ifndef _POSIX_SOURCE
+ #define _POSIX_SOURCE 1
+ #endif
++*/
+
+ /* Declaration modifiers for DLL support (MSC et al) */
+ \ No newline at end of file
diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch
new file mode 100644
index 00000000000..f57f1d811b0
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.9-no-strip.patch
@@ -0,0 +1,38 @@
+Drop manipulation of several flags:
+
+* stripping of -g from CFLAGS, as it interferes with deliberate
+ generation of debug symbols and breaks on flags like -ggdb.
+* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is
+ done as a separate step on Gentoo (and many other distros) in order
+ to faciliate retention or splitting of debug symbols.
+* Setting of optimization flags, as the user should be free to choose
+ them.
+
+2009-07-27 Martin von Gagern
+
+Reference: http://bugs.gentoo.org/279268
+
+Index: GMT4.5.0/configure.ac
+===================================================================
+--- GMT4.5.0.orig/configure.ac
++++ GMT4.5.0/configure.ac
+@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then
+ AC_MSG_RESULT(yes)
+ CFLAGS="$CFLAGS -g"
+ else
+- CFLAGS=`echo $CFLAGS | sed 's/-g//'`
+- if test "$os" = "Darwin" ; then
+- LDFLAGS="$LDFLAGS -Wl,-x"
+- else
+- LDFLAGS="$LDFLAGS -s"
+- fi
+- if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
+- CFLAGS="$CFLAGS -O2"
+- elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
+- CFLAGS="$CFLAGS"
+- else
+- CFLAGS="$CFLAGS -O"
+- fi
+ AC_MSG_RESULT(no)
+ fi
+ dnl -----------------------------------------------------------------
diff --git a/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch b/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
new file mode 100644
index 00000000000..e724b4ceab7
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.9-unistd.h.patch
@@ -0,0 +1,19 @@
+Fix "gmtdigitize.c:77:2: error: unknown type name 'gid_t'"
+build failure; patch from upstream version 4.5.11
+
+https://bugs.gentoo.org/show_bug.cgi?id=543624
+
+--- a/src/misc/gmtdigitize.c
++++ b/src/misc/gmtdigitize.c
+@@ -37,6 +37,11 @@
+ *
+ */
+
++#define _XOPEN_SOURCE
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
+ #include "gmt.h"
+
+ #ifndef WIN32
diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild
new file mode 100644
index 00000000000..821b040c3c4
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib autotools eutils
+
+GSHHS="GSHHS2.1.1"
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="http://gmt.soest.hawaii.edu/"
+SRC_URI="mirror://gmt/GMT${PV}_src.tar.bz2
+ mirror://gmt/GMT${PV}_share.tar.bz2
+ mirror://gmt/${GSHHS}_coast.tar.bz2
+ mirror://gmt/GMT${PV}_suppl.tar.bz2
+ doc? ( mirror://gmt/GMT${PV}_doc.tar.bz2 )
+ gmtfull? ( mirror://gmt/${GSHHS}_full.tar.bz2 )
+ gmthigh? ( mirror://gmt/${GSHHS}_high.tar.bz2 )
+ gmttria? ( mirror://gmt/GMT${PV}_triangle.tar.bz2 )"
+
+LICENSE="GPL-2 gmttria? ( Artistic )"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc debug gmtfull gmthigh gmttria +metric mex +netcdf octave postscript"
+
+RDEPEND="
+ !sci-biology/probcons
+ netcdf? ( >=sci-libs/netcdf-4.1 )
+ octave? ( sci-mathematics/octave )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror" # for the gmttria
+
+S="${WORKDIR}/GMT${PV}"
+
+# mex can use matlab too which i can't test
+REQUIRED_USE="
+ mex? ( octave )
+ gmthigh? ( !gmtfull ) gmtfull? ( !gmthigh )
+"
+
+# hand written make files that are not parallel safe
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+ mv -f "${WORKDIR}/share/"* "${S}/share/" || die
+
+ epatch \
+ "${FILESDIR}/${PN}-4.5.0-no-strip.patch" \
+ "${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch" \
+ "${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ # triangle disabled due to non-comercial license
+ econf \
+ --libdir=/usr/$(get_libdir)/${P} \
+ --includedir=/usr/include/${P} \
+ --datadir=/usr/share/${P} \
+ --docdir=/usr/share/doc/${PF} \
+ --disable-update \
+ --disable-debug \
+ --disable-gdal \
+ --disable-matlab \
+ --disable-xgrid \
+ --enable-shared \
+ $(use_enable netcdf) \
+ $(use_enable octave) \
+ $(use_enable debug devdebug) \
+ $(use_enable !metric US) \
+ $(use_enable postscript eps) \
+ $(use_enable mex) \
+ $(use_enable gmttria triangle)
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ install-gmt install-data install-suppl install-man
+
+ # remove static libs
+ find "${D}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
+
+ dodoc README
+ use doc && dodoc -r "${S}"/share/doc/${PN}/*
+
+ cat << _EOF_ > "${T}/99gmt"
+GMTHOME=${EPREFIX}/usr/share/${P}
+GMT_SHAREDIR=${EPREFIX}/usr/share/${P}
+_EOF_
+ doenvd "${T}/99gmt"
+}
diff --git a/sci-geosciences/gmt/gmt-4.5.8.ebuild b/sci-geosciences/gmt/gmt-4.5.8.ebuild
new file mode 100644
index 00000000000..69de6f072b6
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.8.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
+
+GSHHS="gshhs-2.2.0"
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="http://gmt.soest.hawaii.edu/"
+SRC_URI="
+ mirror://gmt/${P}.tar.bz2
+ mirror://gmt/${GSHHS}.tar.bz2
+ gmttria? ( mirror://gmt/${P}-non-gpl.tar.bz2 )"
+
+LICENSE="GPL-2 gmttria? ( Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
+
+RDEPEND="
+ !sci-biology/probcons
+ gdal? ( sci-libs/gdal )
+ netcdf? ( >=sci-libs/netcdf-4.1 )
+ octave? ( sci-mathematics/octave )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/GMT${PV}"
+
+# mex can use matlab too which i can't test
+REQUIRED_USE="
+ mex? ( octave )
+"
+
+# hand written make files that are not parallel safe
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.5.0-no-strip.patch
+ "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
+ "${FILESDIR}"/${P}-bfr-overflow.patch
+ "${FILESDIR}"/${P}-impl-dec.patch
+ )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+ mv -f "${WORKDIR}/share/"* "${S}/share/" || die
+
+ tc-export AR RANLIB
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ --libdir=/usr/$(get_libdir)/${P}
+ --includedir=/usr/include/${P}
+ --datadir=/usr/share/${P}
+ --docdir=/usr/share/doc/${PF}
+ --disable-update
+ --disable-matlab
+ --disable-xgrid
+ --disable-debug
+ $(use_enable gdal)
+ $(use_enable netcdf)
+ $(use_enable octave)
+ $(use_enable debug devdebug)
+ $(use_enable !metric US)
+ $(use_enable postscript eps)
+ $(use_enable mex)
+ $(use_enable gmttria triangle)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install install-all
+
+ # remove static libs
+ find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
+
+ cat <<- _EOF_ > "${T}/99gmt"
+ GMTHOME="${EPREFIX}/usr/share/${P}"
+ GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
+ _EOF_
+ doenvd "${T}/99gmt"
+}
diff --git a/sci-geosciences/gmt/gmt-4.5.9.ebuild b/sci-geosciences/gmt/gmt-4.5.9.ebuild
new file mode 100644
index 00000000000..03bb4131dfc
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.9.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib
+
+GSHHS="gshhs-2.2.0"
+
+DESCRIPTION="Powerful map generator"
+HOMEPAGE="http://gmt.soest.hawaii.edu/"
+SRC_URI="
+ mirror://gmt/${P}.tar.bz2
+ mirror://gmt/${GSHHS}.tar.bz2
+ gmttria? ( mirror://gmt/${P}-non-gpl.tar.bz2 )"
+
+LICENSE="GPL-2 gmttria? ( Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +gdal gmttria +metric mex +netcdf octave postscript"
+
+RDEPEND="
+ !sci-biology/probcons
+ gdal? ( sci-libs/gdal )
+ netcdf? ( >=sci-libs/netcdf-4.1 )
+ octave? ( sci-mathematics/octave )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/GMT${PV}"
+
+# mex can use matlab too which i can't test
+REQUIRED_USE="
+ mex? ( octave )
+"
+
+# hand written make files that are not parallel safe
+MAKEOPTS+=" -j1"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.5.9-no-strip.patch
+ "${FILESDIR}"/${PN}-4.5.6-respect-ldflags.patch
+ "${FILESDIR}"/${PN}-4.5.9-unistd.h.patch
+ )
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_prepare() {
+ mv -f "${WORKDIR}/share/"* "${S}/share/" || die
+
+ tc-export AR RANLIB
+
+ autotools-utils_src_prepare
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --libdir=/usr/$(get_libdir)/${P}
+ --includedir=/usr/include/${P}
+ --datadir=/usr/share/${P}
+ --docdir=/usr/share/doc/${PF}
+ --disable-update
+ --disable-matlab
+ --disable-xgrid
+ --disable-debug
+ $(use_enable gdal)
+ $(use_enable netcdf)
+ $(use_enable octave)
+ $(use_enable debug devdebug)
+ $(use_enable !metric US)
+ $(use_enable postscript eps)
+ $(use_enable mex)
+ $(use_enable gmttria triangle)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ autotools-utils_src_install install-all
+
+ # remove static libs
+ find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
+
+ cat <<- _EOF_ > "${T}/99gmt"
+ GMTHOME="${EPREFIX}/usr/share/${P}"
+ GMT_SHAREDIR="${EPREFIX}/usr/share/${P}"
+ _EOF_
+ doenvd "${T}/99gmt"
+}
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
new file mode 100644
index 00000000000..800476249b1
--- /dev/null
+++ b/sci-geosciences/gmt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <use>
+ <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+ <flag name="gmtfull">Full resolution bathymetry database</flag>
+ <flag name="gmthigh">Add high resolution bathymetry database</flag>
+ <flag name="gmttria">Non GNU triangulation method, more efficient</flag>
+ <flag name="metric">Use SI (cm) units instead of US (inches) ones</flag>
+ <flag name="mex">Enable compilation of mex supplement which requires Octave/Matlab</flag>
+ <flag name="octave">Enable octave support</flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
new file mode 100644
index 00000000000..8e359302326
--- /dev/null
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-maps-3.14.2.tar.xz 787284 SHA256 92a6488b2632da0d4f9b6c67b9462dfd2dc790617f8b472e46130b8909bc2ab5 SHA512 52f48567c2d490781655b62b1c392d2ac09f04d5d60fdd1d96043ce9b29191de274974e40914fa0c917235b03cd4f652213e7bde536becd5eb7012a2ddb2be58 WHIRLPOOL 1118692a3cd7908eb87d0cb3ab12efa8bb195970421d8150cc2ddfba7cc32124824aa3ab46e016230c743b8209c96d65125595f071597545d4ab4bd2c832d920
+DIST gnome-maps-3.16.2.tar.xz 835624 SHA256 a7d791e4fb2dc3674232edf5c6d6112274869524db458695fc9fece49df07c96 SHA512 c62edd04805dfbf8f01afdab8173564111c1ba9eb41adbc547dcc06077114cd79ea4fe5fbfaff0583ced126201a5f9dc179459ffe0b50cbd5e5139b8eda189f8 WHIRLPOOL 26d47d429b6c9c1e332ac13a555c3d371ee2462f22af6dc90018454d1754da102bcfa3824c8dda5a650e51453ec0e9dd88164efbcf96a10aa7d057017af434ee
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.14.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.14.2.ebuild
new file mode 100644
index 00000000000..ed27051b33f
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.14.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ >=app-misc/geoclue-1.99.3:2.0
+ >=dev-libs/gjs-1.39
+ >=dev-libs/gobject-introspection-0.10.1
+ >=dev-libs/glib-2.39.3:2
+ media-libs/clutter-gtk:1.0[introspection]
+ media-libs/clutter:1.0[introspection]
+ media-libs/cogl:1.0[introspection]
+ media-libs/libchamplain:0.12[introspection]
+ net-libs/libsoup:2.4[introspection]
+ sci-geosciences/geocode-glib[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ >=x11-libs/gtk+-3.10:3[introspection]
+"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+"
diff --git a/sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild
new file mode 100644
index 00000000000..6229e9a3c7e
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-3.16.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=app-misc/geoclue-0.12.99:2.0
+ >=dev-libs/folks-0.10
+ >=dev-libs/gjs-1.43.3
+ >=dev-libs/gobject-introspection-0.6.3
+ >=dev-libs/glib-2.39.3:2
+ >=dev-libs/libgee-0.16:0.8[introspection]
+ media-libs/clutter-gtk:1.0[introspection]
+ media-libs/clutter:1.0[introspection]
+ media-libs/cogl:1.0[introspection]
+ >=media-libs/libchamplain-0.12.10-r1:0.12[gtk,introspection]
+ net-libs/libsoup:2.4[introspection]
+ >=sci-geosciences/geocode-glib-3.15.2[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ >=x11-libs/gtk+-3.15.9:3[introspection]
+"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+"
diff --git a/sci-geosciences/gnome-maps/metadata.xml b/sci-geosciences/gnome-maps/metadata.xml
new file mode 100644
index 00000000000..6e0e2ecb48c
--- /dev/null
+++ b/sci-geosciences/gnome-maps/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/sci-geosciences/googleearth/Manifest b/sci-geosciences/googleearth/Manifest
new file mode 100644
index 00000000000..70bc61f4671
--- /dev/null
+++ b/sci-geosciences/googleearth/Manifest
@@ -0,0 +1,2 @@
+DIST GoogleEarthLinux-7.1.2.2041_amd64.deb 46385468 SHA256 5a14d83ea28b3e940b83395ec93222fefd250f908d9a4b00074cc966ef9acd03 SHA512 90862ca4e1d6f61cccd89911a95d7a55f390e7adfe0cfcc68c67a5ce2622537c74d51ad8cb8c8394940ae773276f532f23bbc1dd043edbf50f891b78ce48e52c WHIRLPOOL e35b4061416c5754e5fedbbc38f51de4fafd67e40417afe6cd0f4972469614653f55c992053b678cfc50c79528bbb91dce72f7650f2085eb113b264b2e7b4c4a
+DIST GoogleEarthLinux-7.1.2.2041_i386.deb 45444652 SHA256 9f82137fc11fb400b8609bf65c0b87f029e595c07edff6e4ba9e836e7bdd3120 SHA512 7ff8b1a33e27b0a990edfd93614b9ca0b132c35c6fe0e730d298098bb412d36184aa7af90329a7f962de4c013ff18e378850d813e44c2fadd237dbbcb51af388 WHIRLPOOL 384fd53abf82c097e25a468f5fd00e1948220104ebfa25bd41d53670bf7d3562c415eba5330c59b0b4dca53c2adc46be6b0f7b6145337e1f15ac7a21d3ef8e64
diff --git a/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch b/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch
new file mode 100644
index 00000000000..0de8b589b77
--- /dev/null
+++ b/sci-geosciences/googleearth/files/googleearth-7-desktopfile.patch
@@ -0,0 +1,17 @@
+--- google-earth.desktop
++++ google-earth.desktop
+@@ -3,10 +3,10 @@
+ Name=Google Earth
+ GenericName=3D planet viewer
+ Comment=Explore, search and discover the planet
+-Exec=/opt/google/earth/free/google-earth %f
++Exec=/opt/googleearth/googleearth %f
+ Terminal=false
+-MultipleArgs=false
++X-MultipleArgs=false
+ Icon=google-earth
+ Type=Application
+-Categories=Application;Network
+-MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole
++Categories=Network;
++MimeType=application/vnd.google-earth.kml+xml;application/vnd.google-earth.kmz;application/earthviewer;application/keyhole;
diff --git a/sci-geosciences/googleearth/files/googleearth-mimetypes.xml b/sci-geosciences/googleearth/files/googleearth-mimetypes.xml
new file mode 100644
index 00000000000..3ecfa97cdae
--- /dev/null
+++ b/sci-geosciences/googleearth/files/googleearth-mimetypes.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+ <mime-type type="application/vnd.google-earth.kml+xml">
+ <comment>Keyhole Markup Language data</comment>
+ <glob pattern="*.kml"/>
+ </mime-type>
+
+ <mime-type type="application/vnd.google-earth.kmz">
+ <comment>Keyhole Markup Language archive</comment>
+ <glob pattern="*.kmz"/>
+ </mime-type>
+
+ <mime-type type="application/keyhole">
+ <comment>Keyhole Markup Language data</comment>
+ </mime-type>
+
+ <mime-type type="application/earthviewer">
+ <comment>Keyhole Markup Language data</comment>
+ </mime-type>
+</mime-info>
+
diff --git a/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild b/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild
new file mode 100644
index 00000000000..520cd138278
--- /dev/null
+++ b/sci-geosciences/googleearth/googleearth-7.1.2.2041.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit pax-utils eutils unpacker fdo-mime gnome2-utils
+
+DESCRIPTION="A 3D interface to the planet"
+HOMEPAGE="http://earth.google.com/"
+# no upstream versioning, version determined from help/about
+# incorrect digest means upstream bumped and thus needs version bump
+SRC_URI="x86? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_i386.deb
+ -> GoogleEarthLinux-${PV}_i386.deb )
+ amd64? ( http://dl.google.com/dl/earth/client/current/google-earth-stable_current_amd64.deb
+ -> GoogleEarthLinux-${PV}_amd64.deb )"
+LICENSE="googleearth GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror splitdebug"
+IUSE="+bundled-libs"
+
+QA_PREBUILT="*"
+
+# TODO: find a way to unbundle libQt
+# ./googleearth-bin: symbol lookup error: ./libbase.so: undefined symbol: _Z34QBasicAtomicInt_fetchAndAddOrderedPVii
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/nspr
+ media-libs/fontconfig
+ media-libs/freetype
+ net-misc/curl
+ sys-devel/gcc[cxx]
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ virtual/ttf-fonts
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ !bundled-libs? (
+ dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/nss
+ sci-libs/gdal
+ sci-libs/proj
+ )"
+DEPEND="dev-util/patchelf"
+
+S=${WORKDIR}/opt/google/earth/free
+
+pkg_nofetch() {
+ einfo "Wrong checksum or file size means that Google silently replaced the distfile with a newer version."
+ einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
+ einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for googleearth first!)."
+ einfo "By redigesting the file yourself, you will install a different version than the ebuild says, untested!"
+}
+
+src_unpack() {
+ # default src_unpack fails with deb2targz installed, also this unpacks the data.tar.lzma as well
+ unpack_deb GoogleEarthLinux-${PV}_$(usex amd64 "amd64" "i386").deb
+
+ if ! use bundled-libs ; then
+ einfo "removing bundled libs"
+ cd opt/google/earth/free || die
+ # sci-libs/gdal
+ rm -v libgdal.so.1 || die
+ # dev-db/sqlite
+ rm -v libsqlite3.so || die
+ # dev-libs/nss
+ rm -v libplc4.so libplds4.so libnspr4.so libnssckbi.so libfreebl3.so \
+ libnssdbm3.so libnss3.so libnssutil3.so libsmime3.so libnsssysinit.so \
+ libsoftokn3.so libssl3.so || die
+ # dev-libs/expat
+ rm -v libexpat.so.1 || die
+ # sci-libs/proj
+ rm -v libproj.so.0 || die
+ # dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtwebkit:4
+# rm -v libQt{Core,Gui,Network,WebKit}.so.4 || die
+# rm -rv plugins/imageformats || die
+ fi
+}
+
+src_prepare() {
+ # we have no ld-lsb.so.3 symlink
+ # thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for suggesting patchelf
+ einfo "running patchelf"
+ patchelf --set-interpreter /lib/ld-linux$(usex amd64 "-x86-64" "").so.2 ${PN}-bin || die "patchelf failed"
+
+ # Set RPATH for preserve-libs handling (bug #265372).
+ local x
+ for x in * ; do
+ # Use \x7fELF header to separate ELF executables and libraries
+ [[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue
+ patchelf --set-rpath '$ORIGIN' "${x}" ||
+ die "patchelf failed on ${x}"
+ done
+ for x in plugins/*.so ; do
+ [[ -f ${x} ]] || continue
+ patchelf --set-rpath '$ORIGIN/..' "${x}" ||
+ die "patchelf failed on ${x}"
+ done
+ for x in plugins/imageformats/*.so ; do
+ [[ -f ${x} ]] || continue
+ patchelf --set-rpath '$ORIGIN/../..' "${x}" ||
+ die "patchelf failed on ${x}"
+ done
+
+ epatch "${FILESDIR}"/${PN}-${PV%%.*}-desktopfile.patch
+}
+
+src_install() {
+ make_wrapper ${PN} ./${PN} /opt/${PN} .
+
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}/${PN}-mimetypes.xml" || die
+
+ domenu google-earth.desktop
+
+ for size in 16 22 24 32 48 64 128 256 ; do
+ newicon -s ${size} product_logo_${size}.png google-earth.png
+ done
+
+ rm -rf xdg-mime xdg-settings google-earth google-earth.desktop product_logo_*
+
+ insinto /opt/${PN}
+ doins -r *
+
+ fperms +x /opt/${PN}/${PN}{,-bin}
+ cd "${ED}" || die
+ find . -type f -name "*.so.*" -exec fperms +x '{}' +
+
+ pax-mark -m "${ED%/}"/opt/${PN}/${PN}-bin
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ elog "When you get a crash starting Google Earth, try adding a file ~./.config/Google/GoogleEarthPlus.conf"
+ elog "with the following options:"
+ elog "lastTip = 4"
+ elog "enableTips = false"
+ elog ""
+ elog "In addition, the use of free video drivers may cause problems associated with using the Mesa"
+ elog "library. In this case, Google Earth 6x likely only works with the Gallium3D variant."
+ elog "To select the 32bit graphic library use the command:"
+ elog " eselect mesa list"
+ elog "For example, for Radeon R300 (x86):"
+ elog " eselect mesa set r300 2"
+ elog "For Intel Q33 (amd64):"
+ elog " eselect mesa set 32bit i965 2"
+ elog "You may need to restart X afterwards"
+
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+ gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/googleearth/metadata.xml b/sci-geosciences/googleearth/metadata.xml
new file mode 100644
index 00000000000..3bbd22b53ed
--- /dev/null
+++ b/sci-geosciences/googleearth/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name='bundled-libs'>Use bundled libraries.</flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
new file mode 100644
index 00000000000..d011f6c9c8b
--- /dev/null
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -0,0 +1,3 @@
+DIST gpsbabel-1.4.3.tar.gz 5616398 SHA256 c9b81ebbd65a34e7fe741c18985c1ead65123fd09fa0ecbf882bc47a87c4f5d8 SHA512 4e0e5c6bb04a55a4ed809a769bbcf6eb61bdc115cbf24745d8ce51875d7e1044129a8c7249f560c652626317f44a56efb2eb2da4c2d564996793b0aa75e0cf75 WHIRLPOOL 70fe1f7a486bab21f04d2cd328ae49466f442b1a8532d4cdc33e4fd6fce2ef9d9c38caa76a6db7ee9fc4d462f502776bb05b67105f308369604ec1c75552c917
+DIST gpsbabel-1.4.4.tar.gz 7811264 SHA256 9dd2a06e887cb286c9a07164a8f2ede11aed1147e6419007370c528412321944 SHA512 07b12dfe2127a399d973fa793fe3437cbda8f3425f3317100767b7fda549d9ea6bdda1429822ade671e219c99d95bc7feb16a8d177779b457aafb373141c515a WHIRLPOOL 576c60b0868648500552b4058c385af7912d0eaf1f63541cbcdf568c5dc96f46a5f204a981e525eced267a2060aeb4f04935ae45f67f0236c03f57f3a52bfaf9
+DIST gpsbabel.org-style3.css 2171 SHA256 3f87b917e014e94562b44070c2b885abeef56e6459ce08d2cac785db197964ff
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch
new file mode 100644
index 00000000000..2ab8d5e10c6
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-1.4.3-fix_binary_name.patch
@@ -0,0 +1,12 @@
+Rename gpsbabelfe binary.
+--- gpsbabel-1.4.3/gui/app.pro
++++ gpsbabel-1.4.3/gui/app.pro
+@@ -30,7 +30,7 @@
+ TARGET=GPSBabelFE
+ QMAKE_LFLAGS_RELEASE += -static-libgcc
+ }
+-unix:TARGET=gpsbabelfe-bin
++unix:TARGET=gpsbabelfe
+ mac:TARGET=GPSBabelFE
+
+ FORMS += aboutui.ui
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch
new file mode 100644
index 00000000000..2d26f64aa13
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch
@@ -0,0 +1,12 @@
+Make statistics reporting an opt-in option.
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
+@@ -64,7 +64,7 @@ public:
+ upgradeOffers(0),
+ runCount(0),
+ startupVersionCheck(true),
+- reportStatistics(true),
++ reportStatistics(false),
+ allowBetaUpgrades(false),
+ ignoreVersionMismatch(true),
+ disableDonateDialog(false),
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch
new file mode 100644
index 00000000000..a429fdf1fba
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch
@@ -0,0 +1,110 @@
+Disable check for newer versions on start.
+
+--- a/gui/preferences.ui
++++ b/gui/preferences.ui
+@@ -40,13 +40,6 @@
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+- <widget class="QCheckBox" name="startupCheck">
+- <property name="text">
+- <string>Check for newer version on start.</string>
+- </property>
+- </widget>
+- </item>
+- <item>
+ <widget class="QCheckBox" name="reportStatisticsCheck">
+ <property name="text">
+ <string>Anonymously report usage data.</string>
+--- a/gui/preferences.cpp
++++ b/gui/preferences.cpp
+@@ -39,7 +39,6 @@ Preferences::Preferences(QWidget* parent
+ {
+ ui_.setupUi(this);
+
+- ui_.startupCheck->setChecked(bd_.startupVersionCheck);
+ ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics);
+ // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
+ if (VERSION == "1.4.1")
+@@ -81,7 +80,6 @@ void Preferences::acceptClicked()
+ formatList_[i].setHidden(item->checkState() == Qt::Unchecked);
+ }
+
+- bd_.startupVersionCheck = ui_.startupCheck->isChecked();
+ bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked();
+ accept();
+ }
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
+@@ -63,7 +63,7 @@ public:
+ upgradeErrors(0),
+ upgradeOffers(0),
+ runCount(0),
+- startupVersionCheck(true),
++ startupVersionCheck(false),
+ reportStatistics(false),
+ allowBetaUpgrades(false),
+ ignoreVersionMismatch(true),
+--- a/gui/mainwinui.ui
++++ b/gui/mainwinui.ui
+@@ -641,7 +641,6 @@
+ <addaction name="actionHelp"/>
+ <addaction name="separator"/>
+ <addaction name="actionAbout"/>
+- <addaction name="actionUpgradeCheck"/>
+ <addaction name="separator"/>
+ <addaction name="actionVisit_Website"/>
+ <addaction name="actionMake_a_Donation"/>
+@@ -670,11 +669,6 @@
+ <string>Preferences...</string>
+ </property>
+ </action>
+- <action name="actionUpgradeCheck">
+- <property name="text">
+- <string>Check for Upgrade</string>
+- </property>
+- </action>
+ <action name="actionVisit_Website">
+ <property name="text">
+ <string>Visit Website...</string>
+--- a/gui/mainwindow.cpp
++++ b/gui/mainwindow.cpp
+@@ -153,7 +153,6 @@ MainWindow::MainWindow(QWidget* parent):
+ connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX()));
+ connect(ui.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX()));
+ connect(ui.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX()));
+- connect(ui.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX()));
+ connect(ui.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX()));
+
+ connect(ui.inputFormatCombo, SIGNAL(currentIndexChanged(int)),
+@@ -197,19 +196,8 @@ MainWindow::MainWindow(QWidget* parent):
+
+ //--- Restore from registry
+ restoreSettings();
+-
+ upgrade = new UpgradeCheck(parent, formatList, bd);
+- if (bd.startupVersionCheck) {
+- upgrade->checkForUpgrade(babelVersion, bd.upgradeCheckTime,
+- allowBetaUpgrades());
+- }
+-
+- if (!bd.ignoreVersionMismatch && babelVersion != VERSION) {
+- VersionMismatch vm(0, babelVersion, QString(VERSION));
+
+- vm.exec();
+- bd.ignoreVersionMismatch = vm.neverAgain();
+- }
+ }
+
+ //------------------------------------------------------------------------
+@@ -926,10 +914,6 @@ void MainWindow::applyActionX()
+ //------------------------------------------------------------------------
+ void MainWindow::closeActionX()
+ {
+- QDateTime wt= upgrade->getUpgradeWarningTime();
+- if (wt.isValid()) {
+- bd.upgradeCheckTime = wt;
+- }
+ bd.runCount++;
+
+ QDateTime now = QDateTime::currentDateTime();
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch
new file mode 100644
index 00000000000..b4bd1a9e2a7
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch
@@ -0,0 +1,47 @@
+Disable version mismatch check.
+
+--- a/gui/preferences.ui
++++ b/gui/preferences.ui
+@@ -53,13 +53,6 @@
+ </property>
+ </widget>
+ </item>
+- <item>
+- <widget class="QCheckBox" name="ignoreVersionMismatchCheck">
+- <property name="text">
+- <string>Ignore mismatch between command line and GUI version.</string>
+- </property>
+- </widget>
+- </item>
+ </layout>
+ </widget>
+ </widget>
+--- a/gui/preferences.cpp
++++ b/gui/preferences.cpp
+@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent
+
+ ui_.startupCheck->setChecked(bd_.startupVersionCheck);
+ ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics);
+- ui_.ignoreVersionMismatchCheck->setChecked(bd_.ignoreVersionMismatch);
+ // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1.
+ if (VERSION == "1.4.1")
+ bd_.ignoreVersionMismatch = false;
+@@ -84,7 +83,6 @@ void Preferences::acceptClicked()
+
+ bd_.startupVersionCheck = ui_.startupCheck->isChecked();
+ bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked();
+- bd_.ignoreVersionMismatch = ui_.ignoreVersionMismatchCheck->isChecked();
+ accept();
+ }
+
+--- a/gui/babeldata.h
++++ b/gui/babeldata.h
+@@ -66,7 +66,7 @@ public:
+ startupVersionCheck(true),
+ reportStatistics(true),
+ allowBetaUpgrades(false),
+- ignoreVersionMismatch(false),
++ ignoreVersionMismatch(true),
+ disableDonateDialog(false),
+ donateSplashed(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)))
+ {
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-fix_binary_name.patch b/sci-geosciences/gpsbabel/files/gpsbabel-fix_binary_name.patch
new file mode 100644
index 00000000000..841bb093b22
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-fix_binary_name.patch
@@ -0,0 +1,12 @@
+Rename gpsbabelfe binary.
+--- a/gui/app.pro
++++ b/gui/app.pro
+@@ -26,7 +26,7 @@ RESOURCES = app.qrc
+ RC_FILE = app.rc
+
+ win32:TARGET=GPSBabelFE
+-unix:TARGET=gpsbabelfe-bin
++unix:TARGET=gpsbabelfe
+ mac:TARGET=GPSBabelFE
+
+ FORMS += aboutui.ui
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch b/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch
new file mode 100644
index 00000000000..2467c2ee041
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig 2009-11-17 15:32:05.846189916 +0200
++++ configure.in 2009-11-17 15:33:11.111187610 +0200
+@@ -277,7 +276,7 @@
+ fi
+ ;;
+ *-gentoo-freebsd*)
+- EXPAT_LIB=-lexpa
++ EXPAT_LIB=-lexpat
+ ;;
+ *-*-freebsd*)
+ if test -f /usr/local/lib/libexpat.a ; then
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch
new file mode 100644
index 00000000000..68ea430e368
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch
@@ -0,0 +1,76 @@
+diff -urN gpsbabel-1.4.2.old/configure.in gpsbabel-1.4.2/configure.in
+--- gpsbabel-1.4.2.old/configure.in 2011-06-10 10:30:54.888410566 +0200
++++ gpsbabel-1.4.2/configure.in 2011-06-10 10:42:08.800985499 +0200
+@@ -421,6 +421,6 @@
+ else
+ AC_MSG_RESULT(no)
+ fi
+-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
++AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
+ AC_OUTPUT
+
+diff -urN gpsbabel-1.4.2.old/Makefile.in gpsbabel-1.4.2/Makefile.in
+--- gpsbabel-1.4.2.old/Makefile.in 2011-06-10 10:30:54.899410428 +0200
++++ gpsbabel-1.4.2/Makefile.in 2011-06-10 10:43:13.973170735 +0200
+@@ -87,7 +87,7 @@
+
+ @PALM_DB_CMT@PALM_DB=pdbfile.o
+
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o
++SHAPE=-lshp
+
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+@@ -98,7 +98,7 @@
+ uuid.o formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
+ inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \
+ gbfile.o parse.o avltree.o session.o \
+- $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
++ $(PALM_DB) $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
+ OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
+
+ .c.o:
+@@ -113,10 +113,10 @@
+ all: gpsbabel$(EXEEXT)
+
+ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
+- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ gpsbabel-debug: $(OBJS)
+- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
+
+ Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
+ gbversion.h.in gui/setup.iss.in
+@@ -818,8 +818,7 @@
+ session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
+ shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+- zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+- shapelib/shapefil.h
++ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
+ skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h
+ skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+@@ -1092,8 +1091,6 @@
+ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h
+ zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h
+ zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h
+ zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
+diff -urN gpsbabel-1.4.2.old/shape.c gpsbabel-1.4.2/shape.c
+--- gpsbabel-1.4.2.old/shape.c 2011-06-10 10:30:54.932410016 +0200
++++ gpsbabel-1.4.2/shape.c 2011-06-10 10:42:08.802985475 +0200
+@@ -20,7 +20,7 @@
+
+ */
+ #include "defs.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+
+ #if SHAPELIB_ENABLED
+ static SHPHandle ihandle;
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch
new file mode 100644
index 00000000000..2373fe125c8
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch
@@ -0,0 +1,14 @@
+diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-xmldoc/Makefile.in
+--- gpsbabel-1.4.2/Makefile.in 2011-01-11 17:57:47.075777307 +0100
++++ gpsbabel-1.4.2-xmldoc/Makefile.in 2011-01-11 17:58:53.134094491 +0100
+@@ -234,8 +234,8 @@
+ xsltproc \
+ --output $@ \
+ --stringparam toc.section.depth "1" \
+- --stringparam html.stylesheet \
+- "http://www.gpsbabel.org/style3.css" \
++ --nonet \
++ --stringparam html.stylesheet "gpsbabel.org-style3.css" \
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \
+ xmldoc/readme.xml
+
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
new file mode 100644
index 00000000000..08db006bd4d
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2 autotools
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="http://www.gpsbabel.org/"
+SRC_URI="
+ mirror://gentoo/${P}.tar.gz
+ doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE="doc qt4"
+
+RDEPEND="
+ dev-libs/expat
+ sci-libs/shapelib
+ virtual/libusb:0
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtwebkit:4
+ )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-lang/perl
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.1.2
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable_statistic_uploading.patch"
+ "${FILESDIR}/${PN}-disable_update_check.patch"
+ "${FILESDIR}/${PN}-disable_version_check.patch"
+ "${FILESDIR}/${P}-fix_binary_name.patch"
+ "${FILESDIR}/${PN}-freebsd.patch"
+ "${FILESDIR}/${PN}-use_system_shapelib.patch"
+ "${FILESDIR}/${PN}-xmldoc.patch"
+)
+
+src_prepare() {
+ epatch ${PATCHES[@]}
+ epatch_user
+ rm -rf shapelib || die
+
+ use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with doc doc "${S}"/doc/manual) \
+ --with-zlib=system
+
+ if use qt4; then
+ pushd "${S}/gui" > /dev/null || die
+ lrelease *.ts || die
+ eqmake4
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ emake
+ if use qt4; then
+ pushd "${S}/gui" > /dev/null || die
+ emake
+ popd > /dev/null
+ fi
+
+ if use doc; then
+ perl xmldoc/makedoc || die
+ emake gpsbabel.html
+ fi
+}
+
+src_install() {
+ default
+ dodoc README*
+
+ if use qt4; then
+ dobin gui/objects/gpsbabelfe
+ insinto /usr/share/qt4/translations/
+ doins gui/gpsbabel*_*.qm
+ newicon gui/images/appicon.png ${PN}.png
+ make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+ fi
+
+ if use doc; then
+ dohtml gpsbabel.*
+ fi
+}
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
new file mode 100644
index 00000000000..e159c204ca3
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2 autotools
+
+DESCRIPTION="GPS waypoints, tracks and routes converter"
+HOMEPAGE="http://www.gpsbabel.org/"
+SRC_URI="
+ http://dev.gentoo.org/~patrick/${P}.tar.gz
+ doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+IUSE="doc qt4"
+
+RDEPEND="
+ dev-libs/expat
+ sci-libs/shapelib
+ virtual/libusb:0
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtwebkit:4
+ )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-lang/perl
+ dev-libs/libxslt
+ app-text/docbook-xml-dtd:4.1.2
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-disable_statistic_uploading.patch"
+ "${FILESDIR}/${PN}-disable_update_check.patch"
+ "${FILESDIR}/${PN}-disable_version_check.patch"
+ "${FILESDIR}/${PN}-1.4.3-fix_binary_name.patch"
+ "${FILESDIR}/${PN}-freebsd.patch"
+ "${FILESDIR}/${PN}-use_system_shapelib.patch"
+ "${FILESDIR}/${PN}-xmldoc.patch"
+)
+
+src_prepare() {
+ epatch ${PATCHES[@]}
+ epatch_user
+ rm -rf shapelib || die
+
+ use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with doc doc "${S}"/doc/manual) \
+ --with-zlib=system
+
+ if use qt4; then
+ pushd "${S}/gui" > /dev/null || die
+ lrelease *.ts || die
+ eqmake4
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ emake
+ if use qt4; then
+ pushd "${S}/gui" > /dev/null || die
+ emake
+ popd > /dev/null
+ fi
+
+ if use doc; then
+ perl xmldoc/makedoc || die
+ emake gpsbabel.html
+ fi
+}
+
+src_install() {
+ default
+ dodoc README*
+
+ if use qt4; then
+ dobin gui/objects/gpsbabelfe
+ insinto /usr/share/qt4/translations/
+ doins gui/gpsbabel*_*.qm
+ newicon gui/images/appicon.png ${PN}.png
+ make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
+ fi
+
+ if use doc; then
+ dohtml gpsbabel.*
+ fi
+}
diff --git a/sci-geosciences/gpsbabel/metadata.xml b/sci-geosciences/gpsbabel/metadata.xml
new file mode 100644
index 00000000000..5f27678c144
--- /dev/null
+++ b/sci-geosciences/gpsbabel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+</pkgmetadata>
diff --git a/sci-geosciences/gpscorrelate/Manifest b/sci-geosciences/gpscorrelate/Manifest
new file mode 100644
index 00000000000..6c7b82318df
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/Manifest
@@ -0,0 +1 @@
+DIST gpscorrelate-1.6.1.tar.gz 154531 RMD160 a0642c882e347793488a3b279a9b4384ce8ae57a SHA1 f7f0b42018759ee42b31113a70e17764f21e0de4 SHA256 966285c0a6df5ac2cc63c1f9650e65c70e303cf11d08dc283357bcd745cb5201
diff --git a/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
new file mode 100644
index 00000000000..f48dba1882f
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/files/gpscorrelate-1.6.1-makefile.patch
@@ -0,0 +1,47 @@
+diff -urN gpscorrelate-1.6.1.old/Makefile gpscorrelate-1.6.1/Makefile
+--- gpscorrelate-1.6.1.old/Makefile 2011-06-08 13:51:06.000000000 +0200
++++ gpscorrelate-1.6.1/Makefile 2011-06-08 14:13:18.000000000 +0200
+@@ -4,11 +4,15 @@
+
+ COBJS = main-command.o unixtime.o gpx-read.o correlate.o exif-gps.o
+ GOBJS = main-gui.o gui.o unixtime.o gpx-read.o correlate.o exif-gps.o
+-CFLAGS = -Wall
+-override CFLAGS += $(shell pkg-config --cflags libxml-2.0 gtk+-2.0) -I/usr/include/exiv2
+-OFLAGS = -Wall
+-override OFLAGS += $(shell pkg-config --libs libxml-2.0 gtk+-2.0) -lm -lexiv2
+-prefix = /usr/local
++CFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2
++CXXFLAGS += $(shell pkg-config --cflags libxml-2.0) -I/usr/include/exiv2
++CLIBS = $(shell pkg-config --libs libxml-2.0) -lm -lexiv2 -lstdc++
++ifdef BUILD_GUI
++CXXFLAGS += $(shell pkg-config --cflags gtk+-2.0)
++CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
++CLIBS += $(shell pkg-config --libs gtk+-2.0)
++endif
++prefix ?= /usr/local
+ bindir = $(prefix)/bin
+ datadir = $(prefix)/share
+ mandir = $(datadir)/man
+@@ -18,16 +22,16 @@
+ all: gpscorrelate gpscorrelate-gui gpscorrelate.1
+
+ gpscorrelate: $(COBJS)
+- g++ $(OFLAGS) -o $@ $(COBJS)
++ $(CXX) $(LDFLAGS) $(COBJS) $(CLIBS) -o $@
+
+ gpscorrelate-gui: $(GOBJS)
+- g++ $(OFLAGS) -o $@ $(GOBJS)
++ $(CXX) $(LDFLAGS) $(GOBJS) $(CLIBS) -o $@
+
+-.c.o:
+- gcc $(CFLAGS) -c -o $*.o $<
++%.o: %.c
++ $(CC) -c -o $@ $< $(CFLAGS)
+
+-.cpp.o:
+- g++ $(CFLAGS) -c -o $*.o $<
++%.o: %.cpp $(DEPS)
++ $(CXX) -c -o $@ $< $(CXXFLAGS)
+
+ clean:
+ rm -f *.o gpscorrelate{,.exe} gpscorrelate-gui{,.exe}
diff --git a/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
new file mode 100644
index 00000000000..9de48fcb77c
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/gpscorrelate-1.6.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool for adjusting EXIF tags of your photos with a recorded GPS trace"
+HOMEPAGE="http://freefoote.dview.net/linux_gpscorr.html"
+SRC_URI="http://freefoote.dview.net/linux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="doc gtk"
+
+RDEPEND="dev-libs/libxml2:2
+ media-gfx/exiv2
+ gtk? ( x11-libs/gtk+:2 )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/libxslt
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.6.1-makefile.patch"
+}
+
+src_compile() {
+ tc-export CC CXX
+ local opts="gpscorrelate gpscorrelate.1"
+ use gtk && opts+=" gpscorrelate-gui BUILD_GUI=1"
+ emake ${opts}
+}
+
+src_install() {
+ dobin ${PN}
+ if use gtk; then
+ dobin ${PN}-gui
+ doicon ${PN}-gui.svg
+ domenu ${PN}.desktop
+ fi
+ if use doc; then
+ dohtml doc/*
+ fi
+ doman ${PN}.1
+}
diff --git a/sci-geosciences/gpscorrelate/metadata.xml b/sci-geosciences/gpscorrelate/metadata.xml
new file mode 100644
index 00000000000..3beda91ba20
--- /dev/null
+++ b/sci-geosciences/gpscorrelate/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
new file mode 100644
index 00000000000..ecc11bc23b5
--- /dev/null
+++ b/sci-geosciences/gpsd/Manifest
@@ -0,0 +1,10 @@
+DIST gpsd-2.95.tar.gz 1385681 SHA256 832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae SHA512 f48dd0a2942e39de0b1d38a8979e123edbd39de05e2786419433826dfbf9de579fcb9b2c179385bc84313817a4266fd76560253b4e67e2daf419618699abbf98 WHIRLPOOL e9da24e45efee327f8849a4f52e39ebd7d2ce06a0d7372a3b11baee68129e72be62bfd4a5b0ed181cae1b693722bd551ab1337fcdce9dbfc80a091df283329ac
+DIST gpsd-2.96bis.tar.gz 1554605 SHA256 c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690 SHA512 a6ba88b3907293d13032bb623de321b36dfc3fec25502cafa22924c4d0ff187b46f192d27effa9b4214cba3de16dd3c7c0a0fc6d5ba411e2799acb8b3e832aa4 WHIRLPOOL 0fd1471e819759f055ec389d0236c7894f107062331325cb520d60c16431339eabc616019e96270ed54f9defc34a5ed45927977e6e62a16730a0b0decf6552ed
+DIST gpsd-3.10.tar.gz 1566622 SHA256 706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320 SHA512 fd452185a8a9f9b8dfb2a5c2d5b6410f795d56dc46a7c216d8fcd686e43c5555a5f0421434060e9bb7afa465bb8a45a1e358108c4de42300eeb972caa334d8b6 WHIRLPOOL 52aa2285eff48f72a3e554c40bdb2b521bc36e35680a928d7ee53f3b55578d8451a573f4c75dcadc905eba7c48b41b5a317704aaf17b9699b614595560011514
+DIST gpsd-3.11.tar.gz 1579600 SHA256 ed66c6b6b1e2b4951de2c0b2399c22f77fe9f5927ef6b948dd8eb023ff53b7ee SHA512 bf600ea99635d415916c2a3043f56e61bda023ba320a15f33cd47b375c772dbec69aa941c4729914ccd6a868488cd6bd9f35d4067af9e353def743f45636e6f4 WHIRLPOOL 12a9fde832d611d129f48919d10c4a48f7da1e664d49844d4317e3b9511dee9810884f4b23036ebf576e7870b56091767a4f6c0237a8091643abb637642ee2b8
+DIST gpsd-3.13.tar.gz 1382857 SHA256 d30bbe31ef9f89d2c281197c64204bcff255883462318250f913444ae00874c1 SHA512 339e752ae6a06272082e8a4f97915001aeee4deecd956ace1be862f9e3734b7663407c4a6a41ac00e7de195771da55fb26b93ec152abd8251a0d7a13cb8ad51e WHIRLPOOL 94da0e11c7a0c33f3215f5de836f8739c394a03c561933abff9ce325e4238f4d85e29f664f592e7c09ba16d35e92b5e275a75090e5600a01d983fa81f12fa3af
+DIST gpsd-3.15.tar.gz 1410534 SHA256 81c89e271ae112313e68655ab30d227bc38fe7841ffbff0f1860b12a9d7696ea SHA512 2be83cac52b5034bca44374cf7e17917270fe50495014f424d46a171bc77b58f9c5eb8ea38fe0cff9a28a6c2b6b8e5bf17a5a141eb9243962319a1ae9da2ea04 WHIRLPOOL 323dc3336372d318ade9549ad401fa588e9abd3d01add750892fa028bf8f6837342ba76f6f85ebf715329517d314f9fe63429460ea1a639000124437f761fb8c
+DIST gpsd-3.6.tar.gz 1449822 SHA256 53a078dd547a17c4eeb0529a6d6eb338dac217811caf9644a0194184219494cc SHA512 a31114f68e9481d68bfb45d90286181eb47083c58a1e1cfae78b73ead36b448050b97a0b31131a58197f32adba4eeb6f798f3c4e55e928536cd68648d5860e18 WHIRLPOOL ef4f569ed32cba0e6c39726dfd6636292f38f4fe45b95035b4c20fd03eb569d12f228b468ba00e35dfd5e3bf4eda84cf3506d418cc553b55b882fa4e15277350
+DIST gpsd-3.7.tar.gz 1460424 SHA256 7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac SHA512 fc6edad8694a62ead2018e78ba5f3033dcc960b89fea7fbc781493b951ff8a3024cfa56a18c96cca747a3394885cdb24e5fce358e8f6a1a17fd4a3248228937f WHIRLPOOL 592908b39f248e68ceb6d2a1b14fa62401388e674aa5cdc901aa8e7caaf6fe5da742cd77530ddb00c5789e2372fdb8a46af9d946af89d6e560457c4eaa5cd92f
+DIST gpsd-3.8.tar.gz 1516959 SHA256 5f9add9a378a3cd1c0f641e0def49fc3f14fb700c9fca573e07d17b3e5957c23 SHA512 9df968db33346852c9779ce4670d97c77f018c3254661cc709a30b693f1a10602f5f08eb1d2c19dab46747a6f88f9d8be7464d3ea854f3bfc760cc94c3b2e57a WHIRLPOOL 64feb051b2aa637d6da978221f84f046078c29f43f1b68429cd617fb773b8b539a34948e215f18b372050b9e50c0f9c68d22f2b9ec20207899bebb9048e30270
+DIST gpsd-3.9.tar.gz 1518775 SHA256 d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a SHA512 082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f WHIRLPOOL 1d3c70bfe5b4b8dec5dc4119287afb7ca4f426041f49c43b167b9e7f85c3995bfcb3bbf777cbe479ef353f1d485e54c891e732fd6871b6dbe9874d8d3c7fa6d1
diff --git a/sci-geosciences/gpsd/files/2.95-disable-strip.patch b/sci-geosciences/gpsd/files/2.95-disable-strip.patch
new file mode 100644
index 00000000000..734853968b7
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.95-disable-strip.patch
@@ -0,0 +1,10 @@
+--- gpsd-2.95/Makefile.am 2010-07-12 02:40:22.000000000 +0200
++++ gpsd-2.95.new/Makefile.am 2010-10-03 18:04:10.000000000 +0200
+@@ -340,6 +340,7 @@
+ "QMAKE_CC=$(CC)" \
+ "QMAKE_CFLAGS+=$(CFLAGS)" \
+ "QMAKE_LFLAGS+=$(LDFLAGS)" \
++ "QMAKE_STRIP=" \
+ "VERSION=$(libgps_VERSION)" \
+ "TARGET_LIBDIR=${libdir}" \
+ "TARGET_INCLUDEDIR=${includedir}"
diff --git a/sci-geosciences/gpsd/files/2.95-fix-ldflags.patch b/sci-geosciences/gpsd/files/2.95-fix-ldflags.patch
new file mode 100644
index 00000000000..bcb8bdb3a1e
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.95-fix-ldflags.patch
@@ -0,0 +1,12 @@
+diff -urN gpsd-2.95//Makefile.am gpsd-2.95.new//Makefile.am
+--- gpsd-2.95//Makefile.am 2010-07-12 02:40:22.000000000 +0200
++++ gpsd-2.95.new//Makefile.am 2010-10-03 18:12:23.000000000 +0200
+@@ -137,7 +137,7 @@
+ libgps_VERSION__REVISION = 0
+ libgps_VERSION_AGE = 0
+ libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
+-libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
++libgps_la_LDFLAGS = ${LDFLAGS} -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
+ lib_LTLIBRARIES = libgps.la libgpsd.la
+
+ libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
diff --git a/sci-geosciences/gpsd/files/2.96-fix-ldflags.patch b/sci-geosciences/gpsd/files/2.96-fix-ldflags.patch
new file mode 100644
index 00000000000..f643a359df8
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.96-fix-ldflags.patch
@@ -0,0 +1,21 @@
+diff -urN gpsd-2.96.old/Makefile.am gpsd-2.96/Makefile.am
+--- gpsd-2.96.old/Makefile.am 2011-05-16 11:41:11.763256750 +0200
++++ gpsd-2.96/Makefile.am 2011-05-16 11:44:02.742119221 +0200
+@@ -130,7 +130,7 @@
+ libgps_VERSION_REVISION = 0
+ libgps_VERSION_AGE = 0
+ libgps_VERSION_NUMBER = $(libgps_VERSION_CURRENT):$(libgps_VERSION_REVISION):$(libgps_VERSION_AGE)
+-libgps_la_LDFLAGS = -version-number $(libgps_VERSION_NUMBER)
++libgps_la_LDFLAGS = $(LDFLAGS) -version-number $(libgps_VERSION_NUMBER)
+ lib_LTLIBRARIES = libgps.la libgpsd.la
+
+ libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
+@@ -425,7 +425,7 @@
+ # Build test_qgpsmm
+ #
+ test_qgpsmm_SOURCES = test_gpsmm.cpp
+-test_qgpsmm_LDFLAGS = -Wl,-rpath,$(srcdir)/libQgpsmm/binaries
++test_qgpsmm_LDFLAGS = $(LDFLAGS) -Wl,-rpath,$(srcdir)/libQgpsmm/binaries
+ test_qgpsmm_LDADD = $(LIBC) $(LIBUSB) $(QtNetwork_LIBS) libgps.la -LlibQgpsmm/binaries -lQgpsmm
+ test_qgpsmm_DEPENDENCIES = libQgpsmm/binaries/libQgpsmm.so
+ endif
diff --git a/sci-geosciences/gpsd/files/2.96-fix-tests.patch b/sci-geosciences/gpsd/files/2.96-fix-tests.patch
new file mode 100644
index 00000000000..38aec0024b0
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.96-fix-tests.patch
@@ -0,0 +1,23 @@
+diff -urN gpsd-2.96.old//Makefile.am gpsd-2.96//Makefile.am
+--- gpsd-2.96.old//Makefile.am 2011-05-16 11:41:11.763256750 +0200
++++ gpsd-2.96//Makefile.am 2011-05-16 12:37:34.095971771 +0200
+@@ -615,8 +615,8 @@
+ pkgconfigdir = $(libdir)/pkgconfig
+
+ # These are not distributed
+-libgps: libgps_core.c gps.h .libs/libgps.a
+- $(CC) $(CFLAGS) -o libgps $(LIBM) -DTESTMAIN $(LIBPTHREAD) -g libgps_core.c .libs/libgps.a
++libgps: libgps_core.c gps.h .libs/libgps.so
++ $(CC) $(CFLAGS) $(LDFLAGS) -o libgps $(LIBM) -DTESTMAIN $(LIBPTHREAD) -g libgps_core.c .libs/libgps.so
+
+
+ # Report splint warnings
+@@ -720,7 +720,7 @@
+
+ # Use make REGRESSOPTS=-u to force running with UDP rather than pty devices
+
+-run_regress_driver = PYTHON=$(PYTHON) $(srcdir)/regress-driver $(REGRESSOPTS)
++run_regress_driver = PYTHON=$(PYTHON) LD_LIBRARY_PATH="./.libs/" $(srcdir)/regress-driver $(REGRESSOPTS)
+
+ # Regression-test the daemon
+ gps-regress: gpsd stamp-python
diff --git a/sci-geosciences/gpsd/files/2.96-pkgconfig.patch b/sci-geosciences/gpsd/files/2.96-pkgconfig.patch
new file mode 100644
index 00000000000..b829c473011
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.96-pkgconfig.patch
@@ -0,0 +1,37 @@
+Index: gpsd-2.96/configure.ac
+===================================================================
+--- gpsd-2.96.orig/configure.ac
++++ gpsd-2.96/configure.ac
+@@ -687,12 +687,7 @@ AC_MSG_CHECKING([for BlueZ support])
+ if test x"$ac_bluetooth" = x"yes"; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE(HAVE_BLUEZ,1,[Define if we have Bluez])
+- # Older versions of autotools barf and die on this.
+- #PKG_CHECK_MODULES(BLUEZ, bluez )
+- BLUEZ_CFLAGS=`pkg-config --cflags bluez`
+- BLUEZ_LIBS=`pkg-config --libs bluez`
+- AC_SUBST(BLUEZ_CFLAGS)
+- AC_SUBST(BLUEZ_LIBS)
++ PKG_CHECK_MODULES(BLUEZ, bluez )
+ else
+ AC_MSG_RESULT([no])
+ fi
+@@ -709,16 +704,8 @@ AC_MSG_CHECKING([for DBUS support])
+ if test x"$ac_dbus" = "xyes"; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([DBUS_ENABLE], 1, [DBUS support])
+- # Older versions of autotools barf and die on this.
+- #PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.23.4 )
+- DBUS_CFLAGS=`pkg-config --cflags dbus-glib-1`
+- DBUS_LIBS=`pkg-config --libs dbus-1`
+- AC_SUBST(DBUS_CFLAGS)
+- AC_SUBST(DBUS_LIBS)
+- #PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.22 )
+- DBUS_GLIB_LIBS=`pkg-config --libs dbus-glib-1`
+- AC_SUBST(DBUS_GLIB_CFLAGS)
+- AC_SUBST(DBUS_GLIB_LIBS)
++ PKG_CHECK_MODULES(DBUS, dbus-1 >= 0.23.4 )
++ PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.22 )
+ else
+ AC_MSG_RESULT([no])
+ fi
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch b/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch
new file mode 100644
index 00000000000..3ea68386e2f
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.10-dbus.patch
@@ -0,0 +1,32 @@
+From efaf7972ca95ff52464dedfe30bafa45095d299e Mon Sep 17 00:00:00 2001
+From: Bernd Zeimetz <bernd@bzed.de>
+Date: Sat, 23 Nov 2013 02:56:22 +0100
+Subject: [PATCH] Make it build abain with dbus enabled.
+
+This reverts a bad change to SConstruct in 57e9bdea.
+
+It still leaves the issue that scons links all file sstaically now.
+---
+ SConstruct | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index 290910b..51b07e1 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -968,7 +968,11 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs
+ # linking
+ # The final executable will build but not be portable.
+
+-env.StaticLibrary(target = 'libgps.a', source = libgps_sources)
++env.StaticLibrary(target='libgps.a',
++ source=libgps_sources,
++ parse_flags=dbus_libs + rtlibs)
++
++
+
+ # Source groups
+
+--
+1.8.4.3
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch b/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch
new file mode 100644
index 00000000000..e87eff8a564
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.10-nmea-disabled.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/493022
+
+From c31095e1562494a74d56b46fcc01541d1444cd5c Mon Sep 17 00:00:00 2001
+From: Simon Dawson <spdawson@gmail.com>
+Date: Sun, 8 Dec 2013 10:31:25 +0000
+Subject: [PATCH] gpsmon: fix build when nmea is false
+
+When nmea is False and ncurses support is enabled, the build fails as
+follows.
+
+gpsmon.o: In function `gpsmon_hook':
+gpsmon.c:(.text+0x974): undefined reference to `driver_nmea0183'
+collect2: error: ld returned 1 exit status
+scons: *** [gpsmon] Error 1
+scons: building terminated because of errors.
+
+The problem appears to be a failure to protect use of the driver_nmea0183
+variable with appropriate #ifdef guards.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
+---
+ gpsmon.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gpsmon.c b/gpsmon.c
+index de1f14b..b030979 100644
+--- a/gpsmon.c
++++ b/gpsmon.c
+@@ -36,7 +36,9 @@ extern struct monitor_object_t garmin_mmt, garmin_bin_ser_mmt;
+ extern struct monitor_object_t italk_mmt, ubx_mmt, superstar2_mmt;
+ extern struct monitor_object_t fv18_mmt, gpsclock_mmt, mtk3301_mmt;
+ extern struct monitor_object_t oncore_mmt, tnt_mmt, aivdm_mmt;
++#ifdef NMEA_ENABLE
+ extern const struct gps_type_t driver_nmea0183;
++#endif /* NMEA_ENABLE */
+
+ /* These are public */
+ struct gps_device_t session;
+@@ -477,9 +479,11 @@ static void select_packet_monitor(struct gps_device_t *device)
+ */
+ if (device->packet.type != last_type) {
+ const struct gps_type_t *active_type = device->device_type;
++#ifdef NMEA_ENABLE
+ if (device->packet.type == NMEA_PACKET
+ && ((device->device_type->flags & DRIVER_STICKY) != 0))
+ active_type = &driver_nmea0183;
++#endif /* NMEA_ENABLE */
+ if (!switch_type(active_type))
+ longjmp(terminate, TERM_DRIVER_SWITCH);
+ else {
+--
+2.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch
new file mode 100644
index 00000000000..8d4a309f095
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.10-rpath.patch
@@ -0,0 +1,13 @@
+don't set the -rpath flag to the install dir as this breaks DESTDIR
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -287,7 +287,7 @@ def installdir(dir, add_destdir=True):
+ # Honor the specified installation prefix in link paths.
+ if env["sysroot"]:
+ env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir', add_destdir=False)])
+-if env["shared"]:
++if env["shared"] and env["chrpath"]:
+ env.Prepend(RPATH=[installdir('libdir')])
+
+ # Give deheader a way to set compiler flags
diff --git a/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch b/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch
new file mode 100644
index 00000000000..5d81466b970
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.10-udev-install.patch
@@ -0,0 +1,40 @@
+From 6821edb2d40956e5f93a80420ae1dbf825b95281 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 11 Mar 2013 13:26:57 -0400
+Subject: [PATCH] fix DESTDIR handling with udev rules install again
+
+Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR
+logic when upgrading the udev path handling.
+
+I fixed that with commit a41cd69c87e312198834a2e6232134176c9352e5.
+
+It's been reverted yet again in an unrelated commit
+57e9bdeae2f00664616ee1d9a936a5cfe27bfd30. Why do people keep doing this?
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 51b07e1..caed21e 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1790,10 +1790,10 @@ if env['python']:
+ # is plugged in.
+
+ Utility('udev-install', 'install', [
+- 'mkdir -p ' + env['udevdir'],
+- 'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules',
+- 'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'],
+- 'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug',
++ 'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d',
++ 'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules',
++ 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
++ 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug',
+ ])
+
+ Utility('udev-uninstall', '', [
+--
+1.8.4.3
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch b/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch
new file mode 100644
index 00000000000..a2b96f4d01a
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.11-hotplug-config.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/511584
+
+From 2c0c2d90cbe450d208b320359b55089a441ff52a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 30 Oct 2014 17:17:41 -0400
+Subject: [PATCH] udev rules: source Gentoo config files
+
+---
+ gpsd.hotplug | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gpsd.hotplug b/gpsd.hotplug
+index dd0deaf..5f4ce13 100644
+--- a/gpsd.hotplug
++++ b/gpsd.hotplug
+@@ -24,6 +24,8 @@ export PATH
+
+ if [ -r /etc/default/gpsd ]; then
+ . /etc/default/gpsd
++elif [ -r /etc/conf.d/gpsd ]; then
++ . /etc/conf.d/gpsd
+ elif [ -r /etc/sysconfig/gpsd ]; then
+ . /etc/sysconfig/gpsd
+ GPSD_OPTIONS=$OPTIONS
+--
+2.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.11-no-ntpshm.patch b/sci-geosciences/gpsd/files/gpsd-3.11-no-ntpshm.patch
new file mode 100644
index 00000000000..c53eeca907b
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.11-no-ntpshm.patch
@@ -0,0 +1,97 @@
+From 80cd103396fcd1185a476761bfb267ce12f64b32 Mon Sep 17 00:00:00 2001
+From: Simon Dawson <spdawson@gmail.com>
+Date: Mon, 25 Aug 2014 10:31:18 +0100
+Subject: [PATCH] Fix build error when ntpshm is false
+
+The build fails as follows
+
+libgpsd_core.c: In function 'ntpshm_latch':
+libgpsd_core.c:1660:24: error: 'const struct gps_type_t' has no member named 'time_offset'
+ || device->device_type->time_offset == NULL)
+ ^
+libgpsd_core.c:1663:33: error: 'const struct gps_type_t' has no member named 'time_offset'
+ fix_time += device->device_type->time_offset(device);
+ ^
+scons: *** [libgpsd_core.os] Error 1
+
+The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+---
+ libgpsd_core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libgpsd_core.c b/libgpsd_core.c
+index 6ec08a4..f7e8075 100644
+--- a/libgpsd_core.c
++++ b/libgpsd_core.c
+@@ -1638,6 +1638,7 @@ void gpsd_zero_satellites( /*@out@*/ struct gps_data_t *out)
+ #endif
+ }
+
++#ifdef NTPSHM_ENABLE
+ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
+ /* latch the fact that we've saved a fix */
+ {
+@@ -1668,5 +1669,6 @@ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td)
+ device->last_fixtime.clock = td->clock.tv_sec + td->clock.tv_nsec / 1e9;
+ #endif /* S_SPLINT_S */
+ }
++#endif /* NTPSHM_ENABLE */
+
+ /* end */
+--
+2.1.2
+
+From 48caee55069bdb7f7115e1930ace3914f4ddfe3b Mon Sep 17 00:00:00 2001
+From: Simon Dawson <spdawson@gmail.com>
+Date: Wed, 3 Sep 2014 18:43:31 +0100
+Subject: [PATCH] Complete wrapping of ntpshm_latch function in #ifdef
+ NTPSHM_ENABLE
+
+Currently, the build fails as follows
+
+gpsmon.o: In function `gpsmon_hook':
+gpsmon.c:(.text+0x8b0): undefined reference to `ntpshm_latch'
+collect2: error: ld returned 1 exit status
+scons: *** [gpsmon] Error 1
+
+Addresses Sacannah bug #43129: ntpshm patch is incomplete.
+
+Signed-off-by: Simon Dawson <spdawson@gmail.com>
+---
+ gpsd.h-tail | 2 ++
+ gpsmon.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/gpsd.h-tail b/gpsd.h-tail
+index 7b62ce1..7b44f91 100644
+--- a/gpsd.h-tail
++++ b/gpsd.h-tail
+@@ -857,7 +857,9 @@ extern unsigned int ais_binary_encode(struct ais_t *ais, /*@out@*/unsigned char
+ extern void ntpshm_context_init(struct gps_context_t *);
+ extern void ntpshm_session_init(struct gps_device_t *);
+ extern int ntpshm_put(struct gps_device_t *, int, struct timedrift_t *);
++#ifdef NTPSHM_ENABLE
+ extern void ntpshm_latch(struct gps_device_t *device, /*@out@*/struct timedrift_t *td);
++#endif /* NTPSHM_ENABLE */
+ extern void ntpshm_link_deactivate(struct gps_device_t *);
+ extern void ntpshm_link_activate(struct gps_device_t *);
+
+diff --git a/gpsmon.c b/gpsmon.c
+index c812063..909f271 100644
+--- a/gpsmon.c
++++ b/gpsmon.c
+@@ -734,8 +734,10 @@ static void gpsmon_hook(struct gps_device_t *device, gps_mask_t changed UNUSED)
+
+ report_unlock();
+
++#ifdef NTPSHM_ENABLE
+ /* Update the last fix time seen for PPS. FIXME: do this here? */
+ ntpshm_latch(device, &td);
++#endif /* NTPSHM_ENABLE */
+ }
+ /*@+observertrans +nullpass +globstate +compdef +uniondef@*/
+
+--
+2.1.2
diff --git a/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch
new file mode 100644
index 00000000000..7615b8b5d73
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.11-rpath.patch
@@ -0,0 +1,12 @@
+don't set the -rpath flag to the install dir as this breaks DESTDIR
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -287,7 +287,7 @@
+
+ # Don't hack RPATH unless libdir points somewhere that is not on the
+ # minimum default load path.
+-if env["shared"]:
++if env["shared"] and env["chrpath"]:
+ if env["libdir"] not in ["/usr/lib", "/lib"]:
+ env.Prepend(RPATH=[installdir('libdir')])
diff --git a/sci-geosciences/gpsd/files/gpsd-3.13-ntpshm.patch b/sci-geosciences/gpsd/files/gpsd-3.13-ntpshm.patch
new file mode 100644
index 00000000000..c931ad1aa21
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.13-ntpshm.patch
@@ -0,0 +1,25 @@
+From 861d148321aafa3f7dadb1da4f507da83ba2f846 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 26 Feb 2015 17:39:23 -0500
+Subject: [PATCH] ntpshm: fix status type
+
+---
+ ntpshm.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ntpshm.h b/ntpshm.h
+index c8cd3b6..45648a8 100644
+--- a/ntpshm.h
++++ b/ntpshm.h
+@@ -60,7 +60,7 @@ enum segstat_t {
+ OK, NO_SEGMENT, NOT_READY, BAD_MODE, CLASH};
+
+ struct shm_stat_t {
+- int status;
++ enum segstat_t status;
+ struct timespec tvc, tvr, tvt;
+ int precision;
+ int leap;
+--
+2.3.0
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch b/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch
new file mode 100644
index 00000000000..ec68a3c21a9
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.15-broken-install.patch
@@ -0,0 +1,28 @@
+From 798629da485b9504dbb5bd5c96c9ea1d3454ebe3 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 7 Jun 2015 13:39:55 -0400
+Subject: [PATCH] Revert "# Work arount a minor bug in InstallSharedLib() link
+ handling"
+
+This reverts commit 0532106c1ea0807922ea6f868fcde384f22d4e92 as it breaks
+parallel installs. The original commit itself contains no real details.
+---
+ SConstruct | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 39a6b6a..c8a977e 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1336,8 +1336,6 @@ if env["ncurses"]:
+ binaryinstall.append(env.Install(installdir('bindir'), [cgps, gpsmon]))
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpsdlib, libgps_version))
+-# Work arount 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))
+--
+2.4.1
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch b/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch
new file mode 100644
index 00000000000..9461a666b03
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.15-dynamic-libs.patch
@@ -0,0 +1,100 @@
+From ac48583654e97ef04e8cbb52c2ae77a617c7add3 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 7 Jun 2015 01:08:39 -0400
+Subject: [PATCH] reenable dynamic libs
+
+Upstream decided to staticly link their own programs against their libs
+instead of using the shared ones. Restore dynamic linking to save space
+and such.
+---
+ SConstruct | 64 ++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 35 insertions(+), 29 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 28cebf0..a050f38 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -961,6 +961,9 @@ if qt_env:
+ gpsflags = ["-lm"] + rtlibs + dbusflags
+ gpsdflags = usbflags + bluezflags + gpsflags
+
++gpslibs = ["-lgps"] + gpsflags
++gpsdlibs = ["-lgpsd"] + gpsdflags + gpslibs
++
+ # Source groups
+
+ gpsd_sources = ['gpsd.c','timehint.c', 'shmexport.c','dbusexport.c']
+@@ -983,38 +986,41 @@ gpsmon_sources = [
+ ## Production programs
+
+ gpsd = env.Program('gpsd', gpsd_sources,
+- LIBS=['gpsd', 'gps_static'], LIBPATH='.',
+- parse_flags=gpsdflags+gpsflags)
++ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
++env.Depends(gpsd, [compiled_gpslib])
++
+ gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
+- LIBS=['gpsd', 'gps_static'], LIBPATH='.',
+- parse_flags=gpsdflags+gpsflags)
++ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
++env.Depends(gpsdecode, [compiled_gpslib])
++
+ gpsctl = env.Program('gpsctl', ['gpsctl.c'],
+- LIBS=['gpsd', 'gps_static'], LIBPATH='.',
+- parse_flags=gpsdflags+gpsflags)
++ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
++env.Depends(gpsctl, [compiled_gpslib])
++
+ gpsmon = env.Program('gpsmon', gpsmon_sources,
+- LIBS=['gpsd', 'gps_static'], LIBPATH='.',
+- parse_flags=gpsdflags + gpsflags + ncurseslibs)
+-gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'],
+- LIBS=['gps_static'], LIBPATH='.',
+- parse_flags=gpsflags)
+-gpspipe = env.Program('gpspipe', ['gpspipe.c'],
+- LIBS=['gps_static'], LIBPATH='.',
+- parse_flags=gpsflags)
+-gps2udp = env.Program('gps2udp', ['gps2udp.c'],
+- LIBS=['gps_static'], LIBPATH='.',
+- parse_flags=gpsflags)
+-gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'],
+- LIBS=['gps_static'], LIBPATH='.',
+- parse_flags=gpsflags)
+-lcdgps = env.Program('lcdgps', ['lcdgps.c'],
+- LIBS=['gps_static'], LIBPATH='.',
+- parse_flags=gpsflags)
+-cgps = env.Program('cgps', ['cgps.c'],
+- LIBS=['gps_static'], LIBPATH='.',
+- parse_flags=gpsflags + ncurseslibs)
+-ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'],
+- LIBS=['gps_static'], LIBPATH='.',
+- parse_flags=gpsflags)
++ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs)
++env.Depends(gpsmon, [compiled_gpslib])
++
++gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
++env.Depends(gpsdctl, compiled_gpslib)
++
++gpspipe = env.Program('gpspipe', ['gpspipe.c'], parse_flags=gpslibs)
++env.Depends(gpspipe, compiled_gpslib)
++
++gps2udp = env.Program('gps2udp', ['gps2udp.c'], parse_flags=gpslibs)
++env.Depends(gps2udp, compiled_gpslib)
++
++gpxlogger = env.Program('gpxlogger', ['gpxlogger.c'], parse_flags=gpslibs)
++env.Depends(gpxlogger, compiled_gpslib)
++
++lcdgps = env.Program('lcdgps', ['lcdgps.c'], parse_flags=gpslibs)
++env.Depends(lcdgps, compiled_gpslib)
++
++cgps = env.Program('cgps', ['cgps.c'], parse_flags=gpslibs + ncurseslibs)
++env.Depends(cgps, compiled_gpslib)
++
++ntpshmmon = env.Program('ntpshmmon', ['ntpshmmon.c'], parse_flags=gpslibs)
++env.Depends(ntpshmmon, compiled_gpslib)
+
+ binaries = [gpsd, gpsdecode, gpsctl, gpsdctl, gpspipe, gps2udp, gpxlogger, lcdgps, ntpshmmon]
+ if env["ncurses"]:
+--
+2.4.1
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
new file mode 100644
index 00000000000..b8d2cf02ee8
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.15-libgpsd.patch
@@ -0,0 +1,80 @@
+From 7b29fcb88a476daab12957ac22512edf66aee813 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 7 Jun 2015 01:08:48 -0400
+Subject: [PATCH] reenable libgpsd
+
+Upstream has decided to drop the shared libgpsd (since it wasn't used
+externally anymore), but this also meant they statically link the code
+into every app. Re-enable the shared lib so that the various runtime
+programs can continue to share and save on resources.
+---
+ SConstruct | 25 +++++++++++++------------
+ 1 file changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index a050f38..53f697d 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -903,7 +903,7 @@ else:
+ obj_list = []
+ for s in Flatten(sources):
+ if type(s) is str:
+- obj_list.append(env.SharedObject(s))
++ obj_list.append(env.SharedObject(s, parse_flags=parse_flags))
+ else:
+ obj_list.append(s)
+ return env.SharedLibrary(target=target,
+@@ -925,9 +925,11 @@ static_gpslib = env.StaticLibrary("gps_static",
+ [env.StaticObject(s) for s in libgps_sources],
+ rtlibs)
+
+-compiled_gpsdlib = env.StaticLibrary(target="gpsd",
+- source=[env.StaticObject(s, parse_flags=usbflags + bluezflags) for s in libgpsd_sources],
+- parse_flags=usbflags + bluezflags)
++compiled_gpsdlib = Library(env=env,
++ target="gpsd",
++ sources=libgpsd_sources,
++ version=libgps_version,
++ parse_flags=usbflags + rtlibs + bluezflags + ["-lgps"])
+
+ libraries = [compiled_gpslib, compiled_gpsdlib]
+
+@@ -985,21 +987,19 @@ gpsmon_sources = [
+
+ ## Production programs
+
+-gpsd = env.Program('gpsd', gpsd_sources,
+- LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
+-env.Depends(gpsd, [compiled_gpslib])
++gpsd = env.Program('gpsd', gpsd_sources, parse_flags=gpsdlibs)
++env.Depends(gpsd, [compiled_gpsdlib, compiled_gpslib])
+
+-gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'],
+- LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
+-env.Depends(gpsdecode, [compiled_gpslib])
++gpsdecode = env.Program('gpsdecode', ['gpsdecode.c'], parse_flags=gpsdlibs)
++env.Depends(gpsdecode, [compiled_gpsdlib, compiled_gpslib])
+
+ gpsctl = env.Program('gpsctl', ['gpsctl.c'],
+ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs)
+-env.Depends(gpsctl, [compiled_gpslib])
++env.Depends(gpsctl, [compiled_gpslib, compiled_gpslib])
+
+ gpsmon = env.Program('gpsmon', gpsmon_sources,
+ LIBS=['gpsd'], parse_flags=gpsdflags+gpslibs + ncurseslibs)
+-env.Depends(gpsmon, [compiled_gpslib])
++env.Depends(gpsmon, [compiled_gpslib, compiled_gpslib])
+
+ gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
+ env.Depends(gpsdctl, compiled_gpslib)
+@@ -1339,6 +1339,7 @@ binaryinstall.append(env.Install(installdir('bindir'), [gpsdecode, gpsctl, gpsp
+ if env["ncurses"]:
+ binaryinstall.append(env.Install(installdir('bindir'), [cgps, gpsmon]))
+ binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpslib, libgps_version))
++binaryinstall.append(LibraryInstall(env, installdir('libdir'), compiled_gpsdlib, libgps_version))
+ # Work arount a minor bug in InstallSharedLib() link handling
+ env.AddPreAction(binaryinstall, 'rm -f %s/libgps.*' % (installdir('libdir'), ))
+
+--
+2.4.1
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch b/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch
new file mode 100644
index 00000000000..867b96b2da5
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-ldflags.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/391299
+
+split up linking flags into multiple arguments
+
+--- gpsd-3.3/SConstruct
++++ gpsd-3.3/SConstruct
+@@ -214,7 +214,7 @@
+ env.Replace(**{j: os.getenv(i)})
+ for flags in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+ if os.environ.has_key(flags):
+- env.MergeFlags({flags : [os.getenv(flags)]})
++ env.MergeFlags({flags : Split(os.getenv(flags))})
+
+
+ # Placeholder so we can kluge together something like VPATH builds.
diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-msocks-init.patch b/sci-geosciences/gpsd/files/gpsd-3.3-msocks-init.patch
new file mode 100644
index 00000000000..6b06864448c
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-msocks-init.patch
@@ -0,0 +1,33 @@
+fix from upstream git repo
+
+From e3d7f8b3f35442ae71dc95d776c900d2c29b215c Mon Sep 17 00:00:00 2001
+From: Yufeng Shen <miletus@chromium.org>
+Date: Tue, 15 Nov 2011 17:29:49 -0500
+Subject: [PATCH] Initialize msocks[2] to -1
+
+When SOCKET_EXPORT_ENABLE is not defined, msocks[2] can reach the
+point where it is used (put into all_fds to be monitored by select()),
+without initilization.
+
+Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
+---
+ gpsd.c | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/gpsd.c b/gpsd.c
+index 2d4090f..d342f5a 100644
+--- a/gpsd.c
++++ b/gpsd.c
+@@ -1762,7 +1762,8 @@ int main(int argc, char *argv[])
+ static char *pid_file = NULL;
+ struct gps_device_t *device;
+ fd_set rfds;
+- int i, option, msocks[2], dfd;
++ int i, option, dfd;
++ int msocks[2] = {-1, -1};
+ bool go_background = true;
+ struct timeval tv;
+ const struct gps_type_t **dp;
+--
+1.7.6.1
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch b/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch
new file mode 100644
index 00000000000..0bb4b3c8e0a
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-pkg-config.patch
@@ -0,0 +1,49 @@
+From b6ef265b49d973acc2295f46f0518e0644ba7dbb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 21 Nov 2011 16:05:27 -0500
+Subject: [PATCH] respect PKG_CONFIG in the build env
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index cb578fe..5bb0fed 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -214,8 +214,9 @@ env['PYTHON'] = sys.executable
+ # explicitly quote them or (better yet) use the "=" form of GNU option
+ # settings.
+ env['STRIP'] = "strip"
++env['PKG_CONFIG'] = "pkg-config"
+ env['CHRPATH'] = 'chrpath'
+-for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "CHRPATH", "LD", "TAR"]:
++for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "PKG_CONFIG", "CHRPATH", "LD", "TAR"]:
+ if os.environ.has_key(i):
+ j = i
+ if i == "LD":
+@@ -407,9 +408,9 @@ cxx = config.CheckCXX()
+ # define a helper function for pkg-config - we need to pass
+ # --static for static linking, too.
+ if env["shared"]:
+- pkg_config = lambda pkg: ['!pkg-config --cflags --libs %s' %(pkg, )]
++ pkg_config = lambda pkg: ['!%s --cflags --libs %s' %(env['PKG_CONFIG'], pkg, )]
+ else:
+- pkg_config = lambda pkg: ['!pkg-config --cflags --libs --static %s' %(pkg, )]
++ pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )]
+
+ # GCC isn't always named gcc, alas.
+ if env['CC'] == 'gcc' or (sys.platform.startswith('freebsd') and env['CC'] == 'cc'):
+@@ -339,7 +340,7 @@ if "help" in ARGLIST:
+
+ def CheckPKG(context, name):
+ context.Message( 'Checking for %s... ' % name )
+- ret = context.TryAction('pkg-config --exists \'%s\'' % name)[0]
++ ret = context.TryAction('%s --exists \'%s\'' % (env['PKG_CONFIG'], name))[0]
+ context.Result( ret )
+ return ret
+
+--
+1.7.6.1
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch b/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch
new file mode 100644
index 00000000000..29415590cae
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-release-rev.patch
@@ -0,0 +1,39 @@
+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
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-setup.py b/sci-geosciences/gpsd/files/gpsd-3.3-setup.py
new file mode 100644
index 00000000000..93cc5e8f214
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-setup.py
@@ -0,0 +1,17 @@
+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@,
+)
diff --git a/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch b/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch
new file mode 100644
index 00000000000..ef000bc2706
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.3-udev-install.patch
@@ -0,0 +1,31 @@
+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
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch b/sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch
new file mode 100644
index 00000000000..c9c1c7d109a
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.4-always-install-man-pages.patch
@@ -0,0 +1,36 @@
+From 918d6d8e5bac3981126cb01e673430cb7c96ec02 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 9 Feb 2012 16:51:24 -0500
+Subject: [PATCH] always install the man pages
+
+Since we maintain local copies, don't require xmlto/xsltproc in
+order to install them. This makes packaging simpler.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 9 ++++-----
+ 1 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index ab85b7d..fb08779 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1186,11 +1186,10 @@ if qt_env:
+
+
+ maninstall = []
+-if manbuilder:
+- for manpage in base_manpages.keys() + python_manpages.keys():
+- section = manpage.split(".")[1]
+- dest = os.path.join(installdir('mandir'), "man"+section, manpage)
+- maninstall.append(env.InstallAs(source=manpage, target=dest))
++for manpage in base_manpages.keys() + python_manpages.keys():
++ section = manpage.split(".")[1]
++ dest = os.path.join(installdir('mandir'), "man"+section, manpage)
++ maninstall.append(env.InstallAs(source=manpage, target=dest))
+ install = env.Alias('install', binaryinstall + maninstall + python_install + pc_install + headerinstall)
+
+ def Uninstall(nodes):
+--
+1.7.8.4
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-cfgetispeed.patch b/sci-geosciences/gpsd/files/gpsd-3.4-cfgetispeed.patch
new file mode 100644
index 00000000000..02abcb0e95d
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.4-cfgetispeed.patch
@@ -0,0 +1,47 @@
+From 38702bf0f4aaafdddde51393106eeaf720c1fc63 Mon Sep 17 00:00:00 2001
+From: Manuel Lauss <manuel.lauss@googlemail.com>
+Date: Fri, 13 Jan 2012 11:59:55 -0500
+Subject: [PATCH] serial: use cfgetispeed helpers
+
+Rather than poking c_ispeed directly, use the cfgetispeed helper. This
+is part of POSIX, and we already use cfsetispeed, so there shouldn't be
+any portability issues here.
+
+Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ serial.c | 9 +--------
+ 1 files changed, 1 insertions(+), 8 deletions(-)
+
+diff --git a/serial.c b/serial.c
+index c1464dd..8eb03ce 100644
+--- a/serial.c
++++ b/serial.c
+@@ -594,13 +594,8 @@ void gpsd_close(struct gps_device_t *session)
+ * them the first time. Economical, and avoids tripping over an
+ * obscure Linux 2.6 kernel bug that disables threaded
+ * ioctl(TIOCMWAIT) on a device after tcsetattr() is called.
+- *
+- * Unfortunately the termios struct doesn't have c_ispeed/c_ospeed
+- * on all architectures. Its missing on sparc, mips/mispel and hurd-i386 at least.
+ */
+-#if defined(_HAVE_STRUCT_TERMIOS_C_ISPEED)
+- if (session->ttyset_old.c_ispeed != session->ttyset.c_ispeed || (session->ttyset_old.c_cflag & CSTOPB) != (session->ttyset.c_cflag & CSTOPB)) {
+-#endif
++ if (cfgetispeed(&session->ttyset_old) != cfgetispeed(&session->ttyset) || (session->ttyset_old.c_cflag & CSTOPB) != (session->ttyset.c_cflag & CSTOPB)) {
+ /*@ ignore @*/
+ (void)cfsetispeed(&session->ttyset_old,
+ (speed_t) session->gpsdata.dev.baudrate);
+@@ -609,9 +604,7 @@ void gpsd_close(struct gps_device_t *session)
+ /*@ end @*/
+ (void)tcsetattr(session->gpsdata.gps_fd, TCSANOW,
+ &session->ttyset_old);
+-#if defined(_HAVE_STRUCT_TERMIOS_C_ISPEED)
+ }
+-#endif
+ gpsd_report(LOG_SPIN, "close(%d) in gpsd_close(%s)\n",
+ session->gpsdata.gps_fd, session->gpsdata.dev.path);
+ (void)close(session->gpsdata.gps_fd);
+--
+1.7.8.3
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-chrpath.patch b/sci-geosciences/gpsd/files/gpsd-3.4-chrpath.patch
new file mode 100644
index 00000000000..c509e2d2996
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.4-chrpath.patch
@@ -0,0 +1,69 @@
+From 63a44d0cb5494ed1078de411b55cb1c9a8307cec Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 18 Nov 2011 19:09:27 -0500
+Subject: [PATCH] make chrpath optional
+
+There's no reason to require chrpath for distributions who only want to
+compile locally and then install elsewhere for packaging. So allow them
+to specify CHRPATH='' via the env to disable this requirement.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 27 ++++++++++++++-------------
+ 1 files changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index ccaca7d..68bf367 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -270,7 +270,7 @@ def installdir(dir, add_destdir=True):
+
+ # Honor the specified installation prefix in link paths.
+ env.Prepend(LIBPATH=[installdir('libdir')])
+-if env["shared"]:
++if env["shared"] and env['CHRPATH']:
+ env.Prepend(RPATH=[installdir('libdir')])
+
+ # Give deheader a way to set compiler flags
+@@ -390,17 +390,18 @@ config = Configure(env, custom_tests = { 'CheckPKG' : CheckPKG,
+ 'CheckXsltproc' : CheckXsltproc})
+
+ env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
+-if config.CheckExecutable('$CHRPATH -v', 'chrpath'):
+- # Tell generated binaries to look in the current directory for
+- # shared libraries so we can run tests without hassle. Should be
+- # handled sanely by scons on all systems. Not good to use '.' or
+- # a relative path here; it's a security risk. At install time we
+- # use chrpath to edit this out of RPATH.
+- if env["shared"]:
+- env.Prepend(RPATH=[os.path.realpath(os.curdir)])
+-else:
+- print "chrpath is not available, forcing static linking."
+- env["shared"] = False
++if env['CHRPATH']:
++ if config.CheckExecutable('$CHRPATH -v', 'chrpath'):
++ # Tell generated binaries to look in the current directory for
++ # shared libraries so we can run tests without hassle. Should be
++ # handled sanely by scons on all systems. Not good to use '.' or
++ # a relative path here; it's a security risk. At install time we
++ # use chrpath to edit this out of RPATH.
++ if env["shared"]:
++ env.Prepend(RPATH=[os.path.realpath(os.curdir)])
++ else:
++ print "chrpath is not available, forcing static linking."
++ env["shared"] = False
+
+ confdefs = ["/* gpsd_config.h. Generated by scons, do not hand-hack. */\n"]
+
+@@ -1140,7 +1141,7 @@ if qt_env:
+ binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
+
+ # We don't use installdir here in order to avoid having DESTDIR affect the rpath
+-if env["shared"]:
++if env['CHRPATH']:
+ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
+ % (installdir('libdir', False), ))
+
+--
+1.7.8.3
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-gpsmon-lm.patch b/sci-geosciences/gpsd/files/gpsd-3.4-gpsmon-lm.patch
new file mode 100644
index 00000000000..a749fcf0510
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.4-gpsmon-lm.patch
@@ -0,0 +1,29 @@
+From 55131187b6a0290f99d1dd70b5cce48040bba7bb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 13 Jan 2012 11:53:39 -0500
+Subject: [PATCH] gpsmon: always link with -lm
+
+Since the gpsmon pkg uses math funcs itself (and not just via libgps),
+we need to link in -lm for the app.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 68bf367..a5249c1 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -851,7 +851,7 @@ gpsdctl = env.Program('gpsdctl', ['gpsdctl.c'], parse_flags=gpslibs)
+ env.Depends(gpsdctl, compiled_gpslib)
+
+ gpsmon = env.Program('gpsmon', gpsmon_sources,
+- parse_flags=gpsdlibs + ncurseslibs)
++ parse_flags=gpsdlibs + ncurseslibs + ['-lm'])
+ env.Depends(gpsmon, [compiled_gpsdlib, compiled_gpslib])
+
+ gpspipe = env.Program('gpspipe', ['gpspipe.c'], parse_flags=gpslibs)
+--
+1.7.8.3
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch b/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch
new file mode 100644
index 00000000000..20a3b707a4c
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.4-no-man-gen.patch
@@ -0,0 +1,13 @@
+the scons logic is dumb and will always regenerate the man pages.
+forcibly disable that as the releases contain the man pages.
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -575,6 +575,7 @@
+ manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET"
+ else:
+ announce("Neither xsltproc nor xmlto found, documentation cannot be built.")
++manbuilder = htmlbuilder = False
+ if manbuilder:
+ env['BUILDERS']["Man"] = Builder(action=manbuilder)
+ env['BUILDERS']["HTML"] = Builder(action=htmlbuilder,
diff --git a/sci-geosciences/gpsd/files/gpsd-3.4-strptime.patch b/sci-geosciences/gpsd/files/gpsd-3.4-strptime.patch
new file mode 100644
index 00000000000..50a2b275595
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.4-strptime.patch
@@ -0,0 +1,26 @@
+From 083ee79e5b6acbd08008965cbca496eb61957fa4 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Fri, 13 Jan 2012 11:56:12 -0500
+Subject: [PATCH] fix missing strptime prototype
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ gpsutils.c | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/gpsutils.c b/gpsutils.c
+index a1530ec..cc47d52 100644
+--- a/gpsutils.c
++++ b/gpsutils.c
+@@ -3,6 +3,8 @@
+ * This file is Copyright (c) 2010 by the GPSD project
+ * BSD terms apply: see the file COPYING in the distribution root for details.
+ */
++#define _XOPEN_SOURCE 700
++
+ #include <stdio.h>
+ #include <time.h>
+ #include <sys/time.h>
+--
+1.7.8.3
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.5-clock.patch b/sci-geosciences/gpsd/files/gpsd-3.5-clock.patch
new file mode 100644
index 00000000000..478b12a4819
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.5-clock.patch
@@ -0,0 +1,42 @@
+From f9f9bb6c10102f3d69a7f50e758a3a9256bf8744 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 21 May 2012 16:27:36 -0400
+Subject: [PATCH] fix building with clock_gettime and newer glibc
+
+Building with recent glibc versions fails in gpsutils.c due to missing
+definitions related to clock_gettime. This is because we define the
+_XOPEN_SOURCE macro, but not to a new enough value. So set it to a
+recent spec value that satisfies both strptime and clock_gettime.
+
+Example build failure with glibc-2.15:
+gpsutils.c: In function 'timestamp':
+gpsutils.c:299:22: error: storage size of 'ts' isn't known
+gpsutils.c:300:14: warning: implicit declaration of function 'clock_gettime' [-Wimplicit-function-declaration]
+gpsutils.c:300:34: error: 'CLOCK_REALTIME' undeclared (first use in this function)
+gpsutils.c:300:34: note: each undeclared identifier is reported only once for each function it appears in
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ gpsutils.c | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gpsutils.c b/gpsutils.c
+index 523838a..3b4990a 100644
+--- a/gpsutils.c
++++ b/gpsutils.c
+@@ -5,8 +5,10 @@
+ */
+
+ /* The strptime prototype is not provided unless explicitly requested.
+- * So add the define that POSIX says to to avoid: */
+-#define _XOPEN_SOURCE
++ * We also need to set the value high enough to signal inclusion of
++ * newer features (like clock_gettime). See the POSIX spec for more info:
++ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_02_01_02 */
++#define _XOPEN_SOURCE 600
+
+ #include <stdio.h>
+ #include <time.h>
+--
+1.7.8.6
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.6-debug.patch b/sci-geosciences/gpsd/files/gpsd-3.6-debug.patch
new file mode 100644
index 00000000000..ecaf717b739
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.6-debug.patch
@@ -0,0 +1,221 @@
+From 07ecfcc72d977cfd364f0337032d5be7a0ff64e0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 23 May 2012 10:09:26 -0400
+Subject: [PATCH] nmea2000: fix build failures when debugging is disabled
+
+When debugging is disabled, there is no libgps_debuglevel, so building
+this driver fails with:
+driver_nmea2000.c: In function 'print_data':
+driver_nmea2000.c:50:10: error: 'libgps_debuglevel' undeclared (first use in this function)
+
+Add some ifdef to this driver to fix that, and change the return type
+of print_data to void since it always returns 0 and no one ever checks
+the return value.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ driver_nmea2000.c | 45 +++++++++++++++++++++++----------------------
+ 1 files changed, 23 insertions(+), 22 deletions(-)
+
+diff --git a/driver_nmea2000.c b/driver_nmea2000.c
+index 1db6686..b3d2734 100644
+--- a/driver_nmea2000.c
++++ b/driver_nmea2000.c
+@@ -44,8 +44,9 @@ typedef struct PGN
+ FILE *logFile = NULL;
+ #endif /* of if LOG_FILE */
+
+-static int print_data(unsigned char *buffer, int len, PGN *pgn)
++static void print_data(unsigned char *buffer, int len, PGN *pgn)
+ {
++#ifdef LIBGPS_DEBUG
+ /*@-bufferoverflowhigh@*/
+ if ((libgps_debuglevel >= LOG_IO) != 0) {
+ int l1, l2, ptr;
+@@ -67,7 +68,7 @@ static int print_data(unsigned char *buffer, int len, PGN *pgn)
+ gpsd_report(LOG_IO,"%s\n", bu);
+ }
+ /*@+bufferoverflowhigh@*/
+- return(0);
++#endif
+ }
+
+ static gps_mask_t get_mode(struct gps_device_t *session)
+@@ -84,7 +85,7 @@ static gps_mask_t get_mode(struct gps_device_t *session)
+
+ static gps_mask_t hnd_059392(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -92,7 +93,7 @@ static gps_mask_t hnd_059392(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_060928(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -100,7 +101,7 @@ static gps_mask_t hnd_060928(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_126208(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -108,7 +109,7 @@ static gps_mask_t hnd_126208(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_126464(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -116,7 +117,7 @@ static gps_mask_t hnd_126464(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_126996(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -124,7 +125,7 @@ static gps_mask_t hnd_126996(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129025(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+
+ /*@-type@*//* splint has a bug here */
+@@ -140,7 +141,7 @@ static gps_mask_t hnd_129025(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129026(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+
+ session->driver.nmea2000.sid[0] = bu[0];
+@@ -161,10 +162,10 @@ static gps_mask_t hnd_126992(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ //uint8_t sid;
+ //uint8_t source;
+
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+
+ //sid = bu[0];
+@@ -187,7 +188,7 @@ static gps_mask_t hnd_129539(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ {
+ gps_mask_t mask;
+
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+
+ mask = 0;
+@@ -222,7 +223,7 @@ static gps_mask_t hnd_129540(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ {
+ int l1, l2;
+
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+
+ session->driver.nmea2000.sid[2] = bu[0];
+@@ -261,7 +262,7 @@ static gps_mask_t hnd_129029(unsigned char *bu, int len, PGN *pgn, struct gps_de
+ {
+ gps_mask_t mask;
+
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+
+ mask = 0;
+@@ -326,7 +327,7 @@ static gps_mask_t hnd_129029(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129038(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -334,7 +335,7 @@ static gps_mask_t hnd_129038(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129039(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -342,7 +343,7 @@ static gps_mask_t hnd_129039(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129040(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -350,7 +351,7 @@ static gps_mask_t hnd_129040(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129794(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -358,7 +359,7 @@ static gps_mask_t hnd_129794(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129798(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -366,7 +367,7 @@ static gps_mask_t hnd_129798(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129802(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -374,7 +375,7 @@ static gps_mask_t hnd_129802(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129809(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+@@ -382,7 +383,7 @@ static gps_mask_t hnd_129809(unsigned char *bu, int len, PGN *pgn, struct gps_de
+
+ static gps_mask_t hnd_129810(unsigned char *bu, int len, PGN *pgn, struct gps_device_t *session)
+ {
+- (void)print_data(bu, len, pgn);
++ print_data(bu, len, pgn);
+ gpsd_report(LOG_DATA, "pgn %6d(%3d):\n", pgn->pgn, session->driver.nmea2000.unit);
+ return(0);
+ }
+--
+1.7.8.6
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.6-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.6-rpath.patch
new file mode 100644
index 00000000000..ecff094e4a9
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.6-rpath.patch
@@ -0,0 +1,13 @@
+don't set the -rpath flag to the install dir as this breaks DESTDIR
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -268,7 +268,7 @@ def installdir(dir, add_destdir=True):
+
+ # Honor the specified installation prefix in link paths.
+ env.Prepend(LIBPATH=[installdir('libdir')])
+-if env["shared"]:
++if env["shared"] and env["chrpath"]:
+ env.Prepend(RPATH=[installdir('libdir')])
+
+ # Give deheader a way to set compiler flags
diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch b/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch
new file mode 100644
index 00000000000..018431e1d6b
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.7-gps_regress.patch
@@ -0,0 +1,63 @@
+https://bugs.gentoo.org/441760
+
+From 52dedf2ca8b31a8d113a1d9b14977d5d9b782744 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 27 Mar 2013 16:13:30 -0400
+Subject: [PATCH] fix build error when socket_export is disabled
+
+If you try to build with socket_export disabled, you'll hit a build
+failure due to gps_regress being undefined:
+
+NameError: name 'gps_regress' is not defined:
+ File "SConstruct", line 1519:
+ gps_regress,
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 1c187f3..a2b7a4c 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1394,8 +1394,8 @@ else:
+ # using regress-drivers requires socket_export being enabled.
+ if env['socket_export']:
+ # Regression-test the daemon
+- gps_regress = Utility("gps-regress", [gpsd, python_built_extensions],
+- '$SRCDIR/regress-driver test/daemon/*.log')
++ gps_regress = [Utility("gps-regress", [gpsd, python_built_extensions],
++ '$SRCDIR/regress-driver test/daemon/*.log')]
+
+ # Test that super-raw mode works. Compare each logfile against itself
+ # dumped through the daemon running in R=2 mode. (This test is not
+@@ -1410,6 +1410,8 @@ if env['socket_export']:
+ # offset from subframe data.
+ Utility('gps-makeregress', [gpsd, python_built_extensions],
+ '$SRCDIR/regress-driver -b test/daemon/*.log')
++else:
++ gps_regress = []
+
+ # To build an individual test for a load named foo.log, put it in
+ # test/daemon and do this:
+@@ -1550,7 +1552,6 @@ flocktest = Utility("flocktest", [], "cd devtools; ./flocktest " + gitrepo)
+ check = env.Alias('check', [
+ python_compilation_regress,
+ bits_regress,
+- gps_regress,
+ rtcm_regress,
+ aivdm_regress,
+ packet_regress,
+@@ -1559,7 +1560,7 @@ check = env.Alias('check', [
+ time_regress,
+ unpack_regress,
+ json_regress,
+- ])
++ ] + gps_regress)
+
+ env.Alias('testregress', check)
+
+--
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch b/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch
new file mode 100644
index 00000000000..bcfcaf18558
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.7-no-export-t.patch
@@ -0,0 +1,44 @@
+From b605a5fb47ab73412071b6571afcaef4b03c389d Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 30 Mar 2013 16:35:42 -0400
+Subject: [PATCH] punt export_t
+
+Nothing is actually following the convention laid out by this enum,
+so punt it.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libgps.h | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/libgps.h b/libgps.h
+index c16b6aa..d30353f 100644
+--- a/libgps.h
++++ b/libgps.h
+@@ -6,23 +6,6 @@
+ #ifndef _GPSD_LIBGPS_H_
+ #define _GPSD_LIBGPS_H_
+
+-/*
+- * first member of each kind of privdata structure must be named
+- * 'export_type' and must be of this type. It's how we do runtime
+- * dispatch to the different transports.
+- */
+-enum export_t {
+-#ifdef SOCKET_EXPORT_ENABLE
+- sockets,
+-#endif /* SOCKET_EXPORT_ENABLE */
+-#ifdef SHM_EXPORT_ENABLE
+- shm,
+-#endif /* SHM_EXPORT_ENABLE */
+-#ifdef DBUS_EXPORT_ENABLE
+- dbus,
+-#endif /* DBUS_EXPORT_ENABLE */
+-};
+-
+ /* values to poke in the gps_fd member if we get it via something special */
+ #define SHM_PSEUDO_FD -1
+ #define DBUS_PSEUDO_FD -2
+--
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch b/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
new file mode 100644
index 00000000000..5419cd31f63
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.7-rpath.patch
@@ -0,0 +1,17 @@
+don't set the -rpath/-L flags to the install dir as this breaks DESTDIR
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -268,11 +268,7 @@
+ return wrapped
+
+ # Honor the specified installation prefix in link paths.
+-if not env["sysroot"]:
+- env.Prepend(LIBPATH=[installdir('libdir')])
+-else:
+- env.Prepend(LIBPATH=[env["sysroot"] + installdir('libdir')])
+-if env["shared"]:
++if env["shared"] and env["chrpath"]:
+ env.Prepend(RPATH=[installdir('libdir')])
+
+ # Give deheader a way to set compiler flags
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch b/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch
new file mode 100644
index 00000000000..b41be8b66e5
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.8-ldflags.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/391299
+
+split up linking flags into multiple arguments
+
+--- gpsd-3.8/SConstruct
++++ gpsd-3.8/SConstruct
+@@ -214,7 +214,7 @@
+ env.Replace(**{j: os.getenv(i)})
+ for flag in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+ if os.environ.has_key(flag):
+- env.MergeFlags({flag : [os.getenv(flag)]})
++ env.MergeFlags({flag : Split(os.getenv(flag))})
+
+
+ # Placeholder so we can kluge together something like VPATH builds.
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-libgps.patch b/sci-geosciences/gpsd/files/gpsd-3.8-libgps.patch
new file mode 100644
index 00000000000..ba22d2bda0e
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.8-libgps.patch
@@ -0,0 +1,38 @@
+From da2369a8e72578b5c5636adb78accd8bf66b3311 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 11 Mar 2013 12:35:34 -0400
+Subject: [PATCH] libgps.a: fix building w/dbus support
+
+The current libgps.a logic doesn't pass down pkg-config output from
+dbus and such which breaks building when compiling:
+
+gcc -o libgps_dbus.o -c -D_GNU_SOURCE -Wextra -Wall -Wno-uninitialized \
+ -Wno-missing-field-initializers -Wcast-align -Wmissing-declarations \
+ -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type \
+ -O2 libgps_dbus.c
+libgps_dbus.c:26:23: fatal error: dbus/dbus.h: No such file or directory
+compilation terminated.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/SConstruct b/SConstruct
+index e5d1f54..a56fa9b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -886,7 +886,9 @@ gpsdlibs = ["-lgpsd"] + usblibs + bluezlibs + gpslibs + caplibs
+ # linking
+ # The final executable will build but not be portable.
+
+-env.StaticLibrary(target = 'libgps.a', source = libgps_sources)
++env.StaticLibrary(target='libgps.a',
++ source=libgps_sources,
++ parse_flags=dbus_libs + rtlibs)
+
+ # Source groups
+
+--
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch b/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch
new file mode 100644
index 00000000000..c56929abb14
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.8-no-export-t.patch
@@ -0,0 +1,44 @@
+From b605a5fb47ab73412071b6571afcaef4b03c389d Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 30 Mar 2013 16:35:42 -0400
+Subject: [PATCH] punt export_t
+
+Nothing is actually following the convention laid out by this enum,
+so punt it.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libgps.h | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/libgps.h b/libgps.h
+index c16b6aa..d30353f 100644
+--- a/libgps.h
++++ b/libgps.h
+@@ -6,23 +6,6 @@
+ #ifndef _GPSD_LIBGPS_H_
+ #define _GPSD_LIBGPS_H_
+
+-/*
+- * first member of each kind of privdata structure must be named
+- * 'export_type' and must be of this type. It's how we do runtime
+- * dispatch to the different transports.
+- */
+-enum export_t {
+-#ifdef SOCKET_EXPORT_ENABLE
+- sockets,
+-#endif /* SOCKET_EXPORT_ENABLE */
+-#ifdef SHM_EXPORT_ENABLE
+- shm,
+-#endif /* SHM_EXPORT_ENABLE */
+-#ifdef DBUS_EXPORT_ENABLE
+- dbus,
+-#endif /* DBUS_EXPORT_ENABLE */
+-};
+-
+ /* values to poke in the gps_fd member if we get it via something special */
+ #define SHM_PSEUDO_FD -1
+ #define DBUS_PSEUDO_FD -2
+--
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd-3.8-udev.patch b/sci-geosciences/gpsd/files/gpsd-3.8-udev.patch
new file mode 100644
index 00000000000..f6b783e5c3c
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd-3.8-udev.patch
@@ -0,0 +1,38 @@
+From 2e7d2e22935950ece32ff3acd6837c79800752dd Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 11 Mar 2013 13:21:14 -0400
+Subject: [PATCH] fix DESTDIR handling with udev rules install again
+
+Commit 102e29d16c3fd9b414eeac53c794302f902ae8da reverted the DESTDIR
+logic when upgrading the udev path handling.
+
+It also slightly broke the mkdir setup by not creating the rules.d
+subdir under the udev path.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ SConstruct | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index a56fa9b..1c187f3 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1662,10 +1662,10 @@ if env['python']:
+ # is plugged in.
+
+ Utility('udev-install', 'install', [
+- 'mkdir -p ' + env['udevdir'],
+- 'cp $SRCDIR/gpsd.rules ' + env['udevdir'] + '/rules.d/25-gpsd.rules',
+- 'cp $SRCDIR/gpsd.hotplug ' + env['udevdir'],
+- 'chmod a+x ' + env['udevdir'] + '/gpsd.hotplug',
++ 'mkdir -p ' + DESTDIR + env['udevdir'] + '/rules.d',
++ 'cp $SRCDIR/gpsd.rules ' + DESTDIR + env['udevdir'] + '/rules.d/25-gpsd.rules',
++ 'cp $SRCDIR/gpsd.hotplug ' + DESTDIR + env['udevdir'],
++ 'chmod a+x ' + DESTDIR + env['udevdir'] + '/gpsd.hotplug',
+ ])
+
+ Utility('udev-uninstall', '', [
+--
+1.8.1.2
+
diff --git a/sci-geosciences/gpsd/files/gpsd.conf-2 b/sci-geosciences/gpsd/files/gpsd.conf-2
new file mode 100644
index 00000000000..b077fdbf9cd
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd.conf-2
@@ -0,0 +1,8 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Config file for gpsd server
+GPSD_OPTIONS=""
+DEVICES=""
+GPSD_SOCKET="/var/run/gpsd.sock"
diff --git a/sci-geosciences/gpsd/files/gpsd.init-2 b/sci-geosciences/gpsd/files/gpsd.init-2
new file mode 100755
index 00000000000..ad734e34d98
--- /dev/null
+++ b/sci-geosciences/gpsd/files/gpsd.init-2
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ after dbus
+ before ntpd
+}
+
+PIDFILE=/var/run/${SVCNAME}.pid
+DAEMON=/usr/sbin/gpsd
+
+checkconfig() {
+ # Note: these GPSD_xxx var names should be kept in sync with the udev rules.
+ if [ -z "${GPSD_SOCKET}" ] && [ -z "${DEVICES}" ]; then
+ GPSD_SOCKET="/var/run/gpsd.sock"
+ fi
+
+ if [ -n "${GPSD_SOCKET}" ]; then
+ GPSD_OPTIONS="${GPSD_OPTIONS} -F ${GPSD_SOCKET}"
+ fi
+}
+
+start() {
+ checkconfig
+ ebegin "Starting gpsd"
+
+ start-stop-daemon --start --quiet --pidfile ${PIDFILE} --exec ${DAEMON} -- \
+ ${GPSD_OPTIONS} -P ${PIDFILE} ${DEVICES}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping gpsd"
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile ${PIDFILE}
+ eend $?
+ rm -f ${PIDFILE}
+}
diff --git a/sci-geosciences/gpsd/gpsd-2.95-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.95-r1.ebuild
new file mode 100644
index 00000000000..8d8f86df4f5
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-2.95-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+
+inherit python autotools user eutils
+
+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}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 x86"
+
+GPSD_PROTOCOLS="ashtech aivdm clientdebug earthmate evermore fv18 garmin
+ garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
+ oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
+ tripmate tnt ubx"
+for protocol in ${GPSD_PROTOCOLS}; do
+ IUSE_GPSD_PROTOCOLS+=" gpsd_protocols_${protocol}"
+done
+
+IUSE="${IUSE_GPSD_PROTOCOLS} dbus ipv6 ntp qt4"
+
+# those harddeps are de-facto automagicall
+RDEPEND="
+ dev-python/pygtk:2
+ sys-libs/ncurses
+ virtual/libusb:1
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( net-misc/ntp )
+ qt4? ( dev-qt/qtgui:4 )"
+
+DEPEND="${RDEPEND}
+ app-text/xmlto
+ =app-text/docbook-xml-dtd-4.1*"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-disable-strip.patch"
+ "${FILESDIR}/${PV}-fix-ldflags.patch"
+)
+
+pkg_setup() {
+ python_set_active_version 2
+
+ # Run the gpsd daemon as gpsd and group uucp
+ enewuser gpsd -1 -1 -1 "uucp"
+}
+
+src_prepare() {
+ epatch ${PATCHES[@]}
+ epatch_user
+ eautoreconf
+}
+
+src_configure() {
+ local myopts
+
+ # enable specified protocols
+ for protocol in ${GPSD_PROTOCOLS}; do
+ myopts+=" $(use_enable gpsd_protocols_${protocol} ${protocol})"
+ done
+
+ if ! use qt4 ; then
+ myopts+=" --disable-libQgpsmm --disable-libgpsmm ${myopts}"
+ fi
+
+ # --disable-bluetooth: considered experimental -> disable
+ # --enable-static is required for tests, see bug 355071
+ # Hack to make it not generate docs on the fly; xmlto is
+ # needed for man pages (xsltproc is only needed for web pages)
+ econf WITH_XMLTO=yes WITH_XSLTPROC=no \
+ --build=${CBUILD} \
+ --disable-dependency-tracking \
+ --disable-bluetooth \
+ --enable-static \
+ --enable-gpsd-user=gpsd \
+ --enable-gpsd-group=uucp \
+ $(use_enable dbus) \
+ $(use_enable ipv6) \
+ $(use_enable ntp ntpshm) \
+ $(use_enable ntp pps) \
+ ${myopts}
+}
+
+src_install() {
+ # no it can't be done using emake cause it is non-compliant
+ make DESTDIR="${D}" install || die
+
+ # needs this header for libQgpsmm
+ if use qt4 ; then
+ insinto /usr/include
+ doins libQgpsmm/libQgpsmm_global.h
+ fi
+
+ # no need for .la files here
+ find "${D}" -type f -name '*.la' -exec rm -f '{}' +
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd || die
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd || die
+}
diff --git a/sci-geosciences/gpsd/gpsd-2.96-r1.ebuild b/sci-geosciences/gpsd/gpsd-2.96-r1.ebuild
new file mode 100644
index 00000000000..18764d321ee
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-2.96-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.6"
+
+inherit python autotools user eutils
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+GPSD_PROTOCOLS="ashtech aivdm clientdebug earthmate evermore fv18 garmin
+ garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
+ oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
+ tripmate tnt ubx"
+for protocol in ${GPSD_PROTOCOLS}; do
+ IUSE_GPSD_PROTOCOLS+=" gpsd_protocols_${protocol}"
+done
+
+IUSE="${IUSE_GPSD_PROTOCOLS} dbus ipv6 ntp qt4 test udev"
+
+# those harddeps are de-facto automagicall
+RDEPEND="
+ dev-python/pygtk:2
+ sys-libs/ncurses
+ virtual/libusb:1
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( net-misc/ntp )
+ qt4? ( dev-qt/qtgui:4 )"
+
+DEPEND="${RDEPEND}
+ app-text/xmlto
+ =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"
+)
+
+pkg_setup() {
+ python_set_active_version 2
+
+ # Run the gpsd daemon as gpsd and group uucp
+ enewuser gpsd -1 -1 -1 "uucp"
+}
+
+src_prepare() {
+ epatch ${PATCHES[@]}
+ epatch_user
+ eautoreconf
+}
+
+src_configure() {
+ local myopts
+
+ # enable specified protocols
+ for protocol in ${GPSD_PROTOCOLS}; do
+ myopts+=" $(use_enable gpsd_protocols_${protocol} ${protocol})"
+ done
+
+ if ! use qt4 ; then
+ myopts+=" --disable-libQgpsmm --disable-libgpsmm"
+ 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) \
+ ${myopts}
+}
+
+src_install() {
+ # no it can't be done using emake cause it is non-compliant
+ make DESTDIR="${D}" install || die
+
+ if use udev ; then
+ insinto /lib/udev/rules.d/
+ newins gpsd.rules 25-gpsd.rules
+ exeinto /lib/udev/
+ doexe gpsd.hotplug{,.wrapper}
+ fi
+
+ # needs this header for libQgpsmm
+ if use qt4 ; then
+ insinto /usr/include
+ doins libQgpsmm/libQgpsmm_global.h
+ fi
+
+ # no need for .la files here
+ find "${D}" -type f -name '*.la' -exec rm -f '{}' +
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd || die
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd || die
+}
diff --git a/sci-geosciences/gpsd/gpsd-3.10.ebuild b/sci-geosciences/gpsd/gpsd-3.10.ebuild
new file mode 100644
index 00000000000..804c9beec25
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.10.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+ oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+ tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )
+ python? ( ${PYTHON_DEPS} )"
+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}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.10-rpath.patch
+ epatch "${FILESDIR}"/${PN}-3.10-dbus.patch
+ epatch "${FILESDIR}"/${PN}-3.10-udev-install.patch
+ epatch "${FILESDIR}"/${PN}-3.10-nmea-disabled.patch #493022
+
+ # 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_export_best
+ # Extract python info out of SConstruct so we can use saner distribute
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs)
+ 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@|$(pyvar python_progs)|" \
+ "${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
+ strip=False
+ python=False
+ 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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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
+
+ if use python ; then
+ distutils-r1_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ rm "${ED%/}"/usr/bin/xgps* || die
+ fi
+ fi
+}
+
+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.11.ebuild b/sci-geosciences/gpsd/gpsd-3.11.ebuild
new file mode 100644
index 00000000000..21233f8d6b2
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.11.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+ oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+ tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )
+ python? ( ${PYTHON_DEPS} )"
+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}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
+ epatch "${FILESDIR}"/${PN}-3.11-hotplug-config.patch
+ epatch "${FILESDIR}"/${PN}-3.11-no-ntpshm.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_export_best
+ # Extract python info out of SConstruct so we can use saner distribute
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs)
+ 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@|$(pyvar python_progs)|" \
+ "${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
+ strip=False
+ python=False
+ 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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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
+
+ if use python ; then
+ distutils-r1_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ rm "${ED%/}"/usr/bin/xgps* || die
+ fi
+ fi
+}
+
+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.13.ebuild b/sci-geosciences/gpsd/gpsd-3.13.ebuild
new file mode 100644
index 00000000000..94c09c31096
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.13.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+ oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2
+ tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )
+ python? ( ${PYTHON_DEPS} )"
+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}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.11-rpath.patch
+ epatch "${FILESDIR}"/${PN}-3.13-ntpshm.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_export_best
+ # 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
+ python=False
+ 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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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
+
+ if use python ; then
+ distutils-r1_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ rm "${ED%/}"/usr/bin/xgps* || die
+ fi
+ fi
+}
+
+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.15.ebuild b/sci-geosciences/gpsd/gpsd-3.15.ebuild
new file mode 100644
index 00000000000..9249bcc9d94
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.15.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+ oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2
+ tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )
+ python? ( ${PYTHON_DEPS} )"
+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}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.15-dynamic-libs.patch
+ epatch "${FILESDIR}"/${PN}-3.15-libgpsd.patch
+ epatch "${FILESDIR}"/${PN}-3.15-broken-install.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_export_best
+ # 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
+ python=False
+ 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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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
+
+ if use python ; then
+ distutils-r1_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ rm "${ED%/}"/usr/bin/xgps* || die
+ fi
+ fi
+}
+
+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.6.ebuild b/sci-geosciences/gpsd/gpsd-3.6.ebuild
new file mode 100644
index 00000000000..2e3655eac44
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.6.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils user multilib distutils 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 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ ashtech aivdm clientdebug earthmate evermore fv18 garmin
+ garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
+ oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
+ tripmate tnt ubx
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )"
+
+RDEPEND="X? ( dev-python/pygtk:2 )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )"
+DEPEND="${RDEPEND}
+ 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
+
+pkg_setup() {
+ use python && python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.3-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
+ epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
+ epatch "${FILESDIR}"/${PN}-3.6-debug.patch
+ epatch "${FILESDIR}"/${PN}-3.6-rpath.patch
+
+ # Avoid useless -L paths to the install dir
+ sed -i \
+ -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
+ -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+ SConstruct || die
+
+ # Extract python info out of SConstruct so we can use saner distribute
+ if use python ; then
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs)
+ 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@|$(pyvar python_progs)|" \
+ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+ distutils_src_prepare
+ fi
+}
+
+src_configure() {
+ myesconsargs=(
+ prefix="${EPREFIX}/usr"
+ libdir="\$prefix/$(get_libdir)"
+ chrpath=False
+ gpsd_user=gpsd
+ gpsd_group=uucp
+ strip=False
+ python=False
+ $(use_scons bluetooth bluez)
+ $(use_scons cxx libgpsmm)
+ $(use_scons debug)
+ $(use_scons dbus dbus_export)
+ $(use_scons ipv6)
+ $(use_scons ncurses)
+ $(use_scons ntp ntpshm)
+ $(use_scons ntp pps)
+ $(use_scons shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # enable specified protocols
+ local protocol
+ for protocol in ${GPSD_PROTOCOLS[@]} ; do
+ myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+ done
+}
+
+src_compile() {
+ tc-export CC CXX PKG_CONFIG
+ export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+ escons
+
+ use python && distutils_src_compile
+}
+
+src_install() {
+ DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+ if use python ; then
+ distutils_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ local p
+ for p in $(grep -Il 'import .*pygtk' *) ; do
+ find "${D}"/usr/bin -name "${p}*" -delete
+ done
+ fi
+ fi
+}
+
+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"
+}
+
+pkg_postinst() {
+ use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
diff --git a/sci-geosciences/gpsd/gpsd-3.7.ebuild b/sci-geosciences/gpsd/gpsd-3.7.ebuild
new file mode 100644
index 00000000000..d6dd080405b
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.7.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils 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 x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ ashtech aivdm clientdebug earthmate evermore fv18 garmin
+ garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver
+ oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip
+ tripmate tnt ubx
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )"
+
+RDEPEND="X? ( dev-python/pygtk:2 )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )"
+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
+
+pkg_setup() {
+ use python && python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.3-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.4-always-install-man-pages.patch
+ epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
+ epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
+ epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
+ epatch "${FILESDIR}"/${PN}-3.7-no-export-t.patch #463850
+
+ # Avoid useless -L paths to the install dir
+ sed -i \
+ -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
+ -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+ SConstruct || die
+
+ # Extract python info out of SConstruct so we can use saner distribute
+ if use python ; then
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs)
+ 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@|$(pyvar python_progs)|" \
+ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+ distutils_src_prepare
+ fi
+
+ sed -i -e "s:/lib/udev:$(get_udevdir):" gpsd.rules SConstruct || die
+}
+
+src_configure() {
+ myesconsargs=(
+ prefix="${EPREFIX}/usr"
+ libdir="\$prefix/$(get_libdir)"
+ chrpath=False
+ gpsd_user=gpsd
+ gpsd_group=uucp
+ strip=False
+ python=False
+ $(use_scons bluetooth bluez)
+ $(use_scons cxx libgpsmm)
+ $(use_scons debug)
+ $(use_scons dbus dbus_export)
+ $(use_scons ipv6)
+ $(use_scons ncurses)
+ $(use_scons ntp ntpshm)
+ $(use_scons ntp pps)
+ $(use_scons shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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_src_compile
+}
+
+src_install() {
+ DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+ if use python ; then
+ distutils_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ local p
+ for p in $(grep -Il 'import .*pygtk' *) ; do
+ find "${D}"/usr/bin -name "${p}*" -delete
+ done
+ fi
+ fi
+}
+
+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"
+}
+
+pkg_postinst() {
+ use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
diff --git a/sci-geosciences/gpsd/gpsd-3.8.ebuild b/sci-geosciences/gpsd/gpsd-3.8.ebuild
new file mode 100644
index 00000000000..6fa713d03ec
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.8.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils 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 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+ oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+ tripmate tsip ubx
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
+
+RDEPEND="X? ( dev-python/pygtk:2 )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )"
+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
+
+pkg_setup() {
+ use python && python_pkg_setup
+}
+
+src_unpack() {
+ default
+
+ # 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
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.8-libgps.patch
+ epatch "${FILESDIR}"/${PN}-3.8-udev.patch
+ epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
+ epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
+ epatch "${FILESDIR}"/${PN}-3.7-gps_regress.patch #441760
+ epatch "${FILESDIR}"/${PN}-3.8-no-export-t.patch #463850
+
+ # Avoid useless -L paths to the install dir
+ sed -i \
+ -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
+ -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+ SConstruct || die
+
+ # Extract python info out of SConstruct so we can use saner distribute
+ if use python ; then
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs)
+ 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@|$(pyvar python_progs)|" \
+ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+ distutils_src_prepare
+ fi
+}
+
+src_configure() {
+ myesconsargs=(
+ prefix="${EPREFIX}/usr"
+ libdir="\$prefix/$(get_libdir)"
+ udevdir="$(get_udevdir)"
+ chrpath=False
+ gpsd_user=gpsd
+ gpsd_group=uucp
+ strip=False
+ python=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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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_src_compile
+}
+
+src_install() {
+ DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+ if use python ; then
+ distutils_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ local p
+ for p in $(grep -Il 'import .*pygtk' *) ; do
+ find "${D}"/usr/bin -name "${p}*" -delete
+ done
+ fi
+ fi
+}
+
+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"
+}
+
+pkg_postinst() {
+ use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
diff --git a/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild b/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
new file mode 100644
index 00000000000..ae73424a6e1
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.9-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils scons-utils systemd 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 x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+ oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+ tripmate tsip ubx
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets systemd test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
+
+RDEPEND="X? ( dev-python/pygtk:2 )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ systemd? ( sys-apps/systemd )
+ qt4? ( dev-qt/qtgui:4 )"
+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
+
+pkg_setup() {
+ use python && python_pkg_setup
+}
+
+src_unpack() {
+ default
+
+ # 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
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
+ epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
+
+ # Avoid useless -L paths to the install dir
+ sed -i \
+ -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
+ -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+ SConstruct || die
+
+ # Extract python info out of SConstruct so we can use saner distribute
+ if use python ; then
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs)
+ 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@|$(pyvar python_progs)|" \
+ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+ distutils_src_prepare
+ fi
+}
+
+src_configure() {
+ myesconsargs=(
+ prefix="${EPREFIX}/usr"
+ libdir="\$prefix/$(get_libdir)"
+ udevdir="$(get_udevdir)"
+ chrpath=False
+ gpsd_user=gpsd
+ gpsd_group=uucp
+ strip=False
+ python=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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons systemd)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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_src_compile
+}
+
+src_install() {
+ DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+ if use systemd; then
+ systemd_dounit "${S}"/systemd/gpsd.service
+ systemd_dounit "${S}"/systemd/gpsd.socket
+ fi
+
+ if use python ; then
+ distutils_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ local p
+ for p in $(grep -Il 'import .*pygtk' *) ; do
+ find "${D}"/usr/bin -name "${p}*" -delete
+ done
+ fi
+ fi
+}
+
+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"
+}
+
+pkg_postinst() {
+ use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
diff --git a/sci-geosciences/gpsd/gpsd-3.9.ebuild b/sci-geosciences/gpsd/gpsd-3.9.ebuild
new file mode 100644
index 00000000000..9e251de697f
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.9.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils 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 x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea nmea2000 ntrip
+ oceanserver oncore rtcm104v2 rtcm104v3 sirf superstar2 tnt
+ tripmate tsip ubx
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )"
+
+RDEPEND="X? ( dev-python/pygtk:2 )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )"
+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
+
+pkg_setup() {
+ use python && python_pkg_setup
+}
+
+src_unpack() {
+ default
+
+ # 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
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.4-no-man-gen.patch
+ epatch "${FILESDIR}"/${PN}-3.7-rpath.patch
+
+ # Avoid useless -L paths to the install dir
+ sed -i \
+ -e '/^env.Prepend(LIBPATH=.installdir(.libdir.).)$/d' \
+ -e 's:\<STAGING_PREFIX\>:SYSROOT:g' \
+ SConstruct || die
+
+ # Extract python info out of SConstruct so we can use saner distribute
+ if use python ; then
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs)
+ 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@|$(pyvar python_progs)|" \
+ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+ distutils_src_prepare
+ fi
+}
+
+src_configure() {
+ myesconsargs=(
+ prefix="${EPREFIX}/usr"
+ libdir="\$prefix/$(get_libdir)"
+ udevdir="$(get_udevdir)"
+ chrpath=False
+ gpsd_user=gpsd
+ gpsd_group=uucp
+ strip=False
+ python=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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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_src_compile
+}
+
+src_install() {
+ DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+ if use python ; then
+ distutils_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ local p
+ for p in $(grep -Il 'import .*pygtk' *) ; do
+ find "${D}"/usr/bin -name "${p}*" -delete
+ done
+ fi
+ fi
+}
+
+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"
+}
+
+pkg_postinst() {
+ use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
new file mode 100644
index 00000000000..c0b11a93dcc
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+fi
+
+DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt
+ geostar gpsclock itrax mtk3301 navcom nmea0183 nmea2000 ntrip
+ oceanserver oncore passthrough rtcm104v2 rtcm104v3 sirf superstar2
+ tnt tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth cxx debug dbus ipv6 latency_timing ncurses ntp python qt4 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="X? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
+ ncurses? ( sys-libs/ncurses )
+ bluetooth? ( net-wireless/bluez )
+ usb? ( virtual/libusb:1 )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ntp? ( || ( net-misc/ntp net-misc/chrony ) )
+ qt4? ( dev-qt/qtgui:4 )
+ python? ( ${PYTHON_DEPS} )"
+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}"/${PN}-3.8-ldflags.patch
+ epatch "${FILESDIR}"/${PN}-3.11-rpath.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_export_best
+ # 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
+ python=False
+ 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 shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons qt4 libQgpsmm)
+ $(use_scons usb)
+ )
+
+ # 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
+
+ if use python ; then
+ distutils-r1_src_install
+ # Delete all X related packages if user doesn't want them
+ if ! use X ; then
+ rm "${ED%/}"/usr/bin/xgps* || die
+ fi
+ fi
+}
+
+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/metadata.xml b/sci-geosciences/gpsd/metadata.xml
new file mode 100644
index 00000000000..f08524166f5
--- /dev/null
+++ b/sci-geosciences/gpsd/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <longdescription>Unbundled GPS daemon and library to support USB and serial
+ GPS devices and various GPS/mapping clients, such as GPSDrive, kismet, and
+ pygps.
+</longdescription>
+ <use>
+ <flag name="dbus">export gpsd data over dbus connections</flag>
+ <flag name="latency_timing">support latency timing information</flag>
+ <flag name="ntp">Enable <pkg>net-misc/ntp</pkg> shared memory interface
+ and PPS kernel support for GPS time</flag>
+ <flag name="sockets">export gpsd over unix sockets</flag>
+ <flag name="shm">export gpsd over shared memory</flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-geosciences/gpx-viewer/Manifest b/sci-geosciences/gpx-viewer/Manifest
new file mode 100644
index 00000000000..4f1d7f98ee3
--- /dev/null
+++ b/sci-geosciences/gpx-viewer/Manifest
@@ -0,0 +1 @@
+DIST gpx-viewer-0.4.0.tar.gz 534735 SHA256 956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80 SHA512 ab65d872509df605c07110c0a5ffef5c9c385f39cde841fce2d593a58abd3e48f1124a48c11a8d599fad9430cd7b71969da0880b3d1fe4b952ade4b95929914a WHIRLPOOL a46ed33ad9d0579f923b7de1cd42cf48e46c2abb24151e2061d9956f2521569d4035874fff138a78bc71fe7d3922e39396dd6a4fa914c897137bf368cd00072a
diff --git a/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
new file mode 100644
index 00000000000..2dff4915dff
--- /dev/null
+++ b/sci-geosciences/gpx-viewer/files/gpx-viewer-0.4.0-crash-backport
@@ -0,0 +1,24 @@
+=== modified file 'data/gpx-viewer-file-chooser.ui'
+--- data/gpx-viewer-file-chooser.ui 2012-03-04 10:18:33 +0000
++++ data/gpx-viewer-file-chooser.ui 2015-06-01 19:44:21 +0000
+@@ -7,7 +7,6 @@
+ <property name="title" translatable="yes">Choose gpx file(s)</property>
+ <property name="icon_name">gpx-viewer</property>
+ <property name="type_hint">normal</property>
+- <property name="has_separator">False</property>
+ <property name="select_multiple">True</property>
+ <property name="filter">gpx_viewer_file_chooser_filter</property>
+ <property name="local_only">False</property>
+
+=== modified file 'data/gpx-viewer-preferences.ui'
+--- data/gpx-viewer-preferences.ui 2012-03-06 08:49:48 +0000
++++ data/gpx-viewer-preferences.ui 2015-06-01 19:44:21 +0000
+@@ -5,7 +5,6 @@
+ <object class="GtkDialog" id="preferences_dialog">
+ <property name="border_width">5</property>
+ <property name="type_hint">normal</property>
+- <property name="has_separator">False</property>
+ <signal name="response" handler="gpx_viewer_preferences_close"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+
diff --git a/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
new file mode 100644
index 00000000000..fd357ccc9ab
--- /dev/null
+++ b/sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.16
+
+inherit autotools-utils gnome2 vala
+
+DESCRIPTION="Simple program to visualize a gpx file"
+HOMEPAGE="http://blog.sarine.nl/gpx-viewer/"
+SRC_URI="http://edge.launchpad.net/${PN}/trunk/0.4.0/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-libs/gdl:3
+ dev-libs/glib:2
+ dev-libs/libxml2:2
+ >=media-libs/clutter-gtk-1.4.0:1.0
+ >=media-libs/libchamplain-0.12.3:0.12[gtk]
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/intltool-0.21
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-crash-backport )
+
+src_prepare() {
+ vala_src_prepare
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable nls)
+ --disable-database-updates )
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile gpx_viewer_vala.stamp
+ autotools-utils_src_compile
+}
+
+src_install () {
+ autotools-utils_src_install
+ dosym ../icons/hicolor/scalable/apps/gpx-viewer.svg /usr/share/pixmaps/gpx-viewer.svg
+}
diff --git a/sci-geosciences/gpx-viewer/metadata.xml b/sci-geosciences/gpx-viewer/metadata.xml
new file mode 100644
index 00000000000..aab18fda671
--- /dev/null
+++ b/sci-geosciences/gpx-viewer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/gpxpy/Manifest b/sci-geosciences/gpxpy/Manifest
new file mode 100644
index 00000000000..b4e49171117
--- /dev/null
+++ b/sci-geosciences/gpxpy/Manifest
@@ -0,0 +1 @@
+DIST gpxpy-0.8.6.tar.gz 65569 SHA256 e94a1cf8d37459aa2444e1cd31e2670832757c6caa958f4960c710a087b01148 SHA512 3c180436210689724f88fdac43576a9a11b3f8717fb6f8acd7c8ce0afc1219714b4c83f1ba4f64487d35d0189d65a311d77f7778e7d84f315b251d1098f8989c WHIRLPOOL 07ae9a417ce638898f59849d05c0ee23f0f3afcbff9509ca69a2eba15787be18db3740709eb2463b0e03d45e357b9e35bc03b22824b8551e7361884a70210fd8
diff --git a/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
new file mode 100644
index 00000000000..a79d33b7349
--- /dev/null
+++ b/sci-geosciences/gpxpy/gpxpy-0.8.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="python GPX parser"
+HOMEPAGE="https://github.com/tkrajina/gpxpy"
+SRC_URI="https://github.com/tkrajina/${PN}/tarball/85c3477b -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DOCS=( NOTICE.txt README.md )
+
+python_test() {
+ ${PYTHON} -m unittest test
+}
diff --git a/sci-geosciences/gpxpy/metadata.xml b/sci-geosciences/gpxpy/metadata.xml
new file mode 100644
index 00000000000..9c5da11928f
--- /dev/null
+++ b/sci-geosciences/gpxpy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tkrajina/gpxpy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
new file mode 100644
index 00000000000..0f92912ac74
--- /dev/null
+++ b/sci-geosciences/grass/Manifest
@@ -0,0 +1 @@
+DIST grass-6.4.2.tar.gz 24097202 SHA256 670bb74d3000ea0932b7e988d3080d0c629f9eb22a8479bb2987ded473f7b4ca SHA512 537905942965ca949ce241c9e147bb340837f1815d36a1d0170cf18482f66936cb24bda540345d8287a98e4a9275fc129bbc4decf7c3053d123e0f90819b2e5b WHIRLPOOL 65e71c9846f59226bf2ccb3cf224628ac4065dfb2385454083e1db21361e1872192e05763c8a28154f1b536d9b276084efdeb58d730a40f99402ff3e5bf13eb4
diff --git a/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
new file mode 100644
index 00000000000..a5afd0dfafb
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.0-html-nonviz.patch
@@ -0,0 +1,33 @@
+--- tools/build_html_index.sh.old 2010-06-16 23:07:37.000000000 +0200
++++ tools/build_html_index.sh 2010-06-16 23:10:00.000000000 +0200
+@@ -135,7 +135,6 @@
+ </ul>
+
+ <ul>
+- <li><a href=\"nviz.html\">nviz</a> 3D visualization and animation tool</li>
+ <li><a href=\"xganim.html\">xganim</a> tool for animating a raster map series</li>
+ </ul></td>
+ </tr>
+@@ -245,11 +244,11 @@
+ #copy over CSS:
+ cp -f grassdocs.css $HTMLDIR/
+ mkdir -p $HTMLDIR/nviz/
+-cp -f grassdocs.css $HTMLDIR/nviz/
++#cp -f grassdocs.css $HTMLDIR/nviz/
+ chmod a+r $HTMLDIR/grassdocs.css $HTMLDIR/nviz/grassdocs.css
+ #copy over GRASS logo:
+ cp -f grass_logo.png $HTMLDIR/
+-cp -f grass_logo.png $HTMLDIR/nviz/
++#cp -f grass_logo.png $HTMLDIR/nviz/
+ chmod a+r $HTMLDIR/grass_logo.png $HTMLDIR/nviz/grass_logo.png
+ if [ "$MACOSX" ] ; then
+ cp -f grass_icon.png $HTMLDIR/
+@@ -302,7 +301,7 @@
+ echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#r3\">r3.*</a> </td><td>raster3D commands</td></tr>" >> "$FULLINDEX"
+ echo "<tr><td>&nbsp;&nbsp;<a href=\"full_index.html#v\">v.*</a> </td><td>vector commands</td></tr>" >> "$FULLINDEX"
+ echo "<tr><td>&nbsp;&nbsp;<a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> "$FULLINDEX"
+-echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX"
++#echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> "$FULLINDEX"
+ echo "<tr><td>&nbsp;&nbsp;<a href=\"wxGUI.html\">wxGUI</a> </td><td>wxPython-based GUI frontend</td></tr>" >> "$FULLINDEX"
+ echo "<tr><td>&nbsp;&nbsp;<a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> "$FULLINDEX"
+ echo "</table>" >> "$FULLINDEX"
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch b/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch
new file mode 100644
index 00000000000..4864d88da7c
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.1-libav-0.8.patch
@@ -0,0 +1,60 @@
+Adjust Grass 6.4.1 to work with ffmpeg 8.
+
+2011-11-17 Fabio Erculiani
+2011-12-08 Martin von Gagern
+
+References:
+https://bugs.gentoo.org/390827
+https://bugs.gentoo.org/392371
+
+--- grass-6.4.1.orig/lib/ogsf/gsd_img_mpeg.c
++++ grass-6.4.1/lib/ogsf/gsd_img_mpeg.c
+@@ -66,7 +66,7 @@ static AVStream *add_video_stream(AVForm
+
+ c = st->codec;
+ c->codec_id = codec_id;
+- c->codec_type = CODEC_TYPE_VIDEO;
++ c->codec_type = AVMEDIA_TYPE_VIDEO;
+
+ /* put sample parameters */
+ c->bit_rate = 400000;
+@@ -215,7 +215,7 @@ static void write_video_frame(AVFormatCo
+
+ av_init_packet(&pkt);
+
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index = st->index;
+ pkt.data = (uint8_t *) picture;
+ pkt.size = sizeof(AVPicture);
+@@ -236,7 +236,7 @@ static void write_video_frame(AVFormatCo
+ av_rescale_q(c->coded_frame->pts, c->time_base,
+ st->time_base);
+ if (c->coded_frame->key_frame)
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index = st->index;
+ pkt.data = video_outbuf;
+ pkt.size = out_size;
+@@ -301,10 +301,10 @@ int gsd_init_mpeg(const char *filename)
+ av_register_all();
+
+ /* auto detect the output format from the name. default is mpeg. */
+- fmt = guess_format(NULL, filename, NULL);
++ fmt = av_guess_format(NULL, filename, NULL);
+ if (!fmt) {
+ G_warning(_("Unable to deduce output format from file extension: using MPEG"));
+- fmt = guess_format("mpeg", NULL, NULL);
++ fmt = av_guess_format("mpeg", NULL, NULL);
+ }
+ if (!fmt) {
+ G_warning(_("Unable to find suitable output format"));
+@@ -312,7 +312,7 @@ int gsd_init_mpeg(const char *filename)
+ }
+
+ /* allocate the output media context */
+- oc = av_alloc_format_context();
++ oc = av_malloc(sizeof(AVFormatContext));
+ if (!oc) {
+ G_warning(_("Out of memory"));
+ return (-1);
diff --git a/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch
new file mode 100644
index 00000000000..3c040e70755
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.1-libpng15.patch
@@ -0,0 +1,28 @@
+--- raster/r.out.png/r.out.png.c
++++ raster/r.out.png/r.out.png.c
+@@ -261,9 +261,6 @@
+ png_info_init(info_ptr);
+ #endif
+ png_init_io(png_ptr, fp);
+- info_ptr->width = win.cols;
+- info_ptr->height = win.rows;
+- info_ptr->bit_depth = depth;
+
+ /* explicit filter-type (or none) required */
+ if ((filter >= 0) && (filter <= 4)) {
+@@ -302,10 +299,13 @@
+ /*if(!gscale->answer){ *//* 24BIT COLOR IMAGE */
+
+ if (TRUE) {
++ int color_type;
+ if (do_alpha)
+- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
++ color_type = PNG_COLOR_TYPE_RGB_ALPHA;
+ else
+- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
++ color_type = PNG_COLOR_TYPE_RGB;
++
++ png_set_IHDR(png_ptr, info_ptr, win.cols, win.rows, depth, color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
+ /* write the png-info struct */
+ png_write_info(png_ptr, info_ptr);
diff --git a/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch
new file mode 100644
index 00000000000..75f173aded0
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.1-nopycompile.patch
@@ -0,0 +1,12 @@
+diff -ur grass-6.4.1.orig/gui/wxpython/Makefile grass-6.4.1/gui/wxpython/Makefile
+--- grass-6.4.1.orig/gui/wxpython/Makefile
++++ grass-6.4.1/gui/wxpython/Makefile
+@@ -11,7 +11,7 @@
+ ETCDIR = $(ETC)/wxpython
+
+ SRCFILES := $(wildcard compat/* gui_modules/* icons/*.* icons/silk/* images/* xml/*) gis_set.py wxgui.py README
+-DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
++DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES))
+
+ default: install_scripts
+ $(MAKE) parsubdirs
diff --git a/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch b/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch
new file mode 100644
index 00000000000..7c25094728d
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.1-timer_flags.patch
@@ -0,0 +1,13 @@
+--- tools/timer/Makefile.orig 2011-11-14 18:58:13.000000000 -0800
++++ tools/timer/Makefile 2011-11-14 19:00:41.000000000 -0800
+@@ -8,8 +8,8 @@
+ default: $(ETC)/$(PGM)
+
+ $(ETC)/$(PGM): main.c
+- $(CC) -c $<
+- $(CC) -o $(ETC)/$(PGM) $<
++ $(CC) $(CFLAGS) -c $<
++ $(CC) $(LDFLAGS) -o $(ETC)/$(PGM) $<
+
+ clean:
+ \rm -f $(ETC)/$(PGM) main.o
diff --git a/sci-geosciences/grass/files/grass-6.4.2-configure.patch b/sci-geosciences/grass/files/grass-6.4.2-configure.patch
new file mode 100644
index 00000000000..37b75163c62
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.2-configure.patch
@@ -0,0 +1,26 @@
+--- grass-6.4.2.orig/configure.in 2012-02-06 11:16:07.000000000 +0100
++++ grass-6.4.2/configure.in 2013-01-17 23:25:41.126387684 +0100
+@@ -1110,9 +1110,9 @@
+
+ LOC_CHECK_INC_PATH(ffmpeg, FFMPEG, FFMPEGINCPATH)
+
+-LOC_CHECK_INCLUDES(avcodec.h,FFMPEG,$FFMPEGINCPATH)
+-LOC_CHECK_INCLUDES(avformat.h,FFMPEG,$FFMPEGINCPATH)
+-LOC_CHECK_INCLUDES(swscale.h,FFMPEG,$FFMPEGINCPATH)
++LOC_CHECK_INCLUDES(libavcodec/avcodec.h,FFMPEG,$FFMPEGINCPATH)
++LOC_CHECK_INCLUDES(libavformat/avformat.h,FFMPEG,$FFMPEGINCPATH)
++LOC_CHECK_INCLUDES(libswscale/swscale.h,FFMPEG,$FFMPEGINCPATH)
+
+ AC_DEFINE(HAVE_FFMPEG)
+
+@@ -1125,8 +1125,8 @@
+ LOC_CHECK_LIB_PATH(ffmpeg, FFMPEG, FFMPEGLIBPATH)
+
+ LOC_CHECK_LIBS(avutil, av_free, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB,,,,$MATHLIB)
+-LOC_CHECK_LIBS(avcodec, avcodec_init, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+-LOC_CHECK_LIBS(avformat, av_set_parameters, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
++LOC_CHECK_LIBS(avcodec, avcodec_open2, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
++LOC_CHECK_LIBS(avformat, av_write_frame, FFMPEG, $FFMPEGLIBPATH, FFMPEGLIB, $FFMPEGLIB,,,$MATHLIB)
+
+ fi # $USE_FFMPEG
+
diff --git a/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch b/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
new file mode 100644
index 00000000000..ec26ae25152
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
@@ -0,0 +1,79 @@
+Fix build with ffmpeg-1.
+Part of https://bugs.gentoo.org/show_bug.cgi?id=443264
+
+Index: grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
+===================================================================
+--- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c
++++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c
+@@ -26,7 +26,8 @@
+
+ /* FFMPEG stuff */
+ #ifdef HAVE_FFMPEG
+-#include <avformat.h>
++#include <libavformat/avformat.h>
++#include <libavformat/avio.h>
+
+ /* 5 seconds stream duration */
+ #define STREAM_DURATION 5.0
+@@ -58,7 +59,7 @@ static AVStream *add_video_stream(AVForm
+ AVCodecContext *c;
+ AVStream *st;
+
+- st = av_new_stream(oc, 0);
++ st = avformat_new_stream(oc, 0);
+ if (!st) {
+ G_warning(_("Unable to allocate stream"));
+ return NULL;
+@@ -97,7 +98,7 @@ static AVStream *add_video_stream(AVForm
+ c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+
+ c->flags |= CODEC_FLAG_QSCALE;
+- c->global_quality = st->quality = FF_QP2LAMBDA * 10;
++ c->global_quality = FF_QP2LAMBDA * 10;
+
+ return st;
+ }
+@@ -332,13 +333,7 @@ int gsd_init_mpeg(const char *filename)
+ add_video_stream(oc, fmt->video_codec, (r - l + 1), (t - b + 1));
+ }
+
+- /* set the output parameters (must be done even if no parameters). */
+- if (av_set_parameters(oc, NULL) < 0) {
+- G_warning(_("Invalid output format parameters"));
+- return (-1);
+- }
+-
+- dump_format(oc, 0, filename, 1);
++ av_dump_format(oc, 0, filename, 1);
+
+ /* now that all the parameters are set, we can open the audio and
+ video codecs and allocate the necessary encode buffers */
+@@ -347,14 +342,17 @@ int gsd_init_mpeg(const char *filename)
+
+ /* open the output file, if needed */
+ if (!(fmt->flags & AVFMT_NOFILE)) {
+- if (url_fopen(&oc->pb, filename, URL_WRONLY) < 0) {
++ if (avio_open(&oc->pb, filename, AVIO_FLAG_WRITE) < 0) {
+ G_warning(_("Unable to open <%s>"), filename);
+ return (-1);
+ }
+ }
+
+ /* write the stream header, if any */
+- av_write_header(oc);
++ if (avformat_write_header(oc, NULL) < 0) {
++ G_warning(_("Failed to write header"));
++ return (-1);
++ }
+
+
+ #else
+@@ -439,7 +437,7 @@ int gsd_close_mpeg(void)
+ #if (LIBAVFORMAT_VERSION_INT>>16) < 52
+ url_fclose(&oc->pb);
+ #else
+- url_fclose(oc->pb);
++ avio_close(oc->pb);
+ #endif
+ }
+
diff --git a/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch b/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch
new file mode 100644
index 00000000000..7fbe3254f4f
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.4.2-libav-9.patch
@@ -0,0 +1,11 @@
+--- grass-6.4.2.orig/lib/ogsf/gsd_img_mpeg.c 2013-01-18 02:11:37.570025278 +0100
++++ grass-6.4.2/lib/ogsf/gsd_img_mpeg.c 2013-01-18 02:13:01.663022218 +0100
+@@ -159,7 +159,7 @@
+ }
+
+ /* open the codec */
+- if (avcodec_open(c, codec) < 0) {
++ if (avcodec_open2(c, codec, NULL) < 0) {
+ G_warning(_("Unable to open codec"));
+ return;
+ }
diff --git a/sci-geosciences/grass/files/grass-pkgconf.patch b/sci-geosciences/grass/files/grass-pkgconf.patch
new file mode 100644
index 00000000000..5c00b9dbdb2
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-pkgconf.patch
@@ -0,0 +1,22 @@
+--- grass.pc.in.old 2010-06-13 10:53:46.747474687 +0200
++++ grass.pc.in 2010-06-13 10:54:45.957349463 +0200
+@@ -1,12 +1,13 @@
+ # Package Information for pkg-config
+
+-prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-exec_prefix=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-libdir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib
+-includedir=@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++grassdir=@libdir@/grass@GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR@
+
+ Name: GRASS
+ Description: GRASS GIS
+ Version: @GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@
+-Libs: -L@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient
+-Cflags: -I@prefix@/grass-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@/include
++Libs: -L${libdir} -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient
++Cflags: -I${includedir}/grass
diff --git a/sci-geosciences/grass/grass-6.4.2.ebuild b/sci-geosciences/grass/grass-6.4.2.ebuild
new file mode 100644
index 00000000000..d76e8bfe1ab
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.4.2.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+WANT_AUTOCONF="2.1"
+
+inherit eutils gnome2 multilib python versionator wxwidgets autotools
+
+MY_PM=${PN}$(get_version_component_range 1-2 ${PV})
+MY_PM=${MY_PM/.}
+MY_P=${P/_rc/RC}
+
+DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization"
+HOMEPAGE="http://grass.osgeo.org/"
+SRC_URI="http://grass.osgeo.org/${MY_PM}/source/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="6"
+KEYWORDS="amd64 ppc ~ppc64 x86"
+IUSE="X cairo cxx ffmpeg fftw gmath jpeg motif mysql nls odbc opengl png postgres python readline sqlite tiff truetype wxwidgets"
+
+TCL_DEPS="
+ >=dev-lang/tcl-8.5:0
+ >=dev-lang/tk-8.5:0
+ "
+
+RDEPEND="
+ >=app-admin/eselect-1.2
+ sci-libs/gdal
+ sci-libs/proj
+ sys-libs/gdbm
+ sys-libs/ncurses
+ sys-libs/zlib
+ cairo? ( x11-libs/cairo[X?,opengl?] )
+ ffmpeg? ( >=virtual/ffmpeg-0.10 )
+ fftw? ( sci-libs/fftw:3.0 )
+ gmath? (
+ virtual/blas
+ virtual/lapack
+ )
+ jpeg? ( virtual/jpeg:0 )
+ mysql? ( virtual/mysql )
+ odbc? ( dev-db/unixODBC )
+ opengl? (
+ virtual/opengl
+ ${TCL_DEPS}
+ )
+ png? ( media-libs/libpng:0 )
+ postgres? ( >=dev-db/postgresql-8.4 )
+ readline? ( sys-libs/readline:0 )
+ sqlite? ( dev-db/sqlite:3 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? ( media-libs/freetype:2 )
+ wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] )
+ X? (
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXp
+ x11-libs/libXpm
+ x11-libs/libXt
+ motif? (
+ >=x11-libs/motif-2.3:0
+ opengl? (
+ || (
+ media-libs/mesa[motif]
+ ( media-libs/mesa x11-libs/libGLw )
+ )
+ )
+ )
+ !python? ( ${TCL_DEPS} )
+ !wxwidgets? ( ${TCL_DEPS} )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/gettext
+ sys-devel/bison
+ wxwidgets? ( dev-lang/swig )
+ X? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-pkgconf.patch
+ "${FILESDIR}"/${PN}-6.4.1-libav-0.8.patch
+ "${FILESDIR}"/${PN}-6.4.2-ffmpeg-1.patch
+ "${FILESDIR}"/${PN}-6.4.2-configure.patch
+ "${FILESDIR}"/${PN}-6.4.2-libav-9.patch
+)
+
+REQUIRED_USE="
+ motif? ( X )
+ opengl? ( X )
+ wxwidgets? ( X python )
+"
+
+pkg_setup() {
+ local myblas
+
+ # check correct gmath profiles (this must sadly die)
+ if use gmath; then
+ for d in $(eselect lapack show); do myblas=${d}; done
+ if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+ ewarn "You need to set lapack to atlas or reference. Do:"
+ ewarn " eselect lapack set <impl>"
+ ewarn "where <impl> is atlas, threaded-atlas or reference"
+ die "setup failed"
+ fi
+ for d in $(eselect blas show); do myblas=${d}; done
+ if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+ ewarn "You need to set blas to atlas or reference. Do:"
+ ewarn " eselect blas set <impl>"
+ ewarn "where <impl> is atlas, threaded-atlas or reference"
+ die "setup failed"
+ fi
+ fi
+
+ if use python; then
+ # only py2 is supported
+ python_set_active_version 2
+ fi
+}
+
+src_prepare() {
+ use opengl || epatch "${FILESDIR}"/${PN}-6.4.0-html-nonviz.patch
+ epatch ${PATCHES[@]}
+ epatch_user
+ eautoconf
+}
+
+src_configure() {
+ local myconf TCL_LIBDIR
+
+ if use X; then
+ TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5"
+ myconf+="
+ --with-tcltk-libs=${TCL_LIBDIR}
+ $(use_with motif)
+ $(use_with opengl)
+ --with-x
+ "
+
+ use opengl && myconf+=" --with-tcltk"
+ use motif && use opengl && myconf+=" --with-glw"
+ use motif || myconf+=" --without-glw"
+
+ if use wxwidgets; then
+ WX_BUILD=yes
+ WX_GTK_VER=2.8
+ need-wxwidgets unicode
+ myconf+="
+ --without-tcltk
+ --with-wxwidgets=${WX_CONFIG}
+ "
+ else
+ WX_BUILD=no
+ # use tcl gui if wxwidgets are disabled
+ myconf+="
+ --with-tcltk
+ --without-wxwidgets
+ "
+ fi
+ else
+ myconf+="
+ --without-glw
+ --without-opengl
+ --without-tcltk
+ --without-wxwidgets
+ --without-x
+ "
+ fi
+
+ econf \
+ --with-gdal=$(type -P gdal-config) \
+ --with-curses \
+ --with-proj \
+ --with-proj-share="/usr/share/proj/" \
+ --without-glw \
+ --enable-shared \
+ $(use_enable amd64 64bit) \
+ $(use_enable ppc64 64bit) \
+ $(use_with cairo) \
+ $(use_with cxx) \
+ $(use_with fftw) \
+ $(use_with ffmpeg) \
+ $(use_with gmath blas) \
+ $(use_with gmath lapack) \
+ $(use_with jpeg) \
+ $(use_with mysql) \
+ --with-mysql-includes=/usr/include/mysql \
+ --with-mysql-libs=/usr/$(get_libdir)/mysql \
+ $(use_with nls) \
+ $(use_with odbc) \
+ $(use_with png) \
+ $(use_with postgres) \
+ $(use_with python) \
+ $(use_with readline) \
+ $(use_with sqlite) \
+ $(use_with tiff) \
+ $(use_with truetype freetype) \
+ --with-freetype-includes="/usr/include/freetype2/" \
+ --enable-largefile \
+ ${myconf}
+}
+
+src_compile() {
+ # we don't want to link against embeded mysql lib
+ emake MYSQLDLIB=""
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ INST_DIR="${D}"/usr/${MY_PM} \
+ prefix="${D}"/usr BINDIR="${D}"/usr/bin \
+ PREFIX="${D}"/usr/ \
+ install
+
+ pushd "${ED}"/usr/${MY_PM} &> /dev/null
+
+ # fix docs
+ dodoc AUTHORS CHANGES
+ dohtml -r docs/html/*
+ rm -rf docs/ || die
+ rm -rf {AUTHORS,CHANGES,COPYING,GPL.TXT,REQUIREMENTS.html} || die
+
+ # manuals
+ dodir /usr/share/man/man1
+ mv man/man1/* "${ED}"/usr/share/man/man1/ || die
+ rm -rf man/ || die
+ mv -vf "${ED}"/usr/share/man/man1/sql.1{,grass} || die #381599
+
+ # translations
+ if use nls; then
+ dodir /usr/share/locale/
+ mv locale/* "${ED}"/usr/share/locale/ || die
+ rm -rf locale/ || die
+ # pt_BR is broken
+ mv "${ED}"/usr/share/locale/pt_br "${ED}"/usr/share/locale/pt_BR || die
+ fi
+
+ popd &> /dev/null
+
+ # place libraries where they belong
+ mv "${ED}"/usr/${MY_PM}/lib/ "${ED}"/usr/$(get_libdir)/ || die
+
+ # place header files where they belong
+ mv "${ED}"/usr/${MY_PM}/include/ "${ED}"/usr/include/ || die
+ # make rules are not required on installed system
+ rm -rf "${ED}"/usr/include/Make || die
+
+ # mv remaining gisbase stuff to libdir
+ mv "${ED}"/usr/${MY_PM} "${ED}"/usr/$(get_libdir) || die
+
+ # set proper default window renderer
+ if [[ ${WX_BUILD} == yes ]]; then
+ sed -i \
+ -e "1,\$s:^DEFAULT_GUI.*:DEFAULT_GUI=\"wxpython\":" \
+ "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/Init.sh || die
+ fi
+
+ # get proper folder for grass path in script
+ sed -i \
+ -e "1,\$s:^GISBASE.*:GISBASE=/usr/$(get_libdir)/${MY_PM}:" \
+ "${ED}"usr/bin/${MY_PM} || die
+
+ # get proper fonts path for fontcap
+ sed -i \
+ -e "s|${ED}/usr/${MY_PM}|${EPREFIX}usr/$(get_libdir)/${MY_PM}|" \
+ "${ED}"/usr/$(get_libdir)/${MY_PM}/etc/fontcap || die
+
+ if use X; then
+ generate_files
+ doicon gui/icons/${PN}-48x48.png
+ domenu ${MY_PM}-grass.desktop
+ fi
+
+ # install .pc file so other apps know where to look for grass
+ insinto /usr/$(get_libdir)/pkgconfig/
+ doins grass.pc
+
+ # fix weird +x on tcl scripts
+ find "${D}" -name "*.tcl" -exec chmod +r-x '{}' \;
+}
+
+pkg_postinst() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+pkg_postrm() {
+ if use X; then
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+ fi
+}
+
+generate_files() {
+ local GUI="-gui"
+ [[ ${WX_BUILD} == yes ]] && GUI="-wxpython"
+
+ cat <<-EOF > ${MY_PM}-grass.desktop
+ [Desktop Entry]
+ Encoding=UTF-8
+ Version=1.0
+ Name=Grass ${PV}
+ Type=Application
+ Comment=GRASS (Geographic Resources Analysis Support System), the original GIS.
+ Exec=${TERM} -T Grass -e /usr/bin/${MY_PM} ${GUI}
+ Path=
+ Icon=${PN}-48x48.png
+ Categories=Science;Education;
+ Terminal=false
+EOF
+}
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
new file mode 100644
index 00000000000..4d20223c9a1
--- /dev/null
+++ b/sci-geosciences/grass/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <longdescription>The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS.
+See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.php
+</longdescription>
+ <use>
+ <flag name="gmath">Enable gmath wrapper for BLAS/Lapack (<pkg>virtual/blas</pkg>, <pkg>virtual/lapack</pkg>)</flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-geosciences/gshhs-data/Manifest b/sci-geosciences/gshhs-data/Manifest
new file mode 100644
index 00000000000..967ad5b1f47
--- /dev/null
+++ b/sci-geosciences/gshhs-data/Manifest
@@ -0,0 +1 @@
+DIST gshhs+wdbii_2.2.0.zip 114563504 SHA256 d6a578c1762143f6d4dd2901b498774297ffb610204e8c85967f99ab867030cb SHA512 fa7011a0008cd81e551ff89dc9b3c51f165824cb15926069eaba0eb42b126d51be4874ce515fde3746217138b093f392d02bf4a1db25cd894ad5bd43cf6ae9d0 WHIRLPOOL 1497a83df771c31a001673813a9d46488d860bb14d6f2b7a5cd571617e4c6771d100ff21f50301f6cbe08d309b41aa8080710bb29ee1b4403388d486c2230026
diff --git a/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
new file mode 100644
index 00000000000..c2704c13607
--- /dev/null
+++ b/sci-geosciences/gshhs-data/gshhs-data-2.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs data"
+HOMEPAGE="http://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html"
+SRC_URI="http://www.ngdc.noaa.gov/mgg/shorelines/data/gshhs/version${PV}/gshhs+wdbii_${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+S="${WORKDIR}"
+
+src_install() {
+ dodoc gshhs/README.TXT
+ rm gshhs/README.TXT || die
+ insinto /usr/share
+ doins -r *
+}
diff --git a/sci-geosciences/gshhs-data/metadata.xml b/sci-geosciences/gshhs-data/metadata.xml
new file mode 100644
index 00000000000..668362a10b5
--- /dev/null
+++ b/sci-geosciences/gshhs-data/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+<longdescription lang='en'>
+ GSHHS is a high-resolution shoreline data set amalgamated from two
+ databases in the public domain. The data have undergone extensive
+ processing and are free of internal inconsistencies such as erratic
+ points and crossing segments. The shorelines are constructed
+ entirely from hierarchically arranged closed polygons. The data can
+ be used to simplify data searches and data selections, or to study
+ the statistical characteristics of shorelines and land-masses.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/gshhs/Manifest b/sci-geosciences/gshhs/Manifest
new file mode 100644
index 00000000000..02391cd1b18
--- /dev/null
+++ b/sci-geosciences/gshhs/Manifest
@@ -0,0 +1 @@
+DIST gshhs_1.13_src.zip 19483 SHA256 2a5420ade8fd1e4987cc80715002cca65010605d9996b230d0fc9300743092d4 SHA512 c83574f2e2f3b795391d0016234974fb3f3956c8af568b78be07c58f4194ec2c8b34f2f91ab52f1b635f4e4870167d6ef357c4d362207521ed587d89c7d3738a WHIRLPOOL b1b1bf2d392ba43267582c2bc925fa737ba961a3799e42e8e051fd188ee61717e2bee1ef54c76cdb2f5929bbd14bfc4e21e44f42fb5620902baa665476c00712
diff --git a/sci-geosciences/gshhs/gshhs-1.13.ebuild b/sci-geosciences/gshhs/gshhs-1.13.ebuild
new file mode 100644
index 00000000000..3de7c1cf046
--- /dev/null
+++ b/sci-geosciences/gshhs/gshhs-1.13.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs"
+HOMEPAGE="http://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html"
+SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_1.13_src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+data"
+
+RDEPEND="sci-libs/netcdf
+ sci-libs/gdal
+ data? ( sci-geosciences/gshhs-data )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ app-arch/unzip"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ local p
+ for p in gshhs gshhs_dp gshhstograss; do
+ $(tc-getCC) ${CFLAGS} $($(tc-getPKG_CONFIG) --cflags netcdf) \
+ ${LDFLAGS} ${p}.c \
+ $($(tc-getPKG_CONFIG) --libs netcdf) -lgdal -lm -o ${p} \
+ || die
+ done
+}
+
+src_install() {
+ dobin gshhs gshhs_dp gshhstograss
+ insinto /usr/include
+ doins gshhs.h
+ dodoc README.gshhs
+}
diff --git a/sci-geosciences/gshhs/metadata.xml b/sci-geosciences/gshhs/metadata.xml
new file mode 100644
index 00000000000..64ad63711e6
--- /dev/null
+++ b/sci-geosciences/gshhs/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+<longdescription lang='en'>
+ GSHHS is a high-resolution shoreline data set amalgamated from two
+ databases in the public domain. This package contains access
+ software and routines to facilitate decimation based on a standard
+ line-reduction algorithm.
+</longdescription>
+<use>
+ <flag name="data">Add earth data with <pkg>sci-geosciences/gshhs-data</pkg> </flag>
+</use>
+</pkgmetadata>
diff --git a/sci-geosciences/gtk-g-rays2/Manifest b/sci-geosciences/gtk-g-rays2/Manifest
new file mode 100644
index 00000000000..a699484c393
--- /dev/null
+++ b/sci-geosciences/gtk-g-rays2/Manifest
@@ -0,0 +1,2 @@
+DIST gtk-g-rays2-2.01.tar.xz 650456 SHA256 b0fbbc036146ea84a944eb7d33246198579383527a1fb01d42bce9b7913e7d7b SHA512 d8b3cd232fca1286078013003bb35be49a4957a520509a8b73f51e6c533430df9042883e27fd3f68868b656b9c09d4ad257825b2f03595a70013f4daf0269309 WHIRLPOOL ab5f3056b3afd7c7e82a5e78fb9b946a145ba73a7a5575bfdd5376b838149ca62f3e2aeb0357b1efee6f50ddd8c0e2ab6ba42b37a6da4378e96f6a4b2f155d5f
+DIST gtk-g-rays2-2.05.tar.xz 898216 SHA256 1bd9bfe70e601da4bd0a7ab3072e95b477ec87df03c69ece5fbfc3a0308e0d3c SHA512 673d6e756f1a827e1c0de5384f3228e69a00a56588b81528202e80f5d2067213fd9fdb5af22028fcce0c4ea9e4d1b708accdd5777628ded351e3f2b6f2f57e41 WHIRLPOOL 2dea98ed42d55d2e04c22ea8353c486ebe76aa2e22f4a4b24775c56df913b182ff7b45a5149ae08474fc0c06ab47be6fdecb49822be794dc8af881eed8d4f1ab
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild
new file mode 100644
index 00000000000..3529d5945f9
--- /dev/null
+++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.01.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools gnome2
+
+DESCRIPTION="GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device"
+HOMEPAGE="http://www.daria.co.uk/gps"
+SRC_URI="http://www.zen35309.zen.co.uk/gps/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/dbus-glib
+ virtual/libgudev
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ virtual/freedesktop-icon-theme
+"
+DEPEND="${DEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+DOCS="README AUTHORS ChangeLog"
+
+src_prepare() {
+ # werror is bad idea
+ sed -i -e 's:-Werror::g' configure.ac || die
+ # we run this ourselves
+ sed -i -e '/gtk-update-icon-cache/d' Makefile.am || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
new file mode 100644
index 00000000000..a14ed48a17a
--- /dev/null
+++ b/sci-geosciences/gtk-g-rays2/gtk-g-rays2-2.05.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools gnome2
+
+DESCRIPTION="GUI for accessing the Wintec WBT 201 / G-Rays 2 GPS device"
+HOMEPAGE="http://www.daria.co.uk/gps"
+SRC_URI="http://www.zen35309.zen.co.uk/gps/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/dbus-glib
+ virtual/libgudev
+ x11-libs/cairo
+ x11-libs/gtk+:3
+ virtual/freedesktop-icon-theme
+ net-wireless/bluez
+"
+DEPEND="${DEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+DOCS="README AUTHORS ChangeLog"
+
+src_prepare() {
+ # werror is bad idea
+ sed -i -e 's:-Werror::g' configure.ac || die
+ # we run this ourselves
+ sed -i -e '/gtk-update-icon-cache/d' Makefile.am || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+}
diff --git a/sci-geosciences/gtk-g-rays2/metadata.xml b/sci-geosciences/gtk-g-rays2/metadata.xml
new file mode 100644
index 00000000000..3beda91ba20
--- /dev/null
+++ b/sci-geosciences/gtk-g-rays2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/Manifest b/sci-geosciences/harmonics-dwf-free-noncomm/Manifest
new file mode 100644
index 00000000000..20ce51aa453
--- /dev/null
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/Manifest
@@ -0,0 +1 @@
+DIST harmonics-dwf-20111230-nonfree.tar.bz2 308689 SHA256 d44cd2adbea4c1fd64cd31189e86d0473a25808f59bc3e3e9db9e496d36ca91c SHA512 53da55c37dfa1e5f9be1c46cd53d80208c2bf5a2af6e53e26c0dfe097d85399f503c8bed389d368e9183ba1b5506a9debdc3f2a633c6bfc6b5b188f5800ca36a WHIRLPOOL 7a201247c2ecdae3708fa387e50e63301f42e97ff14c597133e6f8633fcc57a9c8a006ba4b2700a9a37c4b9b0b5e554e787cf1375397bf4a67e8ff565ff26a9f
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild
new file mode 100644
index 00000000000..ccda22d3623
--- /dev/null
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/harmonics-dwf-free-noncomm-20111230-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${P/-free-noncomm-/-}"
+DESCRIPTION="Tidal harmonics database for libtcd"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+# Even though the SRC_URI is labeled nonfree, the data is actually available for
+# any non-commercial use.
+SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-nonfree.tar.bz2"
+
+LICENSE="free-noncomm"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_install() {
+ insinto /usr/share/harmonics
+ doins "${WORKDIR}/${MY_P}"-nonfree.tcd
+}
diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
new file mode 100644
index 00000000000..e96e35b1a37
--- /dev/null
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/sci-geosciences/harmonics-dwf-free/Manifest b/sci-geosciences/harmonics-dwf-free/Manifest
new file mode 100644
index 00000000000..bfd24f01dd6
--- /dev/null
+++ b/sci-geosciences/harmonics-dwf-free/Manifest
@@ -0,0 +1,2 @@
+DIST harmonics-dwf-20121224-free.tar.bz2 508967 SHA256 d80d7e99181c60a42660392abbe25789c395453dd88944c41dc19c7f4b0f11be SHA512 25791923dad463a25210b4688c2868a502e690431fa22815d3daa693e42be3e2563367474c4771f88cd3e7eae3b3f290f312f05f5f554895de983eabc24e5657 WHIRLPOOL 6d90f71cb88c78fb925fc1d255fcaee828ca538491b26011e49c519d28592cdc29af2ad519206ba3e1d447d3ad0ec1f81a875f08c649bbe74bb4bfc0673ef222
+DIST harmonics-dwf-20131228-free.tar.bz2 511292 SHA256 3185a471e51dffab37b7503e02b901858945ff33687345cf290e429346c99250 SHA512 b36ca3f432a455fee051418b7eb427bfafc7cdad929765ed6d44f6f2583e6b8c1d4992b21225d07636c418cc4dea2e353f3276511ba7b331bb8709bf543fceed WHIRLPOOL ab8cce1316715ad15687f6084f3e9a734cad931fe4ba71747b5ce1e9b49c99a149626e1d09f422da11636b208f23e49fe9e7e22678d29d04529b318e81fd9060
diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20121224.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20121224.ebuild
new file mode 100644
index 00000000000..a85ff0e5349
--- /dev/null
+++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20121224.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${P/-free-/-}"
+DESCRIPTION="Tidal harmonics database for libtcd"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-free.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ insinto /usr/share/harmonics
+ doins "${MY_P}"-free.tcd
+}
diff --git a/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
new file mode 100644
index 00000000000..b8b5ec14b01
--- /dev/null
+++ b/sci-geosciences/harmonics-dwf-free/harmonics-dwf-free-20131228.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${P/-free-/-}"
+DESCRIPTION="Tidal harmonics database for libtcd"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}-free.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ insinto /usr/share/harmonics
+ doins "${MY_P}"-free.tcd
+ dodoc ChangeLog
+}
diff --git a/sci-geosciences/harmonics-dwf-free/metadata.xml b/sci-geosciences/harmonics-dwf-free/metadata.xml
new file mode 100644
index 00000000000..e96e35b1a37
--- /dev/null
+++ b/sci-geosciences/harmonics-dwf-free/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/sci-geosciences/josm-plugins/Manifest b/sci-geosciences/josm-plugins/Manifest
new file mode 100644
index 00000000000..cd5fc106338
--- /dev/null
+++ b/sci-geosciences/josm-plugins/Manifest
@@ -0,0 +1 @@
+DIST josm-plugins-20101206.tar.xz 27171212 SHA256 cad453bf0b78ca13ad50caf8198177348705664514fa0936841b631eea98d9ef
diff --git a/sci-geosciences/josm-plugins/josm-plugins-20101206.ebuild b/sci-geosciences/josm-plugins/josm-plugins-20101206.ebuild
new file mode 100644
index 00000000000..f110385f92b
--- /dev/null
+++ b/sci-geosciences/josm-plugins/josm-plugins-20101206.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+DESCRIPTION="Set of plugins for josm"
+HOMEPAGE="http://josm.openstreetmap.de/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+DEPEND=">=sci-geosciences/josm-3695"
+RDEPEND="${DEPEND}"
+IUSE=""
+
+src_compile() {
+ einfo Nothing to compile
+}
+
+src_install() {
+ insinto /usr/lib/josm/plugins
+ doins *.jar
+}
diff --git a/sci-geosciences/josm-plugins/metadata.xml b/sci-geosciences/josm-plugins/metadata.xml
new file mode 100644
index 00000000000..3beda91ba20
--- /dev/null
+++ b/sci-geosciences/josm-plugins/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
new file mode 100644
index 00000000000..a77ffa9bd79
--- /dev/null
+++ b/sci-geosciences/josm/Manifest
@@ -0,0 +1,4 @@
+DIST josm-5485.tar.xz 14243884 SHA256 f6167a12b60198c4063aff2bf37aca84cfcbc6f175a017d1db542038e4b393dd SHA512 43a43240593e624cf5cd754df051ed631043179309f9ab2acf31b426c96647ca1feb6e2abae21b15a00da67b5705e7462a5ce7616ce5d4ca05499f530fc7ade3 WHIRLPOOL f56585859a44c879731f85f85ff76da941b72a77d99bf827c1fb2256709a4eca864f3ab2b97629980b178f23fb1abca947355419a0982ef1869a0570247e1eb2
+DIST josm-5608.tar.xz 13873780 SHA256 8f57b6045b06a5a37a2f2c399bfc5da55074c3a3d770a9e4b234d9738d90f6ad SHA512 7d5d9a6eed50dd3d4bee490d135f4243dcd6698f1193246c74813d71e7b6d5178772ae157aa041696b2c4d3525823683c4aae201f5bf69b1574e5e8312831ee0 WHIRLPOOL 9f79c504a67f2d14afd42d22e3773348b9a65d3e8598219747bf6df0b58393781dae35b5b4d131fbede4966a2255ad9cb8a4f76880f3b8d111f582224cf134a7
+DIST josm-6060.tar.xz 13999664 SHA256 aa1f113164d5fa05c46419252d22bee59543049510855b4e4cdf46ff530d303e SHA512 bb52c254230fbbcf19a2197a2d9218a0985a73d94c7389665c0bd1943eedef1807073d2216507e8457a3091d228d08e2a62e9ac4eca8a3252e74e8c16f488a45 WHIRLPOOL 12dc5e05be4016412ebbc780d822b4a4bb3a56294e0ec1cec962b37b72be7bddf55fb07f5e10f273667c6adb5d433d999d1c310e3f5931bcb9677b1c774c4692
+DIST josm-7347.tar.gz 25495047 SHA256 8f7af0bc15ff59899b5f35de68e0a164becf820611ef46f27ce0f201b9069073 SHA512 fe338f3617e4099ed0f2745cba8ae80540c04360d5419ecdbbe165b3afd7a459b09b9bf9342b8a38388a3a8803844d1ad4af6f39395c034c68149ba8e244c3b1 WHIRLPOOL 534c04f5472e7c113a092a78e0a5fae0020f231156cd4a6db4c1fa4bc29d777a12d08132d0f90c51a0fb88b168f270f6ecf0f9d4f8ca988c6f02baa47d505d55
diff --git a/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch b/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch
new file mode 100644
index 00000000000..7ad808c9c98
--- /dev/null
+++ b/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch
@@ -0,0 +1,34 @@
+Index: trunk/build.xml
+
+This is the fix for josm bug #7351, which affects Gentoo builds.
+===================================================================
+--- a/trunk/build.xml
++++ b/trunk/build.xml
+@@ -230,6 +230,8 @@
+ <compilerarg value="-Xlint:static"/>
+ <compilerarg value="-Xlint:try"/>
+ <compilerarg value="-Xlint:unchecked"/>
++ <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
++ <compilerarg value="-XDignore.symbol.file"/>
+ </javac>
+ <copy todir="build" failonerror="no" includeemptydirs="no">
+ <fileset dir="resources"/>
+@@ -419,7 +421,7 @@
+ -keep class JOSM
+ -keep class * extends org.openstreetmap.josm.io.FileImporter
+ -keep class * extends org.openstreetmap.josm.io.FileExporter
+- -keep class org.openstreetmap.josm.data.imagery.types.Adapter1
++ -keep class org.w3._2001.xmlschema.Adapter1
+ -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
+
+ -keepclassmembers enum * {
+@@ -432,7 +434,8 @@
+ public protected *;
+ }
+
+- # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'. This notes should not be a problem as we don't use obfuscation
++ # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'.
++ # This note should not be a problem as we don't use obfuscation
+ -dontnote
+ </proguard>
+ </target>
diff --git a/sci-geosciences/josm/josm-5485.ebuild b/sci-geosciences/josm/josm-5485.ebuild
new file mode 100644
index 00000000000..068eefcb9d1
--- /dev/null
+++ b/sci-geosciences/josm/josm-5485.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.fabian-fingerle.de/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6
+ >=dev-vcs/subversion-1.7"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}"
+
+IUSE=""
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]]; then
+ sed -i \
+ -e "s:josm-custom.jar:josm.jar:" \
+ -e "s:josm-custom-optimized.jar:josm-optimized.jar:" \
+ build.xml || die "Sed failed"
+
+ # create-revision needs the compile directory to be a svn directory
+ # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+ sed -i \
+ -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+ build.xml || die "Sed failed"
+ fi
+}
+
+src_compile() {
+ eant dist-optimized
+}
+
+src_install() {
+ java-pkg_newjar "dist/${PN}-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ newicon images/logo.png josm.png || die "newicon failed"
+ make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm/josm-5608.ebuild b/sci-geosciences/josm/josm-5608.ebuild
new file mode 100644
index 00000000000..573c66f4cfb
--- /dev/null
+++ b/sci-geosciences/josm/josm-5608.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${P}"
+
+IUSE=""
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]]; then
+
+ # create-revision needs the compile directory to be a svn directory
+ # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+ sed -i \
+ -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+ build.xml || die "Sed failed"
+ fi
+}
+
+src_compile() {
+ eant dist-optimized
+}
+
+src_install() {
+ java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ newicon images/logo.png josm.png || die "newicon failed"
+ make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm/josm-6060.ebuild b/sci-geosciences/josm/josm-6060.ebuild
new file mode 100644
index 00000000000..bab1795ae45
--- /dev/null
+++ b/sci-geosciences/josm/josm-6060.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${P}"
+
+IUSE=""
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]]; then
+
+ # create-revision needs the compile directory to be a svn directory
+ # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+ sed -i \
+ -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+ build.xml || die "Sed failed"
+ fi
+}
+
+src_compile() {
+ eant dist-optimized
+}
+
+src_install() {
+ java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ newicon images/logo.png josm.png || die "newicon failed"
+ make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm/josm-7347.ebuild b/sci-geosciences/josm/josm-7347.ebuild
new file mode 100644
index 00000000000..e2132426a8a
--- /dev/null
+++ b/sci-geosciences/josm/josm-7347.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own:
+# REVISION=${PV}
+# mkdir -p josm-${REVISION}
+# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
+# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
+# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
+[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${P}"
+
+IUSE=""
+
+src_prepare() {
+
+ if [[ ${PV} == "9999" ]]; then
+
+ # create-revision needs the compile directory to be a svn directory
+ # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+ sed -i \
+ -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+ build.xml || die "sed failed"
+
+ else
+
+ # Remove dependency on git and svn just for generating a
+ # revision - the tarball should already have REVISION.XML
+ sed -i -e 's:, *init-git-revision-xml::g' \
+ -e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \
+ -e 's:${svn.info.result}:1:' \
+ build.xml || die "sed failed"
+
+ # Fix for josm bug #10325
+ epatch "${FILESDIR}/${P}-dist-optimized-fix.patch"
+
+ fi
+
+}
+
+src_compile() {
+ eant dist-optimized
+}
+
+src_install() {
+ java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ newicon images/logo.png josm.png || die "newicon failed"
+ make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm/josm-9999.ebuild b/sci-geosciences/josm/josm-9999.ebuild
new file mode 100644
index 00000000000..221c044ddd0
--- /dev/null
+++ b/sci-geosciences/josm/josm-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${P}"
+
+IUSE=""
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]]; then
+
+ # create-revision needs the compile directory to be a svn directory
+ # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+ sed -i \
+ -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+ build.xml || die "Sed failed"
+ fi
+}
+
+src_compile() {
+ eant dist-optimized
+}
+
+src_install() {
+ java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ newicon images/logo.png josm.png || die "newicon failed"
+ make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm/metadata.xml b/sci-geosciences/josm/metadata.xml
new file mode 100644
index 00000000000..3beda91ba20
--- /dev/null
+++ b/sci-geosciences/josm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/libtcd/Manifest b/sci-geosciences/libtcd/Manifest
new file mode 100644
index 00000000000..ab7f11f0e00
--- /dev/null
+++ b/sci-geosciences/libtcd/Manifest
@@ -0,0 +1,2 @@
+DIST libtcd-2.2.5-r2.tar.bz2 294449 SHA256 021d9f87986d41aa52c5318c04c49a36e6e122f6b1d16f1d91b82438ff8e767c SHA512 125b8f4258c576d82f86f75c9dec4e6e0dba8d46e897835ff8ee57cb58495c3f2ae42040719aa8a6f0fa70be40dbc3eb082250cfa197f15f0b23d2ee37a47fbd WHIRLPOOL 136c829b564382d0cbc07cdcf6fec885f7da67d2a1fade9405d5fe105d4c9274796d8efde22dc4e1f2697f5690775a17f2b6c7275ec809edb643a3669856ebfe
+DIST libtcd-2.2.6.tar.bz2 300738 SHA256 6cce7dd18c9f04d40837010d1dded08faf07754cd2595073ef165e2e14dd0c14 SHA512 e0c5c35a72617c013fa2cfe94c0aff16c9d14870aa1b3ab14bf1a01715df8f8d9e9acbfa07c60275ea95266f1debbe1b61aa46e47344bba38ec64286bf2ca1eb WHIRLPOOL 796fc95d044b0b3db34c06d8ceae38f554a2c1f3108f62523aa25a795a628b39ddec2872f895397011678f84837ecb254214ec762d55737dd8d9e37f2979cc54
diff --git a/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild b/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
new file mode 100644
index 00000000000..b53ae5ae02a
--- /dev/null
+++ b/sci-geosciences/libtcd/libtcd-2.2.5_p2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P=${PN}-${PV/_p/-r}
+DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files"
+HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc static-libs"
+
+DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P%_*}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || prune_libtool_files
+ use doc && dohtml libtcd.html
+}
diff --git a/sci-geosciences/libtcd/libtcd-2.2.6.ebuild b/sci-geosciences/libtcd/libtcd-2.2.6.ebuild
new file mode 100644
index 00000000000..e0e50ff791f
--- /dev/null
+++ b/sci-geosciences/libtcd/libtcd-2.2.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P=${PN}-${PV/_p/-r}
+DESCRIPTION="Library for reading and writing Tide Constituent Database (TCD) files"
+HOMEPAGE="http://www.flaterco.com/xtide/libtcd.html"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${MY_P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND=">=sci-geosciences/harmonics-dwf-free-20120302"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P%_*}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use static-libs || prune_libtool_files
+ use doc && dohtml libtcd.html
+}
diff --git a/sci-geosciences/libtcd/metadata.xml b/sci-geosciences/libtcd/metadata.xml
new file mode 100644
index 00000000000..e96e35b1a37
--- /dev/null
+++ b/sci-geosciences/libtcd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/sci-geosciences/mapnik-world-boundaries/Manifest b/sci-geosciences/mapnik-world-boundaries/Manifest
new file mode 100644
index 00000000000..d69d01e4d41
--- /dev/null
+++ b/sci-geosciences/mapnik-world-boundaries/Manifest
@@ -0,0 +1,2 @@
+DIST processed_p-20090514.zip 255429573 SHA256 1b4696df1c68b330dcf3dd03ba28d0c5a2e9a5013268e6f1280d862cbc918113 SHA512 8a6c35def519b8c3652bfa6d63b62b1c3e2acbfc833a62157443c171e495f8698912ccbd36a4def590329937ad4b9f4c4595a016013df8209cbc7c5b3e19b2c4 WHIRLPOOL f0c107986848f6121bc994d8b09f0b7d258b3b5a1722e9fd9191187e0a777b578bc4821b7a0a8b5c38e125f5df29d4268d1d2c5fa0350f373c881a9101103f54
+DIST world_boundaries-spherical-20090331.tgz 52857349 SHA256 b3c38baffcc4888dafe98f9d98efc877a6b62a2ab6aaa11592ac8460908a0ce9 SHA512 2d83049688b52987ffa26afb25a340dd1f68f22fe8fbf8e5ca10a798e34cde9c6e4508c44edf86cd46f7ab3d154b123cbbd6084f8b7087c5fbb4c6a14b9cc69d WHIRLPOOL e14a38e51a934db26f50edaf227c575021b204d203ad5ad5ce575948cf258fc9eabcb76381baba7fcbc4da5a1a67c81f7b1b341a15bacfab30d9a7ab77264ce2
diff --git a/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild b/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild
new file mode 100644
index 00000000000..55b7fe28217
--- /dev/null
+++ b/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=2
+
+DESCRIPTION="Mapnik World Boundaries"
+HOMEPAGE="http://www.openstreetmap.org/"
+SRC_URI="mirror://gentoo/world_boundaries-spherical-20090331.tgz
+ mirror://gentoo/processed_p-20090514.zip"
+
+LICENSE="CC-BY-SA-2.0"
+SLOT="0"
+
+KEYWORDS="amd64 ~ppc x86"
+
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+src_prepare() {
+ mv coastlines/* world_boundaries/
+}
+
+src_install() {
+ insinto /usr/share/mapnik
+ doins -r world_boundaries
+}
diff --git a/sci-geosciences/mapnik-world-boundaries/metadata.xml b/sci-geosciences/mapnik-world-boundaries/metadata.xml
new file mode 100644
index 00000000000..441155c7386
--- /dev/null
+++ b/sci-geosciences/mapnik-world-boundaries/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+<longdescription lang="en">
+World Boundaries data from openstreetmap needed by mapnik
+</longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/mapnik/Manifest b/sci-geosciences/mapnik/Manifest
new file mode 100644
index 00000000000..101e5525296
--- /dev/null
+++ b/sci-geosciences/mapnik/Manifest
@@ -0,0 +1,4 @@
+DIST mapnik-v2.0.1.tar.bz2 12018783 SHA256 fe3da0b1adbb48f55ebd01ab0e95e5183f512154249f1d407b7e59aa9176ba8c SHA512 405028b44f39d883d5d235e9f560748210065890df20ef4c581711f2d2373b5b403104f7bc3f9ece2133ca1ca307c54034fe4e37f07d1f7a4ed12fb0834266c6 WHIRLPOOL 22faf112b1cb3b9cd3343ba4881b0b3dd09e810a5d9f67793a241461dd8035aec37eb835c948e6b96e86998d6b2760e39223715490bcbee6bf5d323b19f2eb18
+DIST mapnik-v2.0.2.tar.bz2 12010042 SHA256 40e55c85f5148da22379830f7aaf2da4471f38c04590e06ded04b3fd4d693c5f SHA512 2111b47cc1b73facfa6acd58e25da74f2f4f1faa74fd8a73d69a843611859d0158995c1fc1e587a10287069f275f058881fe0f0e5efcc2230261fd5768172511 WHIRLPOOL 623350f7d87f4368802dbfbed8c91c56b4dd11f94ac467ecf06e0cf73666d29e59128d35930942411843910d7d2302819332a934317b30a69568ce0d2d8309b7
+DIST mapnik-v2.1.0.tar.bz2 17441565 SHA256 d5fcbaaea00359613b707eacaaa2109a0b5696e2baa35c02e4436e8a823b7160 SHA512 3b922e94d229cd8b0091953bd48b18b903e367a1f374d2c821560b6a14f115ab054ceac0749668f18ca40238116bd6617d571403bf860c824b3f260bee054d9e WHIRLPOOL 675082091871db5620f0a75d0a3f35d247150d558dd9546c6100cc6b9d5efc1230868c19707c23d5d5e2c08f9fdeccc33688f229ec96ffecb0e7afa604c3134d
+DIST mapnik-v2.2.0.tar.bz2 23007178 SHA256 9b30de4e58adc6d5aa8478779d0a47fdabe6bf8b166b67a383b35f5aa5d6c1b0 SHA512 6e0bf5027865842a2648ab073b81785dd2c0d8ddb8c75da73caa8aa0c0697e8129ae7e2899f694d44ee1d3de2f207b285abff8e0a0616774564ac6e6b1e774ce WHIRLPOOL a8e50a64b276a92b2b6edaece3928928cf7abfcdd44f6663b7d459652aa95b6959eb769fd6c1958b9f81109470f5112b745792e673514c97a17c7677113d2c68
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch
new file mode 100644
index 00000000000..14321c1cba3
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-boost_build.patch
@@ -0,0 +1,24 @@
+From c33d534b802f353a2cd1b42e98a6f5e8e04bc2b5 Mon Sep 17 00:00:00 2001
+From: Dane Springmeyer <dane@dbsgeo.com>
+Date: Thu, 9 Feb 2012 16:00:39 -0800
+Subject: [PATCH] link to boost system
+
+---
+ plugins/input/templates/helloworld/build.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plugins/input/templates/helloworld/build.py b/plugins/input/templates/helloworld/build.py
+index 402b882..c0b75f0 100644
+--- a/plugins/input/templates/helloworld/build.py
++++ b/plugins/input/templates/helloworld/build.py
+@@ -44,6 +44,7 @@
+ libraries = [ '' ] # eg 'libfoo'
+
+ libraries.append('mapnik')
++libraries.append('boost_system%s' % env['BOOST_APPEND'])
+ # link libicuuc, but ICU_LIB_NAME is used custom builds of icu can
+ # have different library names like osx which offers /usr/lib/libicucore.dylib
+ libraries.append(env['ICU_LIB_NAME'])
+--
+1.7.10
+
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch
new file mode 100644
index 00000000000..d7facc363a2
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-configure-only-once.patch
@@ -0,0 +1,21 @@
+diff -urN mapnik-v2.0.1.old/SConstruct mapnik-v2.0.1/SConstruct
+--- mapnik-v2.0.1.old/SConstruct 2012-05-26 11:04:50.364638533 +0200
++++ mapnik-v2.0.1/SConstruct 2012-05-26 11:07:49.554621727 +0200
+@@ -501,16 +501,7 @@
+ #print 'missing opt', opt
+ preconfigured = False
+
+-# if custom arguments are supplied make sure to accept them
+-if opts.args:
+- # since we have custom arguments update environment with all opts to
+- # make sure to absorb the custom ones
+- opts.Update(env)
+- # now since we've got custom arguments we'll disregard any
+- # pickled environment and force another configuration
+- preconfigured = False
+-
+-elif preconfigured:
++if preconfigured:
+ if not HELP_REQUESTED:
+ color_print(4,'Using previous successful configuration...')
+ color_print(4,'Re-configure by running "python scons/scons.py configure".')
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch
new file mode 100644
index 00000000000..4379303d71a
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-destdir.patch
@@ -0,0 +1,12 @@
+diff -urN mapnik-v2.0.1.old/SConstruct mapnik-v2.0.1/SConstruct
+--- mapnik-v2.0.1.old/SConstruct 2012-05-26 11:04:50.364638533 +0200
++++ mapnik-v2.0.1/SConstruct 2012-05-26 11:26:29.003516741 +0200
+@@ -1445,7 +1445,7 @@
+ site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"''' % env['PYTHON']
+ else:
+ site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)"''' % env['PYTHON']
+- env['PYTHON_SITE_PACKAGES'] = call(site_packages)
++ env['PYTHON_SITE_PACKAGES'] = os.path.normpath(os.path.realpath(env['DESTDIR'])) + call(site_packages)
+ else:
+ env['PYTHON_SYS_PREFIX'] = os.popen('''%s -c "import sys; print sys.prefix"''' % env['PYTHON']).read().strip()
+ env['PYTHON_VERSION'] = os.popen('''%s -c "import sys; print sys.version"''' % env['PYTHON']).read()[0:3]
diff --git a/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch
new file mode 100644
index 00000000000..257d1b0d58b
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.0.1-scons.patch
@@ -0,0 +1,56 @@
+--- mapnik-v2.0.1.orig/SConstruct
++++ mapnik-v2.0.1/SConstruct
+@@ -313,9 +313,9 @@
+ ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
+
+ # Install Variables
+- ('PREFIX', 'The install path "prefix"', '/usr/local'),
++ ('PREFIX', 'The install path "prefix"', '/usr'),
+ ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
+- ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
++ ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '${D}'),
+ ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''),
+ ('PATH_REMOVE', 'A path prefix to exclude from all know command and compile paths', ''),
+
+@@ -342,15 +342,17 @@
+ PathVariable('JPEG_LIBS', 'Search path for libjpeg library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+ PathVariable('TIFF_INCLUDES', 'Search path for libtiff include files', '/usr/include', PathVariable.PathAccept),
+ PathVariable('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+- PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/local/include', PathVariable.PathAccept),
+- PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/local/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
++ PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept),
++ PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
++ PathVariable('AGG_INCLUDES', 'Search path for AGG include files', '/usr/include/agg2', PathVariable.PathAccept),
++ PathVariable('AGG_LIBS', 'Search path for AGG library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
+ ('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''),
+
+ # Variables affecting rendering back-ends
+
+ BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'),
+
+- BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),
++ BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'False'),
+
+ BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'),
+
+@@ -1087,6 +1089,7 @@
+ ['z', 'zlib.h', True,'C'],
+ ['proj', 'proj_api.h', True,'C'],
+ [env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
++ ['agg','agg2/agg_config.h' , True,'C++'],
+ ]
+
+ if env['JPEG']:
+diff -ur mapnik-v2.0.1.orig/src/build.py mapnik-v2.0.1/src/build.py
+--- mapnik-v2.0.1.orig/src/build.py 2012-04-09 23:56:48.000000000 +0100
++++ mapnik-v2.0.1/src/build.py 2012-05-06 17:00:53.124452488 +0100
+@@ -333,9 +333,6 @@
+ if 'uninstall' not in COMMAND_LINE_TARGETS:
+ result = env.InstallAs(target=target, source=mapnik)
+ env.Alias(target='install', source=result)
+- if result:
+- env.AddPostAction(result, ldconfig)
+-
+
+ # Install symlinks
+ target1 = os.path.join(env['MAPNIK_LIB_BASE_DEST'], "%s.%d.%d" % (os.path.basename(str(mapnik[0])),int(major), int(minor)))
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch
new file mode 100644
index 00000000000..e5ca048c39d
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-configure-only-once.patch
@@ -0,0 +1,20 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -481,16 +481,7 @@
+ #print 'missing opt', opt
+ preconfigured = False
+
+-# if custom arguments are supplied make sure to accept them
+-if opts.args:
+- # since we have custom arguments update environment with all opts to
+- # make sure to absorb the custom ones
+- opts.Update(env)
+- # now since we've got custom arguments we'll disregard any
+- # pickled environment and force another configuration
+- preconfigured = False
+-
+-elif preconfigured:
++if preconfigured:
+ if not HELP_REQUESTED:
+ color_print(4,'Using previous successful configuration...')
+ color_print(4,'Re-configure by running "python scons/scons.py configure".')
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch
new file mode 100644
index 00000000000..e73e2ccb727
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-destdir.patch
@@ -0,0 +1,11 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -1362,7 +1362,7 @@
+ site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"''' % env['PYTHON']
+ else:
+ site_packages = '''%s -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)"''' % env['PYTHON']
+- env['PYTHON_SITE_PACKAGES'] = call(site_packages)
++ env['PYTHON_SITE_PACKAGES'] = os.path.normpath(os.path.realpath(env['DESTDIR'])) + call(site_packages)
+ else:
+ env['PYTHON_SYS_PREFIX'] = os.popen('''%s -c "import sys; print sys.prefix"''' % env['PYTHON']).read().strip()
+ env['PYTHON_VERSION'] = os.popen('''%s -c "import sys; print sys.version"''' % env['PYTHON']).read()[0:3]
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch
new file mode 100644
index 00000000000..bc6524697b0
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-dont-run-ldconfig.patch
@@ -0,0 +1,12 @@
+--- a/src/build.py
++++ b/src/build.py
+@@ -38,7 +38,8 @@
+ print stderr
+
+ def ldconfig(*args,**kwargs):
+- call('ldconfig')
++ if 0:
++ call('ldconfig')
+
+ if env['LINKING'] == 'static':
+ lib_env.Append(CXXFLAGS="-fPIC")
diff --git a/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch
new file mode 100644
index 00000000000..18d9409532f
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.1.0-scons.patch
@@ -0,0 +1,15 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -284,10 +284,10 @@
+ ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
+
+ # Install Variables
+- ('PREFIX', 'The install path "prefix"', '/usr/local'),
++ ('PREFIX', 'The install path "prefix"', '/usr'),
+ ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT),
+ ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
+- ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
++ ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '${D}'),
+ ('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''),
+ ('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths', ''),
+ ('PATH_REPLACE', 'Two path prefixes (divided with a :) to search/replace from all known command and compile paths', ''),
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch
new file mode 100644
index 00000000000..89541cb85ed
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-configure-only-once.patch
@@ -0,0 +1,20 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -503,16 +503,7 @@ for opt in pickle_store:
+ #print 'missing opt', opt
+ preconfigured = False
+
+-# if custom arguments are supplied make sure to accept them
+-if opts.args:
+- # since we have custom arguments update environment with all opts to
+- # make sure to absorb the custom ones
+- opts.Update(env)
+- # now since we've got custom arguments we'll disregard any
+- # pickled environment and force another configuration
+- preconfigured = False
+-
+-elif preconfigured:
++if preconfigured:
+ if not HELP_REQUESTED:
+ color_print(4,'Using previous successful configuration...')
+ color_print(4,'Re-configure by running "python scons/scons.py configure".')
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch
new file mode 100644
index 00000000000..c92c0e9a02a
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-dont-run-ldconfig.patch
@@ -0,0 +1,11 @@
+--- a/src/build.py
++++ b/src/build.py
+@@ -38,7 +38,7 @@ def call(cmd, silent=True):
+ print stderr
+
+ def ldconfig(*args,**kwargs):
+- call('ldconfig')
++ pass
+
+ if env['LINKING'] == 'static':
+ lib_env.Append(CXXFLAGS="-fPIC")
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch
new file mode 100644
index 00000000000..4266f624070
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-python3.patch
@@ -0,0 +1,16 @@
+diff --git a/bindings/python/mapnik_datasource.cpp b/bindings/python/mapnik_datasource.cpp
+index 07383b3..85e2ff7 100644
+--- a/bindings/python/mapnik_datasource.cpp
++++ b/bindings/python/mapnik_datasource.cpp
+@@ -61,7 +61,11 @@ boost::shared_ptr<mapnik::datasource> create_datasource(dict const& d)
+ PyObject* temp = PyUnicode_AsUTF8String(obj.ptr());
+ if (temp)
+ {
++#if PY_VERSION_HEX >= 0x03000000
++ char* c_str = PyBytes_AsString(temp);
++#else
+ char* c_str = PyString_AsString(temp);
++#endif
+ params[key] = std::string(c_str);
+ Py_DecRef(temp);
+ }
diff --git a/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch
new file mode 100644
index 00000000000..0ddcd0f9e0d
--- /dev/null
+++ b/sci-geosciences/mapnik/files/mapnik-2.2.0-scons.patch
@@ -0,0 +1,11 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -291,7 +291,7 @@ opts.AddVariables(
+ ('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)),
+
+ # Install Variables
+- ('PREFIX', 'The install path "prefix"', '/usr/local'),
++ ('PREFIX', 'The install path "prefix"', '/usr'),
+ ('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT),
+ ('PYTHON_PREFIX','Custom install path "prefix" for python bindings (default of no prefix)',''),
+ ('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'),
diff --git a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
new file mode 100644
index 00000000000..36262fac634
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+MY_P="${PN}-v${PV}"
+
+inherit eutils python scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo debug doc gdal geos postgres python sqlite"
+
+RDEPEND="
+ >=dev-libs/boost-1.48[python?]
+ dev-libs/icu
+ dev-libs/libxml2
+ media-fonts/dejavu
+ media-libs/freetype
+ media-libs/libpng
+ media-libs/tiff
+ net-misc/curl
+ sci-libs/proj
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/agg[truetype]
+ bidi? ( dev-libs/fribidi )
+ cairo? (
+ x11-libs/cairo
+ dev-cpp/cairomm
+ python? ( dev-python/pycairo )
+ )
+ gdal? ( sci-libs/gdal )
+ geos? ( sci-libs/geos )
+ postgres? ( >=dev-db/postgresql-8.3 )
+ sqlite? ( dev-db/sqlite:3 )
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.0.1-scons.patch \
+ "${FILESDIR}"/${PN}-2.0.1-configure-only-once.patch \
+ "${FILESDIR}"/${PN}-2.0.1-destdir.patch \
+ "${FILESDIR}"/${P}-boost_build.patch
+
+ # do not version epidoc data
+ sed -i \
+ -e 's:-`mapnik-config --version`::g' \
+ utils/epydoc_config/build_epydoc.sh || die
+}
+
+src_configure() {
+ local PLUGINS=shape,raster,osm
+ use gdal && PLUGINS+=,gdal,ogr
+ use geos && PLUGINS+=,geos
+ use postgres && PLUGINS+=,postgis
+ use sqlite && PLUGINS+=,sqlite
+
+ myesconsargs=(
+ "CC=$(tc-getCC)"
+ "CXX=$(tc-getCXX)"
+ "INPUT_PLUGINS=${PLUGINS}"
+ "PREFIX=/usr"
+ "XMLPARSER=libxml2"
+ "LINKING=shared"
+ "RUNTIME_LINK=shared"
+ "PROJ_INCLUDES=/usr/include"
+ "PROJ_LIBS=/usr/$(get_libdir)"
+ "SYSTEM_FONTS=/usr/share/fonts"
+ $(use_scons python BINDINGS all none)
+ $(use_scons python BOOST_PYTHON_LIB boost_python-${PYTHON_ABI})
+ $(use_scons bidi BIDI)
+ $(use_scons cairo CAIRO)
+ $(use_scons debug DEBUG)
+ $(use_scons debug XML_DEBUG)
+ $(use_scons doc DEMO)
+ $(use_scons doc SAMPLE_INPUT_PLUGINS)
+ "CUSTOM_LDFLAGS=${LDFLAGS}"
+ "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+ )
+
+ # force user flags, optimization level
+ sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+ -i -e "s:env\['OPTIMIZATION'\]\,::" \
+ SConstruct || die "sed 3 failed"
+ escons configure
+}
+
+src_compile() {
+ escons
+}
+
+src_install() {
+ escons install
+
+ # even with all the mess it still installs into $S
+ mv "${S}/usr" "${ED}" || die
+
+ if use python ; then
+ fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+ dobin utils/stats/mapdef_stats.py
+ fi
+
+ dodoc AUTHORS.md README.md
+}
+
+pkg_postinst() {
+ elog ""
+ elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+ elog "or the installed examples for the default mapnik ogcserver config."
+ elog ""
+
+ use python && python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+ use python && python_mod_cleanup ${PN}
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.0.2.ebuild b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild
new file mode 100644
index 00000000000..2339b909fb0
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+MY_P="${PN}-v${PV}"
+
+inherit eutils python scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo debug doc gdal geos postgres python sqlite"
+
+RDEPEND="
+ >=dev-libs/boost-1.48[python?]
+ dev-libs/icu
+ dev-libs/libxml2
+ media-fonts/dejavu
+ media-libs/freetype
+ media-libs/libpng
+ media-libs/tiff
+ net-misc/curl
+ sci-libs/proj
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/agg[truetype]
+ bidi? ( dev-libs/fribidi )
+ cairo? (
+ x11-libs/cairo
+ dev-cpp/cairomm
+ python? ( dev-python/pycairo )
+ )
+ gdal? ( sci-libs/gdal )
+ geos? ( sci-libs/geos )
+ postgres? ( >=dev-db/postgresql-8.3 )
+ sqlite? ( dev-db/sqlite:3 )
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.0.1-scons.patch \
+ "${FILESDIR}"/${PN}-2.0.1-configure-only-once.patch \
+ "${FILESDIR}"/${PN}-2.0.1-destdir.patch \
+ "${FILESDIR}"/${PN}-2.0.1-boost_build.patch
+
+ # do not version epidoc data
+ sed -i \
+ -e 's:-`mapnik-config --version`::g' \
+ utils/epydoc_config/build_epydoc.sh || die
+}
+
+src_configure() {
+ local PLUGINS=shape,raster,osm
+ use gdal && PLUGINS+=,gdal,ogr
+ use geos && PLUGINS+=,geos
+ use postgres && PLUGINS+=,postgis
+ use sqlite && PLUGINS+=,sqlite
+
+ myesconsargs=(
+ "CC=$(tc-getCC)"
+ "CXX=$(tc-getCXX)"
+ "INPUT_PLUGINS=${PLUGINS}"
+ "PREFIX=/usr"
+ "XMLPARSER=libxml2"
+ "LINKING=shared"
+ "RUNTIME_LINK=shared"
+ "PROJ_INCLUDES=/usr/include"
+ "PROJ_LIBS=/usr/$(get_libdir)"
+ "SYSTEM_FONTS=/usr/share/fonts"
+ $(use_scons python BINDINGS all none)
+ $(use_scons python BOOST_PYTHON_LIB boost_python-${PYTHON_ABI})
+ $(use_scons bidi BIDI)
+ $(use_scons cairo CAIRO)
+ $(use_scons debug DEBUG)
+ $(use_scons debug XML_DEBUG)
+ $(use_scons doc DEMO)
+ $(use_scons doc SAMPLE_INPUT_PLUGINS)
+ "CUSTOM_LDFLAGS=${LDFLAGS}"
+ "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+ )
+
+ # force user flags, optimization level
+ sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+ -i -e "s:env\['OPTIMIZATION'\]\,::" \
+ SConstruct || die "sed 3 failed"
+ escons configure
+}
+
+src_compile() {
+ escons
+}
+
+src_install() {
+ escons install
+
+ # even with all the mess it still installs into $S
+ mv "${S}/usr" "${ED}" || die
+
+ if use python ; then
+ fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+ dobin utils/stats/mapdef_stats.py
+ fi
+
+ dodoc AUTHORS.md README.md
+}
+
+pkg_postinst() {
+ elog ""
+ elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+ elog "or the installed examples for the default mapnik ogcserver config."
+ elog ""
+
+ use python && python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+ use python && python_mod_cleanup ${PN}
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.1.0.ebuild b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild
new file mode 100644
index 00000000000..e942e8f4306
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_DEPEND="python? 2"
+MY_P="${PN}-v${PV}"
+
+inherit eutils python scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi cairo debug doc gdal geos postgres python sqlite"
+
+RDEPEND="
+ >=dev-libs/boost-1.48[python?]
+ dev-libs/icu
+ dev-libs/libxml2
+ media-fonts/dejavu
+ media-libs/freetype
+ media-libs/libpng
+ media-libs/tiff
+ net-misc/curl
+ sci-libs/proj
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/agg[truetype]
+ bidi? ( dev-libs/fribidi )
+ cairo? (
+ x11-libs/cairo
+ dev-cpp/cairomm
+ python? ( dev-python/pycairo )
+ )
+ gdal? ( sci-libs/gdal )
+ geos? ( sci-libs/geos )
+ postgres? ( >=dev-db/postgresql-8.3 )
+ sqlite? ( dev-db/sqlite:3 )
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-2.1.0-scons.patch \
+ "${FILESDIR}"/${PN}-2.1.0-configure-only-once.patch \
+ "${FILESDIR}"/${PN}-2.1.0-destdir.patch \
+ "${FILESDIR}"/${PN}-2.1.0-dont-run-ldconfig.patch
+
+ # do not version epidoc data
+ sed -i \
+ -e 's:-`mapnik-config --version`::g' \
+ utils/epydoc_config/build_epydoc.sh || die
+}
+
+src_configure() {
+ local PLUGINS=shape,raster,osm
+ use gdal && PLUGINS+=,gdal,ogr
+ use geos && PLUGINS+=,geos
+ use postgres && PLUGINS+=,postgis
+ use sqlite && PLUGINS+=,sqlite
+
+ myesconsargs=(
+ "CC=$(tc-getCC)"
+ "CXX=$(tc-getCXX)"
+ "INPUT_PLUGINS=${PLUGINS}"
+ "PREFIX=/usr"
+ "XMLPARSER=libxml2"
+ "LINKING=shared"
+ "RUNTIME_LINK=shared"
+ "PROJ_INCLUDES=/usr/include"
+ "PROJ_LIBS=/usr/$(get_libdir)"
+ "SYSTEM_FONTS=/usr/share/fonts"
+ $(use_scons python BINDINGS all none)
+ $(use_scons python BOOST_PYTHON_LIB boost_python-${PYTHON_ABI})
+ $(use_scons bidi BIDI)
+ $(use_scons cairo CAIRO)
+ $(use_scons debug DEBUG)
+ $(use_scons debug XML_DEBUG)
+ $(use_scons doc DEMO)
+ $(use_scons doc SAMPLE_INPUT_PLUGINS)
+ "CUSTOM_LDFLAGS=${LDFLAGS}"
+ "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+ )
+
+ # force user flags, optimization level
+ sed -i -e "s:\-O%s:${CXXFLAGS}:" \
+ -i -e "s:env\['OPTIMIZATION'\]\,::" \
+ SConstruct || die "sed 3 failed"
+ escons configure
+}
+
+src_compile() {
+ escons
+}
+
+src_install() {
+ escons install
+
+ # even with all the mess it still installs into $S
+ mv "${S}/usr" "${ED}" || die
+
+ if use python ; then
+ fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+ dobin utils/stats/mapdef_stats.py
+ fi
+
+ dodoc AUTHORS.md README.md
+}
+
+pkg_postinst() {
+ elog ""
+ elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+ elog "or the installed examples for the default mapnik ogcserver config."
+ elog ""
+
+ use python && python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+ use python && python_mod_cleanup ${PN}
+}
diff --git a/sci-geosciences/mapnik/mapnik-2.2.0.ebuild b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild
new file mode 100644
index 00000000000..bfc3b65b61a
--- /dev/null
+++ b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+MY_P="${PN}-v${PV}"
+
+inherit eutils python-single-r1 scons-utils toolchain-funcs
+
+DESCRIPTION="A Free Toolkit for developing mapping applications"
+HOMEPAGE="http://www.mapnik.org/"
+SRC_URI="http://mapnik.s3.amazonaws.com/dist/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cairo debug doc gdal postgres python sqlite"
+
+RDEPEND="
+ >=dev-libs/boost-1.48[threads,python?]
+ dev-libs/icu:=
+ sys-libs/zlib
+ media-libs/freetype
+ dev-libs/libxml2
+ media-libs/libpng
+ media-libs/tiff
+ virtual/jpeg
+ media-libs/libwebp
+ sci-libs/proj
+ media-fonts/dejavu
+ x11-libs/agg[truetype]
+ net-misc/curl
+ cairo? (
+ x11-libs/cairo
+ dev-cpp/cairomm
+ python? ( dev-python/pycairo[${PYTHON_USEDEP}] )
+ )
+ postgres? ( >=dev-db/postgresql-8.3 )
+ gdal? ( sci-libs/gdal )
+ sqlite? ( dev-db/sqlite:3 )
+ python_single_target_python3_3? ( >=dev-libs/boost-1.53[${PYTHON_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-configure-only-once.patch \
+ "${FILESDIR}"/${P}-dont-run-ldconfig.patch \
+ "${FILESDIR}"/${P}-scons.patch \
+ "${FILESDIR}"/${P}-python3.patch
+
+ # do not version epidoc data
+ sed -i \
+ -e 's:-`mapnik-config --version`::g' \
+ utils/epydoc_config/build_epydoc.sh || die
+
+ # force user flags, optimization level
+ sed -i -e "s:\-O%s:%s:" \
+ -i -e "s:env\['OPTIMIZATION'\]:'${CXXFLAGS}':" \
+ SConstruct || die
+
+ epatch_user
+}
+
+src_configure() {
+ local PLUGINS=shape,csv,raster,geojson,osm
+ use gdal && PLUGINS+=,gdal,ogr
+ use postgres && PLUGINS+=,postgis
+ use sqlite && PLUGINS+=,sqlite
+ use python && PLUGINS+=,python
+
+ myesconsargs=(
+ "CC=$(tc-getCC)"
+ "CXX=$(tc-getCXX)"
+ "INPUT_PLUGINS=${PLUGINS}"
+ "PREFIX=/usr"
+ "DESTDIR=${D}"
+ "XMLPARSER=libxml2"
+ "LINKING=shared"
+ "RUNTIME_LINK=shared"
+ "PROJ_INCLUDES=/usr/include"
+ "PROJ_LIBS=/usr/$(get_libdir)"
+ "SYSTEM_FONTS=/usr/share/fonts"
+ $(use_scons python BINDINGS all none)
+ $(use python && use_scons python PYTHON $PYTHON)
+ $(use_scons python BOOST_PYTHON_LIB boost_python-$(echo $EPYTHON | sed 's/python//'))
+ $(use_scons cairo CAIRO)
+ $(use_scons debug DEBUG)
+ $(use_scons debug XML_DEBUG)
+ $(use_scons doc DEMO)
+ $(use_scons doc SAMPLE_INPUT_PLUGINS)
+ "CUSTOM_LDFLAGS=${LDFLAGS}"
+ "CUSTOM_LDFLAGS+=-L${ED}/usr/$(get_libdir)"
+ )
+
+ escons configure
+}
+
+src_compile() {
+ escons
+}
+
+src_install() {
+ escons install
+
+ if use python ; then
+ python_optimize
+ fperms 0644 "$(python_get_sitedir)"/${PN}/paths.py
+ dobin utils/stats/mapdef_stats.py
+ fi
+
+ dodoc AUTHORS.md README.md CHANGELOG.md
+}
+
+pkg_postinst() {
+ elog ""
+ elog "See the home page or wiki (http://trac.mapnik.org/) for more info"
+ elog "or the installed examples for the default mapnik ogcserver config."
+ elog ""
+}
diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
new file mode 100644
index 00000000000..129219105f7
--- /dev/null
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+<longdescription>Mapnik is a toolkit for developing both web and desktop
+ mapping applications. The core libraries are written in C++, with
+ optional Python bindings.
+</longdescription>
+<use>
+ <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+ <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
+</use>
+</pkgmetadata>
diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest
new file mode 100644
index 00000000000..d294b0baf4b
--- /dev/null
+++ b/sci-geosciences/mapserver/Manifest
@@ -0,0 +1 @@
+DIST mapserver-6.0.1.tar.gz 2430064 SHA256 dd6821917aa7030381442f5e092e4f46f44b9deb9425ec92729e5819e9b61d65 SHA512 0fd9da9d6452fbfbaf0c815e6d15309e185119a4ab33cab2f1c6839bfb8c3a75ce6e7e7779b0eb2aa6e80d1a623ca6e0e58a02049b0db0bfa3f7b0f29117d5dc WHIRLPOOL e4846d40b93c22f7b5dcce1c242b4d88db253be9185194b45c4acddf9066d10c2ec2fbe667941dfe15702838690517a0e57719b1937169e55517e43ed1c225b8
diff --git a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch b/sci-geosciences/mapserver/files/5.4.2-ldflags.patch
new file mode 100644
index 00000000000..d202b8d4692
--- /dev/null
+++ b/sci-geosciences/mapserver/files/5.4.2-ldflags.patch
@@ -0,0 +1,90 @@
+diff --git a/Makefile.in b/Makefile.in
+index 56cb209..46a8a4c 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -252,7 +252,7 @@ SUP_LIBS = $(GD_LIB) $(AGG_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \
+ # STATIC_LIBS is full filename with path of libs that will be statically linked
+ STATIC_LIBS= $(GD_STATIC)
+
+-EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
++EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
+
+ RM= /bin/rm -f
+
+@@ -316,59 +316,59 @@ $(LIBMAP_SHARED): $(LIBMAP_STATIC)
+ && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED)
+
+ shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h
+- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf
++ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS)
+
+ shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h
+- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img
++ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS)
+
+ sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h
+- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img
++ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS)
+
+ legend: $(LIBMAP_STATIC) legend.o mapserver.h
+- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend
++ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS)
+
+ scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h
+- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar
++ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS)
+
+ mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h
+- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv
++ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS)
+
+ shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h
+- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex
++ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS)
+
+ shptree: $(LIBMAP_STATIC) shptree.o mapserver.h
+- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree
++ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS)
+
+ shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h
+- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis
++ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS)
+
+ shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h
+- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst
++ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS)
+
+ sortshp: sortshp.o
+- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp
++ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS)
+
+ tile4ms: tile4ms.o
+- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms
++ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS)
+
+ msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h
+- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt
++ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS)
+
+ testexpr: testexpr.o mapparser.o maplexer.o
+- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr
++ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS)
+
+ testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h
+- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy
++ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS)
+
+ test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c
+- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto
++ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS)
+
+ mapscriptvars: Makefile
+ touch mapscriptvars
+ pwd > mapscriptvars
+ echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
+ echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
+- echo $(EXE_LDFLAGS) >> mapscriptvars
++ echo $(LDFLAGS) >> mapscriptvars
+ echo $(STATIC_LIBS) >> mapscriptvars
+ grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
+
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch
new file mode 100644
index 00000000000..8016961b515
--- /dev/null
+++ b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch
@@ -0,0 +1,23 @@
+diff -urN mapserver-6.0.0-rc1.old/mapscript/php/bool.h mapserver-6.0.0-rc1/mapscript/php/bool.h
+--- mapserver-6.0.0-rc1.old/mapscript/php/bool.h 1970-01-01 01:00:00.000000000 +0100
++++ mapserver-6.0.0-rc1/mapscript/php/bool.h 2011-05-02 22:00:00.000000000 +0200
+@@ -0,0 +1,8 @@
++#ifndef BOOL_H
++#define BOOL_H
++
++#define bool_t int
++#define TRUE 1
++#define FALSE 0
++
++#endif /* BOOL_H */
+diff -urN mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h
+--- mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h 2011-05-02 12:10:03.000000000 +0200
++++ mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h 2011-05-02 22:00:11.000000000 +0200
+@@ -32,6 +32,7 @@
+ #ifndef PHP_MAPSCRIPT_H
+ #define PHP_MAPSCRIPT_H
+
++#include "bool.h"
+ #include "php.h"
+ #include "zend_interfaces.h"
+ #include "php_mapscript_util.h"
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch
new file mode 100644
index 00000000000..336fb2eff4f
--- /dev/null
+++ b/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch
@@ -0,0 +1,89 @@
+diff -urN mapserver-6.0.0-rc1.old/Makefile.in mapserver-6.0.0-rc1/Makefile.in
+--- mapserver-6.0.0-rc1.old/Makefile.in 2011-05-02 12:10:03.000000000 +0200
++++ mapserver-6.0.0-rc1/Makefile.in 2011-05-02 16:29:31.000000000 +0200
+@@ -264,7 +264,7 @@
+ # STATIC_LIBS is full filename with path of libs that will be statically linked
+ STATIC_LIBS= $(GD_STATIC)
+
+-EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
++EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS)
+
+ RM= /bin/rm -f
+
+@@ -351,59 +351,59 @@
+ && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED)
+
+ shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h
+- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf
++ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS)
+
+ shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h
+- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img
++ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS)
+
+ sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h
+- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img
++ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS)
+
+ legend: $(LIBMAP_STATIC) legend.o mapserver.h
+- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend
++ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS)
+
+ scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h
+- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar
++ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS)
+
+ mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h
+- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv
++ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS)
+
+ shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h
+- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex
++ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS)
+
+ shptree: $(LIBMAP_STATIC) shptree.o mapserver.h
+- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree
++ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS)
+
+ shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h
+- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis
++ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS)
+
+ shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h
+- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst
++ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS)
+
+ sortshp: $(LIBMAP_STATIC) sortshp.o mapserver.h
+- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp
++ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS)
+
+ tile4ms: $(LIBMAP_STATIC) tile4ms.o mapserver.h
+- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms
++ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS)
+
+ msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h
+- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt
++ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS)
+
+ testexpr: $(LIBMAP_STATIC) testexpr.o mapparser.o maplexer.o mapserver.h
+- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr
++ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS)
+
+ testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h
+- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy
++ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS)
+
+ test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c mapserver.h
+- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto
++ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS)
+
+ mapscriptvars: Makefile
+ touch mapscriptvars
+ pwd > mapscriptvars
+ echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars
+ echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars
+- echo $(EXE_LDFLAGS) >> mapscriptvars
++ echo $(EXE_LIBS) >> mapscriptvars
+ echo $(STATIC_LIBS) >> mapscriptvars
+ grep '#define MS_VERSION ' mapserver.h >> mapscriptvars
+
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
new file mode 100644
index 00000000000..706bae4ce7b
--- /dev/null
+++ b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch
@@ -0,0 +1,15 @@
+--- mapserver-6.0.0-rc1.old/mapscript/php/Makefile.in 2011-05-02 12:10:03.000000000 +0200
++++ mapserver-6.0.0-rc1/mapscript/php/Makefile.in 2011-05-02 23:43:15.000000000 +0200
+@@ -86,10 +86,10 @@
+
+
+ php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a
+- $(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS)
++ $(LD) -o $@ $(LDFLAGS) $(PHPMS_OBJS) $(MS_LIBS)
+
+ php_proj.so: $(PHPPROJ_OBJS)
+- $(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS)
++ $(LD) -o $@ $(LDFLAGS) $(PHPPROJ_OBJS) $(MS_LIBS)
+
+ %.o: %.c php_mapscript_util.h php_mapscript.h
+ $(CC) $(CFLAGS112) -c -o $@ $<
diff --git a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
new file mode 100644
index 00000000000..e81fd90195f
--- /dev/null
+++ b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch
@@ -0,0 +1,69 @@
+diff -aurN mapserver-6.0.1.orig/mapscript/php/image.c mapserver-6.0.1/mapscript/php/image.c
+--- mapserver-6.0.1.orig/mapscript/php/image.c 2011-04-05 11:15:06.000000000 -0400
++++ mapserver-6.0.1/mapscript/php/image.c 2015-02-04 14:29:03.164357015 -0500
+@@ -303,10 +303,18 @@
+ /* no filename - read stdout */
+
+ /* if there is no output buffer active, set the header */
+- if (OG(ob_nesting_level)<=0)
+- {
+- php_header(TSRMLS_C);
+- }
++ //handle changes in PHP 5.4.x
++ #if PHP_VERSION_ID < 50399
++ if (OG(ob_nesting_level)<=0)
++ {
++ php_header(TSRMLS_C);
++ }
++ #else
++ if (php_output_get_level(TSRMLS_C)<=0)
++ {
++ php_header(TSRMLS_C);
++ }
++ #endif
+
+
+ if (MS_RENDERER_PLUGIN(php_image->image->format))
+diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript.c mapserver-6.0.1/mapscript/php/php_mapscript.c
+--- mapserver-6.0.1.orig/mapscript/php/php_mapscript.c 2011-04-05 23:05:02.000000000 -0400
++++ mapserver-6.0.1/mapscript/php/php_mapscript.c 2015-02-04 14:27:52.296567202 -0500
+@@ -899,7 +899,7 @@
+
+ }
+
+-function_entry mapscript_functions[] = {
++zend_function_entry mapscript_functions[] = {
+ PHP_FE(ms_GetVersion, NULL)
+ PHP_FE(ms_GetVersionInt, NULL)
+ PHP_FE(ms_newLineObj, NULL)
+diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c mapserver-6.0.1/mapscript/php/php_mapscript_util.c
+--- mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c 2011-04-04 13:50:20.000000000 -0400
++++ mapserver-6.0.1/mapscript/php/php_mapscript_util.c 2015-02-04 14:27:27.477341249 -0500
+@@ -42,7 +42,12 @@
+ zobj->ce = ce;
+ ALLOC_HASHTABLE(zobj->properties);
+ zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++ //handle changes in PHP 5.4.x
++ #if PHP_VERSION_ID < 50399
++ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++ #else
++ object_properties_init(zobj, ce);
++ #endif
+ retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
+ retval.handlers = &mapscript_std_object_handlers;
+ return retval;
+@@ -59,7 +64,12 @@
+ zobj->ce = ce;
+ ALLOC_HASHTABLE(zobj->properties);
+ zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++ //handle changes in PHP 5.4.x
++ #if PHP_VERSION_ID < 50399
++ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *));
++ #else
++ object_properties_init(zobj, ce);
++ #endif
+ retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC);
+ retval.handlers = object_handlers;
+ return retval;
diff --git a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
new file mode 100644
index 00000000000..845cad6e3bd
--- /dev/null
+++ b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1
@@ -0,0 +1,44 @@
+--- mapscript/tcl/Makefile.in.orig 2001-10-26 00:56:39.000000000 +0200
++++ mapscript/tcl/Makefile.in 2008-02-04 11:04:22.000000000 +0100
+@@ -25,7 +25,7 @@
+ TCL_LIBS = @TCL_LIBS@
+ LIBS = @TCL_LIBS@
+ TCL_DBGX = @TCL_DBGX@
+-LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/lib:@TCL_EXEC_PREFIX@/lib/$(PACKAGEDIR):@TCL_PREFIX@/lib:@MAPSERVERHOME@
++LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/@libdir@:@TCL_EXEC_PREFIX@/@libdir@/$(PACKAGEDIR):@TCL_PREFIX@/@libdir@:@MAPSERVERHOME@
+
+ MAPSERVERHOME = @MAPSERVERHOME@
+ MAPSERVERDEFS = @MAPSERVERDEFS@
+@@ -69,14 +69,14 @@
+ $(DLTARGET)$(TCL_SHLIB_SUFFIX): mapscript_wrap.o
+
+ install: $(DLTARGET)$(TCL_SHLIB_SUFFIX)
+- -mkdir $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
++ -mkdir $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
+ chmod +x \
+- $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX)
+- cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
+- cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)
++ $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX)
++ cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
++ cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)
+
+
+ useprebuilt:
+--- mapscript/mapscript.i 2005-11-22 22:44:48.000000000 +0100
++++ mapscript/mapscript.i 2006-04-12 23:47:23.000000000 +0200
+@@ -206,7 +206,7 @@
+
+ /* Tcl */
+ #ifdef SWIGTCL8
+-%include "tclmodule.i"
++/* %include "tclmodule.i" */
+ #endif /* SWIGTCL8 */
+
+ /*
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
new file mode 100644
index 00000000000..6766c1d2e83
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-6.0.1-r2.ebuild
@@ -0,0 +1,234 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-4 php5-5"
+
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+PYTHON_MODNAME="mapscript.py"
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils autotools depend.apache webapp distutils perl-module php-ext-source-r2 multilib # ruby-ng
+
+DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
+HOMEPAGE="http://mapserver.org/"
+SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
+
+RDEPEND="
+ !${CATEGORY}/${PN}:${PV}
+ dev-libs/expat
+ dev-libs/fcgi
+ >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+ media-libs/giflib
+ net-misc/curl
+ virtual/jpeg
+ virtual/libiconv
+ x11-libs/agg
+ bidi? ( dev-libs/fribidi )
+ cairo? ( x11-libs/cairo )
+ gdal? ( >=sci-libs/gdal-1.8.0 )
+ geos? ( sci-libs/geos )
+ mysql? ( virtual/mysql )
+ opengl? (
+ media-libs/ftgl
+ media-libs/mesa
+ )
+ perl? ( dev-lang/perl:= )
+ postgis? ( dev-db/postgis )
+ proj? ( sci-libs/proj net-misc/curl )
+ tiff? (
+ media-libs/tiff
+ sci-libs/libgeotiff
+ )
+ xml? ( dev-libs/libxml2:2 )
+ xslt? ( dev-libs/libxslt[crypt] )
+"
+for i in perl python; do
+ SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
+done
+DEPEND="${RDEPEND} ${SWIG_DEPEND}"
+unset SWIG_DEPEND
+unset i
+
+need_apache2
+
+S=${WORKDIR}/${MY_P}
+
+_enter_build_dir() {
+ [[ -z ${1} ]] && die "Missing path argument"
+ local workdir=${1}
+ shift
+ [[ -z ${1} ]] && die "missing command argument"
+
+ echo ">>> Running \"${@}\" in work directory \"${workdir}\""
+ pushd "${workdir}" > /dev/null || die "Failed to enter directory"
+ ${@} || die
+ popd > /dev/null
+}
+
+each_ruby_configure() { ${RUBY} extconf.rb || die ; }
+
+ext-source-r2_src_install() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ insinto "${EXT_DIR}"
+ newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+ done
+ php-ext-source-r2_createinifiles
+}
+
+pkg_setup() {
+ webapp_pkg_setup
+ use perl && perl_set_version
+ use python && python_pkg_setup
+ #use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+ # unpack A and then copy the php thingies into workdir/php-slot
+ php-ext-source-r2_src_unpack
+ # HACK: and then remove it and replace by symlink
+ for slot in $(php_get_slots); do
+ rm -rf "${WORKDIR}/${slot}" || die
+ ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+ done
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
+ "${FILESDIR}/6.0.0_rc1-bool.patch" \
+ "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
+ "${FILESDIR}/6.1.0-php-5.4.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myopts
+
+ if use gdal && use proj ; then
+ myopts+="
+ --with-wfs
+ --with-wcs
+ --with-wfsclient
+ --with-wmsclient
+ "
+ use xml && myopts+=" --with-sos"
+ fi
+
+ # some scripts require configure time options so place it here
+ if use php ; then
+ use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
+ use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
+ fi
+
+ # sde is ESRI package that you have to buy first
+ # oraclespatial needs oracle server for testing/usage
+ # note that some options accept just path, they are not on/off switches!
+ econf \
+ --without-oraclespatial \
+ --without-sde \
+ --with-libiconv \
+ --with-jpeg \
+ --with-gd \
+ --with-gif="${EPREFIX}/usr/" \
+ --with-wms \
+ --with-kml \
+ --with-curl-config \
+ --with-agg-svg-symbols \
+ --with-httpd="${APACHE_BIN}" \
+ --with-fastcgi \
+ $(use_with opengl ogl) \
+ $(use_with opengl ftgl) \
+ $(use_with proj) \
+ $(use_with threads) \
+ $(use_with geos) \
+ $(use_with gdal) \
+ $(use_with gdal ogr) \
+ $(use_with postgis) \
+ $(use_with mysql) \
+ $(use_with xml xml2-config) \
+ $(use_with xslt) \
+ $(use_with xslt xml-mapfile) \
+ $(use_with bidi fribidi-config) \
+ $(use_with cairo) \
+ ${myopts}
+
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
+}
+
+src_compile() {
+ default
+ use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_compile"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
+ #use php && php-ext-source-r2_src_compile # already compiled by the emake all
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
+}
+
+src_install() {
+ local step="Installing"
+ local extra_dir="fonts tests tests/vera symbols"
+ local i
+
+ dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
+ sortshp tile4ms msencrypt mapserver-config
+
+ dodoc INSTALL README HISTORY.TXT
+
+ for i in ${extra_dir}; do
+ docinto /usr/share/doc/${PF}/${i}
+ dodoc -r ${i}/* || die
+ done
+
+ use python && _enter_build_dir "${S}/mapscript/python" "distutils_src_install"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
+ use php && ext-source-r2_src_install
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
+
+ webapp_src_preinst
+ exeinto "${MY_CGIBINDIR}"
+ doexe "${S}/mapserv"
+ webapp_src_install
+}
+
+pkg_preinst() {
+ use perl && perl_set_version
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+ use python && distutils_pkg_postinst
+}
+
+pkg_prerm() {
+ webapp_pkg_prerm
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
diff --git a/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
new file mode 100644
index 00000000000..5e981d3c3ea
--- /dev/null
+++ b/sci-geosciences/mapserver/mapserver-6.0.1-r3.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-${PV/_/-}"
+
+PHP_EXT_OPTIONAL_USE="php"
+PHP_EXT_NAME="php_mapscript"
+PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/"
+PHP_EXT_SKIP_PHPIZE="no"
+USE_PHP="php5-4 php5-5"
+
+PYTHON_COMPAT=( python2_7 )
+
+#USE_RUBY="ruby18 ruby19"
+#RUBY_OPTIONAL="yes"
+
+WEBAPP_MANUAL_SLOT=yes
+
+inherit eutils autotools depend.apache webapp distutils-r1 perl-module php-ext-source-r2 multilib # ruby-ng
+
+DESCRIPTION="OpenSource development environment for constructing spatially enabled Internet-web applications"
+HOMEPAGE="http://mapserver.org/"
+SRC_URI="http://download.osgeo.org/mapserver/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="bidi cairo gdal geos mysql opengl perl php postgis proj python threads tiff xml xslt" # ruby php tcl
+
+REQUIRED_USE="php? ( ^^ ( php_targets_php5-4 php_targets_php5-5 ) )"
+
+RDEPEND="
+ !${CATEGORY}/${PN}:${PV}
+ dev-libs/expat
+ dev-libs/fcgi
+ >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib]
+ media-libs/giflib
+ net-misc/curl
+ virtual/jpeg:=
+ virtual/libiconv
+ x11-libs/agg
+ bidi? ( dev-libs/fribidi )
+ cairo? ( x11-libs/cairo )
+ gdal? ( >=sci-libs/gdal-1.8.0 )
+ geos? ( sci-libs/geos )
+ mysql? ( virtual/mysql )
+ opengl? (
+ media-libs/ftgl
+ media-libs/mesa
+ )
+ perl? ( dev-lang/perl:= )
+ postgis? ( dev-db/postgis )
+ proj? ( sci-libs/proj net-misc/curl )
+ tiff? (
+ media-libs/tiff:=
+ sci-libs/libgeotiff
+ )
+ xml? ( dev-libs/libxml2:2 )
+ xslt? ( dev-libs/libxslt[crypt] )
+"
+for i in perl python; do
+ SWIG_DEPEND+=" ${i}? ( >=dev-lang/swig-2.0 )"
+done
+DEPEND="${RDEPEND} ${SWIG_DEPEND}"
+unset SWIG_DEPEND
+unset i
+
+need_apache2
+
+S=${WORKDIR}/${MY_P}
+
+_enter_build_dir() {
+ [[ -z ${1} ]] && die "Missing path argument"
+ local workdir=${1}
+ shift
+ [[ -z ${1} ]] && die "missing command argument"
+
+ echo ">>> Running \"${@}\" in work directory \"${workdir}\""
+ pushd "${workdir}" > /dev/null || die "Failed to enter directory"
+ ${@} || die
+ popd > /dev/null
+}
+
+each_ruby_configure() { ${RUBY} extconf.rb || die ; }
+
+ext-source-r2_src_install() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env ${slot}
+ insinto "${EXT_DIR}"
+ newins "${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+ done
+ php-ext-source-r2_createinifiles
+}
+
+pkg_setup() {
+ webapp_pkg_setup
+ use perl && perl_set_version
+ #use ruby && ruby-ng_pkg_setup
+}
+
+src_unpack() {
+ # unpack A and then copy the php thingies into workdir/php-slot
+ php-ext-source-r2_src_unpack
+ # HACK: and then remove it and replace by symlink
+ for slot in $(php_get_slots); do
+ rm -rf "${WORKDIR}/${slot}" || die
+ ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die
+ done
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/6.0.0_rc1-ldflags.patch" \
+ "${FILESDIR}/6.0.0_rc1-bool.patch" \
+ "${FILESDIR}/6.0.0_rc1-php_ldflags.patch" \
+ "${FILESDIR}/6.1.0-php-5.4.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myopts
+
+ if use gdal && use proj ; then
+ myopts+="
+ --with-wfs
+ --with-wcs
+ --with-wfsclient
+ --with-wmsclient
+ "
+ use xml && myopts+=" --with-sos"
+ fi
+
+ # some scripts require configure time options so place it here
+ if use php ; then
+ use php_targets_php5-4 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.4/include/php/"
+ use php_targets_php5-5 && myopts+=" --with-php=${EPREFIX}/usr/$(get_libdir)/php5.5/include/php/"
+ fi
+
+ # sde is ESRI package that you have to buy first
+ # oraclespatial needs oracle server for testing/usage
+ # note that some options accept just path, they are not on/off switches!
+ econf \
+ --without-oraclespatial \
+ --without-sde \
+ --with-libiconv \
+ --with-jpeg \
+ --with-gd \
+ --with-gif="${EPREFIX}/usr/" \
+ --with-wms \
+ --with-kml \
+ --with-curl-config \
+ --with-agg-svg-symbols \
+ --with-httpd="${APACHE_BIN}" \
+ --with-fastcgi \
+ $(use_with opengl ogl) \
+ $(use_with opengl ftgl) \
+ $(use_with proj) \
+ $(use_with threads) \
+ $(use_with geos) \
+ $(use_with gdal) \
+ $(use_with gdal ogr) \
+ $(use_with postgis) \
+ $(use_with mysql) \
+ $(use_with xml xml2-config) \
+ $(use_with xslt) \
+ $(use_with xslt xml-mapfile) \
+ $(use_with bidi fribidi-config) \
+ $(use_with cairo) \
+ ${myopts}
+
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ln -s ../mapscript.i ./"
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_configure"
+}
+
+src_compile() {
+ default
+ use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_compile"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_prep"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_compile"
+ #use php && php-ext-source-r2_src_compile # already compiled by the emake all
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_compile"
+}
+
+src_install() {
+ local step="Installing"
+ local extra_dir="fonts tests tests/vera symbols"
+ local i
+
+ dobin shp2img legend shptree shptreevis shp2img legend shptreetst scalebar \
+ sortshp tile4ms msencrypt mapserver-config
+
+ dodoc INSTALL README HISTORY.TXT
+
+ for i in ${extra_dir}; do
+ docinto /usr/share/doc/${PF}/${i}
+ dodoc -r ${i}/* || die
+ done
+
+ use python && _enter_build_dir "${S}/mapscript/python" "distutils-r1_src_install"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl-module_src_install"
+ use perl && _enter_build_dir "${S}/mapscript/perl" "perl_delete_localpod"
+ use php && ext-source-r2_src_install
+ #use ruby && _enter_build_dir "${S}/mapscript/ruby" "ruby-ng_src_install"
+
+ webapp_src_preinst
+ exeinto "${MY_CGIBINDIR}"
+ doexe "${S}/mapserv"
+ webapp_src_install
+}
+
+pkg_preinst() {
+ use perl && perl_set_version
+}
+
+pkg_prerm() {
+ webapp_pkg_prerm
+}
diff --git a/sci-geosciences/mapserver/metadata.xml b/sci-geosciences/mapserver/metadata.xml
new file mode 100644
index 00000000000..a4103a88dd1
--- /dev/null
+++ b/sci-geosciences/mapserver/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <use>
+ <flag name="gdal">Enable <pkg>sci-libs/gdal</pkg> library support</flag>
+ <flag name="geos">Enable <pkg>sci-libs/geos</pkg> library support</flag>
+ <flag name="postgis">Enable <pkg>dev-db/postgis</pkg> support</flag>
+ <flag name="proj">Enable <pkg>sci-libs/proj</pkg> library support (geographic projections)</flag>
+ <flag name="xslt">Enable xslt and exslt support xml-mapfile support</flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-geosciences/mc2bsbh/Manifest b/sci-geosciences/mc2bsbh/Manifest
new file mode 100644
index 00000000000..dd80455f766
--- /dev/null
+++ b/sci-geosciences/mc2bsbh/Manifest
@@ -0,0 +1 @@
+DIST mc2bsbh-beta09.zip 116369 RMD160 d7cb1400a39fd8b9481f77033033c9cad179fb59 SHA1 a004da48c25be059cb8b5fd3c6d49ab6a5fcd5a4 SHA256 a467efbdb7b992eff5f9654e0cbe6d99d5e0ef7b6210e10f13d22f49e4d37cd5
diff --git a/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild b/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild
new file mode 100644
index 00000000000..95081fd7ada
--- /dev/null
+++ b/sci-geosciences/mc2bsbh/mc2bsbh-0.0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="MapCal to BSBchart Header Utility"
+HOMEPAGE="http://www.dacust.com/inlandwaters/mapcal/"
+SRC_URI="http://www.dacust.com/inlandwaters/mapcal/${PN}/${PN}-beta09.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_compile() {
+ $(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -o ${PN} ${PN}.cpp || die
+}
+
+src_install() {
+ dobin "${PN}"
+}
diff --git a/sci-geosciences/mc2bsbh/metadata.xml b/sci-geosciences/mc2bsbh/metadata.xml
new file mode 100644
index 00000000000..0926560098f
--- /dev/null
+++ b/sci-geosciences/mc2bsbh/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/merkaartor/Manifest b/sci-geosciences/merkaartor/Manifest
new file mode 100644
index 00000000000..9950ede2b13
--- /dev/null
+++ b/sci-geosciences/merkaartor/Manifest
@@ -0,0 +1,3 @@
+DIST merkaartor-0.17.2.tar.bz2 7138991 SHA256 425f4facefbf20a3dd1a09ee61ff8a8912482d1a30c957c50869d8ff59ba702a SHA512 3718131d855ad6ea17537c7879a3249f25f6f5aaaf00e2e59df10c5497a628f0877f85129a209d11dc969b5771598f9989cc6ca3a972dab4c3eaef507784d4ed WHIRLPOOL 22a07736e7da44d3799831352d0e9d323143f228dcf7693b6f90fe101a8a04c74c2c5186db15723902b7dd8aadd93a78547e4622b5238ceb7074027e987b8487
+DIST merkaartor-0.18.1.tar.bz2 5579080 SHA256 3d6a96599815d5f1c8558acd255a413ea47b93ddad8414147d11775a6f21139f SHA512 d45b25ad5a7f19b32ca3e91ad514ef1a8450024bdab9e8c215f60a5ec3fc6332a5cadfcec586a32805c7727d224588b504b01d3023120d55476660a8a394cd45 WHIRLPOOL 23327a7eaa91531a95665fe9ff647712606babf96e3843ef33b94a37f6f7ca6d1cb09576b0b31197badc32e87cfc7ca275a9e3792e57f57dd58fe0509ec1b46d
+DIST merkaartor-0.18.1.tar.gz 6459640 SHA256 e9fa5e30e6392c9224f73e9bb7d17b66c4eb6c023633eb2af0cf58ba8acf684f SHA512 5ccb2aca7463cd3b31790b0f231cd18f4499b38ec3eb14c3600bdaae880194a71aaf63a2c2f814af6277b1b07fd618b4393309aa5ded375940bd464d1e77d71d WHIRLPOOL fde10a93510c123f2e1065ad745c3abc7860892c55ed615e75214dd172bfbec1da6f254377cc2d6e0f1df6f9d0680d0f7878ba3224651f5b09c590c335211d9c
diff --git a/sci-geosciences/merkaartor/files/0.17.2-includes.patch b/sci-geosciences/merkaartor/files/0.17.2-includes.patch
new file mode 100644
index 00000000000..2458aec201f
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/0.17.2-includes.patch
@@ -0,0 +1,11 @@
+diff -urN merkaartor-0.17.2.old/src/MainWindow.cpp merkaartor-0.17.2/src/MainWindow.cpp
+--- merkaartor-0.17.2.old/src/MainWindow.cpp 2011-06-09 22:01:46.624543619 +0200
++++ merkaartor-0.17.2/src/MainWindow.cpp 2011-06-09 22:02:27.891027716 +0200
+@@ -92,6 +92,7 @@
+ #include <QtGui/QFileDialog>
+ #include <QtGui/QMessageBox>
+ #include <QtGui/QMouseEvent>
++#include <QtNetwork>
+ #include <QInputDialog>
+ #include <QClipboard>
+ #include <QProgressDialog>
diff --git a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
new file mode 100644
index 00000000000..d5fdf70f473
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
@@ -0,0 +1,12 @@
+diff -urN merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h
+--- merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h 2011-06-10 17:26:49.000000000 +0200
++++ merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h 2011-06-10 17:29:46.000000000 +0200
+@@ -21,7 +21,7 @@
+ #include <QNetworkProxy>
+
+ #ifdef USE_LIBPROXY
+-#include <libproxy/proxy.h>
++#include <proxy.h>
+ #endif
+
+ #include "Maps/Coord.h"
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
new file mode 100644
index 00000000000..52955735e20
--- /dev/null
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
@@ -0,0 +1,43 @@
+From e4cda9c42c049577caf126e8849c4b9eba62b31b Mon Sep 17 00:00:00 2001
+From: Nikoli <nikoli@gmx.us>
+Date: Thu, 10 Oct 2013 16:28:02 +0400
+Subject: [PATCH] Support for building with system qtsingleapplication and
+ quazip
+
+---
+ INSTALL | 1 +
+ src/src.pro | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/INSTALL b/INSTALL
+index a828c17..022e8d0 100644
+--- a/INSTALL
++++ b/INSTALL
+@@ -33,6 +33,7 @@ TRANSDIR_MERKAARTOR=<path> - where will the Merkaartor translations be installed
+ TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is
+ NODEBUG=1 - release target
+ NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)
++SYSTEM_QTSA - use system copy of qtsingleapplication instead of internal
+
+ see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list
+
+diff --git a/src/src.pro b/src/src.pro
+index f23e05e..ff228b6 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -6,7 +6,11 @@ include (Config.pri)
+ #Custom config
+ include(Custom.pri)
+
+-include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
++isEmpty(SYSTEM_QTSA) {
++ include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
++} else {
++ CONFIG += qtsingleapplication
++}
+ include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
+
+ #Qt Version
+--
+2.0.5
+
diff --git a/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
new file mode 100644
index 00000000000..70efafc2412
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.17.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+REDMINE_HASH="253"
+
+inherit multilib qt4-r2 ${SCM_ECLASS}
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be"
+SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug exif gps nls libproxy"
+
+QT_MINIMAL="4.7.2"
+DEPEND="
+ >=dev-libs/boost-1.46
+ >=sci-libs/gdal-1.6.0
+ >=sci-libs/proj-4.6
+ >=dev-qt/qtgui-${QT_MINIMAL}:4
+ >=dev-qt/qtsvg-${QT_MINIMAL}:4
+ >=dev-qt/qtwebkit-${QT_MINIMAL}:4
+ exif? ( media-gfx/exiv2 )
+ gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
+ libproxy? ( net-libs/libproxy )
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS CHANGELOG HACKING"
+
+PATCHES=(
+ "${FILESDIR}/${PV}-includes.patch"
+ "${FILESDIR}/${PV}-libproxy.patch"
+)
+
+merkaartor_use() {
+ local useflag=${1}
+ [[ -z ${useflag} ]] && die "No useflag specified"
+ if use ${useflag}; then
+ echo "1"
+ else
+ echo "0"
+ fi
+}
+
+src_configure() {
+ local myconf
+ myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
+ myconf+=" GEOIMAGE=$(${PN}_use exif)"
+ myconf+=" GPSDLIB=$(${PN}_use gps)"
+ myconf+=" LIBPROXY=$(${PN}_use libproxy)"
+ myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
+ myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix
+ myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671
+
+ if use nls; then
+ lrelease src/src.pro || die "lrelease failed"
+ fi
+
+ eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild
new file mode 100644
index 00000000000..33f4f5458c9
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
+
+inherit eutils fdo-mime gnome2-utils l10n multilib qt4-r2
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif gps libproxy qrcode"
+
+RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qtwebkit:4
+ >=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
+ >=sci-libs/gdal-1.6.0
+ >=sci-libs/proj-4.6
+ sys-libs/zlib
+ exif? ( media-gfx/exiv2:= )
+ gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
+ libproxy? ( net-libs/libproxy )
+ qrcode? ( media-gfx/zbar )
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.46
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG HACKING )
+
+src_prepare() {
+ my_rm_loc() {
+ sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+ rm "translations/${PN}_${1}.ts" || die
+ }
+
+ l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
+
+ if [[ -n "$(l10n_get_locales)" ]]; then
+ l10n_for_each_disabled_locale_do my_rm_loc
+ $(qt4_get_bindir)/lrelease src/src.pro || die
+ fi
+
+ epatch "${FILESDIR}"/${P}-system-libs.patch
+ epatch_user
+}
+
+src_configure() {
+ # TRANSDIR_SYSTEM is for bug #385671
+ eqmake4 \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
+ TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
+ SYSTEM_QTSA=1 \
+ RELEASE=1 \
+ NODEBUG="$(usex debug '0' '1')" \
+ GEOIMAGE="$(usex exif '1' '0')" \
+ GPSDLIB="$(usex gps '1' '0')" \
+ LIBPROXY="$(usex libproxy '1' '0')" \
+ ZBAR="$(usex qrcode '1' '0')" \
+ Merkaartor.pro
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
new file mode 100644
index 00000000000..97f71518ee1
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+REDMINE_HASH="301"
+
+inherit multilib qt4-r2 ${SCM_ECLASS}
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be"
+SRC_URI="http://merkaartor.be/attachments/download/${REDMINE_HASH}/merkaartor-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug exif gps nls libproxy"
+
+QT_MINIMAL="4.7.2"
+DEPEND="
+ >=dev-libs/boost-1.46
+ >=sci-libs/gdal-1.6.0
+ >=sci-libs/proj-4.6
+ >=dev-qt/qtgui-${QT_MINIMAL}:4
+ >=dev-qt/qtsvg-${QT_MINIMAL}:4
+ >=dev-qt/qtwebkit-${QT_MINIMAL}:4
+ exif? ( media-gfx/exiv2 )
+ gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
+ libproxy? ( net-libs/libproxy )
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS CHANGELOG HACKING"
+
+PATCHES=(
+# "${FILESDIR}"/0.17.2-includes.patch
+# "${FILESDIR}"/0.17.2-libproxy.patch
+)
+
+merkaartor_use() {
+ local useflag=${1}
+ [[ -z ${useflag} ]] && die "No useflag specified"
+ if use ${useflag}; then
+ echo "1"
+ else
+ echo "0"
+ fi
+}
+
+src_configure() {
+ local myconf
+ myconf+=" RELEASE=1 ZBAR=0" # deps not in main tree so hard-disable
+ myconf+=" GEOIMAGE=$(${PN}_use exif)"
+ myconf+=" GPSDLIB=$(${PN}_use gps)"
+ myconf+=" LIBPROXY=$(${PN}_use libproxy)"
+ myconf+=" NODEBUG=$(use debug && echo "0" || echo "1")" # inverse logic
+ myconf+=" NOUSEWEBKIT=0" # fails to link if disabled, upstream needs to fix
+ myconf+=" TRANSDIR_MERKAARTOR=/usr/share/${PN}/translations TRANSDIR_SYSTEM=/usr/share/qt4/translations" #385671
+
+ if use nls; then
+ lrelease src/src.pro || die "lrelease failed"
+ fi
+
+ eqmake4 Merkaartor.pro LIBDIR=/usr/$(get_libdir) PREFIX=/usr/ ${myconf}
+}
diff --git a/sci-geosciences/merkaartor/merkaartor-9999.ebuild b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
new file mode 100644
index 00000000000..633d069906c
--- /dev/null
+++ b/sci-geosciences/merkaartor/merkaartor-9999.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
+
+inherit eutils fdo-mime gnome2-utils git-r3 l10n multilib qt4-r2
+
+DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
+HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/openstreetmap/merkaartor.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug exif gps libproxy qrcode"
+
+RDEPEND="
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qtwebkit:4
+ >=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
+ >=dev-libs/quazip-0.7[qt4(+)]
+ >=sci-libs/gdal-1.6.0
+ >=sci-libs/proj-4.6
+ sys-libs/zlib
+ exif? ( media-gfx/exiv2:= )
+ gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
+ libproxy? ( net-libs/libproxy )
+ qrcode? ( media-gfx/zbar )
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.46
+ virtual/pkgconfig
+"
+
+DOCS=( AUTHORS CHANGELOG HACKING )
+
+src_unpack() {
+ git-r3_src_unpack
+}
+
+src_prepare() {
+ my_rm_loc() {
+ sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
+ rm "translations/${PN}_${1}.ts" || die
+ }
+
+ l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
+
+ if [[ -n "$(l10n_get_locales)" ]]; then
+ l10n_for_each_disabled_locale_do my_rm_loc
+ $(qt4_get_bindir)/lrelease src/src.pro || die
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ # TRANSDIR_SYSTEM is for bug #385671
+ eqmake4 \
+ PREFIX="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
+ TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
+ SYSTEM_QTSA=1 \
+ SYSTEM_QUAZIP=1 \
+ NODEBUG="$(usex debug '0' '1')" \
+ GEOIMAGE="$(usex exif '1' '0')" \
+ GPSDLIB="$(usex gps '1' '0')" \
+ LIBPROXY="$(usex libproxy '1' '0')" \
+ ZBAR="$(usex qrcode '1' '0')" \
+ Merkaartor.pro
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/merkaartor/metadata.xml b/sci-geosciences/merkaartor/metadata.xml
new file mode 100644
index 00000000000..fabea7a8e6d
--- /dev/null
+++ b/sci-geosciences/merkaartor/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <use>
+ <flag name="libproxy">
+ Use <pkg>net-libs/libproxy</pkg> for getting the HTTP/HTTPS/SOCKS proxy configuration
+ </flag>
+ <flag name="qrcode">
+ Enable QR code scanning with <pkg>media-gfx/zbar</pkg>
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">openstreetmap/merkaartor</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/metadata.xml b/sci-geosciences/metadata.xml
new file mode 100644
index 00000000000..ca00dbc0225
--- /dev/null
+++ b/sci-geosciences/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The sci-geosciences category contains geosciences-related software.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie sci-geosciences enthält Software aus dem Bereich der
+ Geowissenschaften.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría sci-geosciences contiene programas relacionados con la
+ geología.
+ </longdescription>
+ <longdescription lang="ja">
+ sci-geosciencesカテゴリーには地球科学関連のソフトウェアが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De sci-geosciences categorie bevat programma's voor gebruik in de geologie
+ en andere aardwetenschappen.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm sci-geosciences chứa các phần mềm liên quan đến địa-khoa học.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria sci-geosciences contiene programmi di geologia.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria sci-geosciences contém programas relacionados com
+ geologia.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria sci-geosciences zawiera programy naukowe związane z geologią.
+ </longdescription>
+</catmetadata>
+
diff --git a/sci-geosciences/mkgmap/Manifest b/sci-geosciences/mkgmap/Manifest
new file mode 100644
index 00000000000..f0296933de7
--- /dev/null
+++ b/sci-geosciences/mkgmap/Manifest
@@ -0,0 +1 @@
+DIST mkgmap-r1995-src.tar.gz 1250713 RMD160 4e904e741a7f11de5ff97c937b622e96e9949b84 SHA1 ba497a3cbb920ed0a95d67bcc8d41359b28f0917 SHA256 257137641c6be819c7e4b458eae8957a9736b6cbcdd6db83cddb313d12b403e9
diff --git a/sci-geosciences/mkgmap/metadata.xml b/sci-geosciences/mkgmap/metadata.xml
new file mode 100644
index 00000000000..3beda91ba20
--- /dev/null
+++ b/sci-geosciences/mkgmap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/mkgmap/mkgmap-1995.ebuild b/sci-geosciences/mkgmap/mkgmap-1995.ebuild
new file mode 100644
index 00000000000..37ac50318b8
--- /dev/null
+++ b/sci-geosciences/mkgmap/mkgmap-1995.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+JAVA_ANT_ENCODING=UTF-8
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Tool to create garmin maps"
+HOMEPAGE="http://www.mkgmap.org.uk"
+SRC_URI="http://www.mkgmap.org.uk/snapshots/${PN}-r${PV}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+src_compile() {
+ eant dist || die
+}
+
+src_install() {
+ java-pkg_newjar "dist/${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ dodoc dist/README dist/doc/Credits dist/doc/*.txt
+ doman dist/doc/mkgmap.1
+}
diff --git a/sci-geosciences/mtkbabel/Manifest b/sci-geosciences/mtkbabel/Manifest
new file mode 100644
index 00000000000..d1d695803c1
--- /dev/null
+++ b/sci-geosciences/mtkbabel/Manifest
@@ -0,0 +1,2 @@
+DIST mtkbabel-0.8.2.tar.gz 27896 SHA256 3c7b7959b7d0394a99fc95fd524b9a698c19bfe0b59188bd3cf7bb15f81ed6df
+DIST mtkbabel-0.8.3.1.tar.gz 28472 SHA256 c054f32ac6b2adf0815b485695b50e23f24bb147d0357c5df10c76098f9eddad SHA512 795d058bf622b5381600fc82a67aa32258db0ce2d1c22f148b6a1b34a6afe585f31fd0a5fccd2743602b55f53fa3b6b0f8c7269ebee1555a58374e33a80d22d7 WHIRLPOOL 131aefea7a7fb1bbcd477108fa13a2d425f9f658000d9961e6c4431198c00afbb8654c55812914af1feffae727b044000cd65c79e75a0618237252f514ea45f4
diff --git a/sci-geosciences/mtkbabel/metadata.xml b/sci-geosciences/mtkbabel/metadata.xml
new file mode 100644
index 00000000000..216ac4862b8
--- /dev/null
+++ b/sci-geosciences/mtkbabel/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <longdescription lang="en">
+MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger.
+It should work also with other GPS devices based on the MediaTek MTK chipset.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">mtkbabel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.2.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.2.ebuild
new file mode 100644
index 00000000000..e68a43c0a10
--- /dev/null
+++ b/sci-geosciences/mtkbabel/mtkbabel-0.8.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger"
+HOMEPAGE="http://sourceforge.net/projects/mtkbabel/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ dev-perl/Device-SerialPort
+ dev-perl/TimeDate
+"
+
+src_install() {
+ doman mtkbabel.1
+ dobin mtkbabel
+ dodoc MtkExtensionsv1.xsd README changelog
+}
diff --git a/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1.ebuild b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1.ebuild
new file mode 100644
index 00000000000..a8b77fa44e8
--- /dev/null
+++ b/sci-geosciences/mtkbabel/mtkbabel-0.8.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="MTKBabel is a Perl program to operate the i-Blue 747 GPS data logger"
+HOMEPAGE="http://sourceforge.net/projects/mtkbabel/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ dev-perl/Device-SerialPort
+ dev-perl/TimeDate
+"
+
+S=${WORKDIR}/${PV}
+
+src_install() {
+ doman mtkbabel.1
+ dobin mtkbabel
+ dodoc MtkExtensionsv1.xsd README changelog
+}
diff --git a/sci-geosciences/opencpn-plugin-br24radar/Manifest b/sci-geosciences/opencpn-plugin-br24radar/Manifest
new file mode 100644
index 00000000000..146bcb85038
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-br24radar/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-br24radar-1.1.tar.gz 172257 SHA256 7588b3c00175444dbd4c1a54e88e993767af25b784c3a1a20a6ab0ded176238d SHA512 94202b69fc276614c828c0266a3d7ade375f4bd4b26d4acbf92dc9b35c60ac45d7050b1af08667207e856fe9778796dec1786a11e16eba840ed80b140b78e78a WHIRLPOOL c79153da5cad0b8f503e1a3a5a9125ea8cf0ac5b353436ade61922db8f9e5f8937a3c4256d1fe2c972cb114016c5f9bf078b10c10d1d3e9445cf26c84ec1a789
diff --git a/sci-geosciences/opencpn-plugin-br24radar/metadata.xml b/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
new file mode 100644
index 00000000000..010539357cf
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-br24radar/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">canboat/BR24radar_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1.ebuild b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1.ebuild
new file mode 100644
index 00000000000..fcfcb91e732
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-br24radar/opencpn-plugin-br24radar-1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="BR24radar_pi"
+
+DESCRIPTION="Navico (Simrad, Lowrance) Broadband BR24/3G/4G Radar Plugin for OpenCPN"
+HOMEPAGE="http://opencpn-navico-radar-plugin.github.io/"
+SRC_URI="
+ https://github.com/canboat/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-climatology/Manifest b/sci-geosciences/opencpn-plugin-climatology/Manifest
new file mode 100644
index 00000000000..1065d242bcf
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-climatology/Manifest
@@ -0,0 +1,2 @@
+DIST opencpn-plugin-climatology-1.0-CL-DATA.tar.xz 5830716 SHA256 6179560ec6dc8cc5ca2527473b4a6003d0b7187353c1f58bd84b31869997d3b1 SHA512 5c0b724e7acbfe4a7f494d107806a3491f000f26f4a92519294975dd57a0ba68919c4bed3571ec8fa652138f26f09abd3742a1e5097fa54714564c70f84fbfd3 WHIRLPOOL ac8cdaecf5a795a40e97e3ad77cea1419d3102917252c940bc73ab8afbc72dd963d6faa39e2d364fbf78be610cfc25c6a4835eb2db85830aa0bdfce5d2c1ac72
+DIST opencpn-plugin-climatology-1.0.tar.gz 298279 SHA256 e18b9b688cfc88744c13cdaf01daa360965a84bddb0890adceff1391639abcea SHA512 6ace4fd2fb1625cbbff9305ca0b25fc275ed4b153473786b8f70cf31451f17010d0c59ec59dd22c2eed49833bf1d1785945e752b59169ecd89434ed049a33baf WHIRLPOOL 7311e8ffdadc5f16a40a6c4717b858b2f2b06675536417d75fe4e16aad94311a1b76b97ec7d9667e324d28b6bff8398f54dacf90984ed2d1192730634799e930
diff --git a/sci-geosciences/opencpn-plugin-climatology/metadata.xml b/sci-geosciences/opencpn-plugin-climatology/metadata.xml
new file mode 100644
index 00000000000..112a36bbcf8
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-climatology/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">opencpnplugins</remote-id>
+ <remote-id type="github">seandepagnier/climatology_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.ebuild b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.ebuild
new file mode 100644
index 00000000000..7a1d5c4c975
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-climatology/opencpn-plugin-climatology-1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="climatology_pi"
+
+DESCRIPTION="Climatology Plugin for OpenCPN (includes CL-DATA)"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="
+ https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ mirror://sourceforge/opencpnplugins/climatology_pi/CL-DATA-1.0.tar.xz -> ${P}-CL-DATA.tar.xz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ cmake-utils_src_install
+ insinto "/usr/share/opencpn/plugins/${MY_PN}/data/"
+ doins "${S}"/{,../}data/*
+}
diff --git a/sci-geosciences/opencpn-plugin-launcher/Manifest b/sci-geosciences/opencpn-plugin-launcher/Manifest
new file mode 100644
index 00000000000..53d880a81f3
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-launcher/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-launcher-1.0.tar.gz 126153 SHA256 56122ad3efa53aa30e289f78b0f8ba6e661b87e6c52f29cfcc28fc0815a83e6f SHA512 efaae3f9f8f1ecb4f4d1094714b7994cbbbb6bf69638a130db43f62a8852f9972003fd1b9ec20139e58a031c8b7c4ebdf1593a4044415a7f8c8417d1fcb7ac90 WHIRLPOOL 7b9239ef1c8be630b1146a36fff1d4fd309bba3152f8e1612ffe0448062d6cb37230db8426a04e779107a880e06402e506aeb6527b8be5e1e49eff1547dedc2b
diff --git a/sci-geosciences/opencpn-plugin-launcher/metadata.xml b/sci-geosciences/opencpn-plugin-launcher/metadata.xml
new file mode 100644
index 00000000000..a88c3246e94
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-launcher/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nohal/launcher_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0.ebuild b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0.ebuild
new file mode 100644
index 00000000000..ff7b1b8454e
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-launcher/opencpn-plugin-launcher-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="launcher_pi"
+
+DESCRIPTION="Launcher Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/Manifest b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
new file mode 100644
index 00000000000..cefb4d5d2f0
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-logbookkonni-1.2012.tar.gz 4222736 SHA256 990b753776940f42cfc616842181f7f1603d3cdaef0c4ec5463f3c0a31f038ff SHA512 b8ec20f97a807dce0f62ad4f93d083f03606499f81d8828d57d8b967d69a5b51f1c29319288a66bacb218b6adeae029b3557f50080ed29ed07324e2eac8e9da7 WHIRLPOOL cd716e8d037ad9518913fe48ff19538f361b46e23b9f7df8c7f4e5b07847c93a86ed48926502aa67781e1fc307e98c200e7f4ab6ecf9269947352a4bffec8780
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
new file mode 100644
index 00000000000..7f351bb360a
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">delatbabel/LogbookKonni-1.2</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2012.ebuild b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2012.ebuild
new file mode 100644
index 00000000000..0e308939bb5
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-logbookkonni/opencpn-plugin-logbookkonni-1.2012.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="LogbookKonni-1.2"
+
+DESCRIPTION="Logbook Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/delatbabel/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-objsearch/Manifest b/sci-geosciences/opencpn-plugin-objsearch/Manifest
new file mode 100644
index 00000000000..6d98e116551
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-objsearch/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-objsearch-0.5.1.tar.gz 1954813 SHA256 16923b02c74621f4868110235cae4a8a0261b6fe8c91b9a488a0c67c80e4ccc5 SHA512 dd83352eab307b991d3d296b9bbab2a972a2ce4f33c1ddc55c048c3414c11d5b7a8429a32f2d9c96017fb16c841dc3c6fee8522dea690eaa17b3c7e5ac1fbfd0 WHIRLPOOL 9e0ab972c163a26d67d2389f2179284e0f416aa1de8e993837decbcb23c7c4dadfcc044aa2f83ecc30f21478c1571236bc3f1c7a3231677085e3211527e2d7ea
diff --git a/sci-geosciences/opencpn-plugin-objsearch/metadata.xml b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
new file mode 100644
index 00000000000..55ad044d710
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-objsearch/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nohal/objsearch_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1.ebuild b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1.ebuild
new file mode 100644
index 00000000000..7cbc00bafe3
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-objsearch/opencpn-plugin-objsearch-0.5.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="objsearch_pi"
+
+DESCRIPTION="Chart Object Search Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest b/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
new file mode 100644
index 00000000000..a1575c44d51
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-ocpndebugger-1.0.tar.gz 109976 SHA256 519b7cf341932c31205772d89a27682622d038479e4f76135534d5b87aea145f SHA512 0230d123a706b136269d81a509bb64262c3b007d0d7b944089bb4bd113a56217cf0321ea82b170ce1ca8d3b4b08b996d09a088137c4d1817bb795ed4de50f6dd WHIRLPOOL d89d46d5239a0083028338faa39d17c1b7d24bbb4e989d11d4e9430f774c97c90a8ad66d1c0b6e61cec869db36dade2e7c62a1fee7b8346f5e3fd03b5c97da8f
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
new file mode 100644
index 00000000000..dc938a7ae9e
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nohal/ocpndebugger_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0.ebuild b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0.ebuild
new file mode 100644
index 00000000000..1f9c78cf851
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-ocpndebugger/opencpn-plugin-ocpndebugger-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="ocpndebugger_pi"
+
+DESCRIPTION="NMEA-data and plugin-API Debugger Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-statusbar/Manifest b/sci-geosciences/opencpn-plugin-statusbar/Manifest
new file mode 100644
index 00000000000..0105d8b1291
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-statusbar/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-statusbar-0.5.tar.gz 86323 SHA256 77b03dbfa946d53e9929d8086abfc8723a55260c0485417e8221ad46c243e26f SHA512 cf723717f41c87b3e7dd40c1d485f873d336f598fe022adf418290443333fd19d874d294bd4b36bea10e026fdf0e27b76d098196ba0aace360ae86c103c6e1b4 WHIRLPOOL 9e5327710114428d3ce47a71168411c16d046eef2992e9a972d50e1891ce0a8f57b67332674db1a4f9529de3e5d6772015b0ef618e8e3182e17fd53fe8f68387
diff --git a/sci-geosciences/opencpn-plugin-statusbar/metadata.xml b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
new file mode 100644
index 00000000000..716c11b549c
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-statusbar/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">seandepagnier/statusbar_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.ebuild b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.ebuild
new file mode 100644
index 00000000000..fd04211ebfe
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-statusbar/opencpn-plugin-statusbar-0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="statusbar_pi"
+
+DESCRIPTION="Statusbar Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="
+ https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/Manifest b/sci-geosciences/opencpn-plugin-weather_routing/Manifest
new file mode 100644
index 00000000000..ffe9792a163
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weather_routing/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-weather_routing-1.2.tar.gz 615959 SHA256 8b86c4f86092d6fcac8138c8699cf1f093ae67016caad8960222f26659b8dcc7 SHA512 99c9df317a79e89664ca45a8e3fa02a5f2c06a731d5208260d415f6acd4506fba283d4e4758a5deff3b331546ca8893282a287b32fceebdf27f0537a6d99944b WHIRLPOOL 0018e772659482f70f132a2216f5d17fb8c56418f0e7195bfe7eb791be9964d5c829fdf95258acf7d78e41723b05e3c5bf5dd57d19703f6cbb5271a31635b76a
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
new file mode 100644
index 00000000000..5d730ba9631
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weather_routing/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">seandepagnier/weather_routing_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.2.ebuild b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.2.ebuild
new file mode 100644
index 00000000000..ea528bcdd38
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weather_routing/opencpn-plugin-weather_routing-1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="weather_routing_pi"
+
+DESCRIPTION="Weather Routing Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="
+ https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/Manifest b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
new file mode 100644
index 00000000000..d79398a632c
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weatherfax/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-weatherfax-1.3.tar.gz 505937 SHA256 2b312259bc632416a53edd7d607fd26c8debd0d499e984b4da92bd8521c9de9f SHA512 54fe8f25a21d373ab00bcd5d77950532bb06c5324cdd1082e4109cad8a33b714ed0d7cd8ebe7e9540e5e10039b2a0fe23b4b88df0244f1e84b852111807ad6e4 WHIRLPOOL 654f1dd8cf93973a91d1200594896e91e2b22074023576c6b2e42cd21c271dec4ec5f9c2d1285c6b8f0d58331be6dc03c35c823d0a06123cbe2e20a03d2395d2
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
new file mode 100644
index 00000000000..d84967ebbf7
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weatherfax/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">seandepagnier/weatherfax_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.ebuild b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.ebuild
new file mode 100644
index 00000000000..7dc771b54bc
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-weatherfax/opencpn-plugin-weatherfax-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="weatherfax_pi"
+
+DESCRIPTION="Weatherfax Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="
+ https://github.com/seandepagnier/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn-plugin-wmm/Manifest b/sci-geosciences/opencpn-plugin-wmm/Manifest
new file mode 100644
index 00000000000..d9955c5ead4
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-wmm/Manifest
@@ -0,0 +1 @@
+DIST opencpn-plugin-wmm-1.0.tar.gz 3532763 SHA256 3c5cc4b9caeec766dc00cb1ca959cfb2775e93c4a4db2a33c678edaffa6e0e75 SHA512 97c577c02dcbb913be45a1438d3d9a974a81720594cc3a6f7757c1e7518d04051c02274acdad0bd8eee08fac94e1923390440f515dacb3b213547d9e93cb0a4f WHIRLPOOL 33bcf61b9d3eb01429788f31ef0760b7830b0c5f7eba7872f28374c6b3fa51464d76fa1db28b4ccbf747c2316a31975913727df61118f6604d35fedf0cfdcdf5
diff --git a/sci-geosciences/opencpn-plugin-wmm/metadata.xml b/sci-geosciences/opencpn-plugin-wmm/metadata.xml
new file mode 100644
index 00000000000..e9de5c118df
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-wmm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ <name>Marc Schiffbauer</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nohal/wmm_pi</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0.ebuild b/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0.ebuild
new file mode 100644
index 00000000000..6cabd663001
--- /dev/null
+++ b/sci-geosciences/opencpn-plugin-wmm/opencpn-plugin-wmm-1.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+MY_PN="wmm_pi"
+
+DESCRIPTION="World Magnetic Model Plugin for OpenCPN"
+HOMEPAGE="http://opencpn.org/ocpn/downloadplugins"
+SRC_URI="https://github.com/nohal/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sci-geosciences/opencpn-4.0.0
+ sys-devel/gettext
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/sci-geosciences/opencpn/Manifest b/sci-geosciences/opencpn/Manifest
new file mode 100644
index 00000000000..71145727428
--- /dev/null
+++ b/sci-geosciences/opencpn/Manifest
@@ -0,0 +1,4 @@
+DIST OpenCPN-3.0.2-Source.tar.gz 42818873 SHA256 0193bb1e33ba8feccbc42f5da9076a1e0f6518699094bd4414b7746f66321bf9 SHA512 6c5d027a21eb84d8d3c68851bf6cff399c4758c5a5ff022a877afb709a8a2ed40f6a1aefbf9befb3cf4b18870781f6a614704ef30fe231e75cf3fc6fc8179c61 WHIRLPOOL 4c43a0be5316b19bf68548441aa43f4c4b328f1c5f90bf6acc6fd4ace0ad01505a89c40ce880925e616e8b49a498e28e7add2755a7577f2172607e2d3784e628
+DIST opencpn-3.2.2.tar.gz 50225043 SHA256 bb53b8264fb6fd82e3e7778771ffdcec26621c24db9ece388c4e5e89711550ab SHA512 0ea40529e12ab3fd7f21c60d87c33aed2038b2dff1ecb9a4ff799f15fe6d0c73d65a91f7eb02949383f45629bfd4715319b72a6bb5bc76114b53636818e8ca6b WHIRLPOOL db5bca7541bc8aa7c18e80bdb25d91674f681e9f0922c885324896651ce075b74e017caee5e0d304617d92bf221e4e6c0754f6aae9276027a62383c38ca4b98f
+DIST opencpn-4.0.0.tar.gz 40095375 SHA256 b1930dc74a59744327496b0ec23b58836fa0643cb9dd1d5c5b7f1a8221bb801e SHA512 84e20d5a5496778096f9cbce3507475ae6c11619eb5cc19e928647e360980e2ac868d1f45712bfc8da3607d4fa3822b6672b8844a914b387aeeda7bf645668f0 WHIRLPOOL f1ee241203bccc32816e970c61a896f317f747c6c9701e2a15140724f75c8bca802df942e420d126f88ff9adae9c1634155e4e2b482f060e7955fb0061da82f3
+DIST opencpn-doc_4.0.0.orig.tar.xz 14732480 SHA256 3bc27c19f1b21e4cff69e594081cac765c1ff975374c02bc4fb703cb02a4cd92 SHA512 fb80e4afb759c99cf24b498c454bc492aa0b3c02443424b0f39910e1a494670093ac5ee19cd40a8a0abb345e18b7496b8a70c160bed5215af6bcee07e145ee36 WHIRLPOOL 49e51ab2555513fb4e7436d326c89a1e4b707be263bb5fb7a866bd79c1053c8078d932a39664de5701b12ae712db9d0fb9147002f40a1d9c3af1674d61bf7818
diff --git a/sci-geosciences/opencpn/files/opencpn-3.0.2-multilib-strict.patch b/sci-geosciences/opencpn/files/opencpn-3.0.2-multilib-strict.patch
new file mode 100644
index 00000000000..c66736fde9c
--- /dev/null
+++ b/sci-geosciences/opencpn/files/opencpn-3.0.2-multilib-strict.patch
@@ -0,0 +1,12 @@
+--- OpenCPN-3.0.2-Source/CMakeLists.txt.orig 2012-07-18 00:27:24.531257698 +0200
++++ OpenCPN-3.0.2-Source/CMakeLists.txt 2012-07-18 00:29:37.669412986 +0200
+@@ -99,6 +99,9 @@
+ SET (LIB_INSTALL_DIR "lib")
+ ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ ENDIF (EXISTS /etc/suse-release OR EXISTS /etc/SuSE-release)
++ IF (EXISTS /etc/gentoo-release)
++ SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
++ ENDIF (EXISTS /etc/gentoo-release)
+ IF(APPLE)
+ IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ IF (CMAKE_OSX_64)
diff --git a/sci-geosciences/opencpn/metadata.xml b/sci-geosciences/opencpn/metadata.xml
new file mode 100644
index 00000000000..e9ddde619e0
--- /dev/null
+++ b/sci-geosciences/opencpn/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>mschiff@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">OpenCPN/OpenCPN</remote-id>
+ <remote-id type="launchpad">~opencpn</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/opencpn/opencpn-3.0.2.ebuild b/sci-geosciences/opencpn/opencpn-3.0.2.ebuild
new file mode 100644
index 00000000000..cb17b4b9e15
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-3.0.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+MY_P=OpenCPN-${PV}-Source
+inherit cmake-utils wxwidgets
+
+DESCRIPTION="a free, open source software for marine navigation"
+HOMEPAGE="http://opencpn.org/"
+#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://opencpn.org/ocpn/downloads/beta/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/tinyxml
+ media-libs/freetype:2
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/gtk+:2
+ x11-libs/wxGTK:2.8[X]
+ gps? ( >=sci-geosciences/gpsd-2.96-r1 )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-multilib-strict.patch"
+)
+# "${FILESDIR}/${P}_tinyxml_stl.patch"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use gps GPSD)
+ -DUSE_S57=ON
+ -DUSE_GARMINHOST=ON
+ -DUSE_WIFI_CLIENT=OFF
+ )
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ if grep -rqE "sci-geosciences/opencpn.*gpsd" /etc/portage/package.use*; then
+ ewarn "The local 'gpsd' USE flag has been removed in favour of the"
+ if use gps; then
+ ewarn "global 'gps' USE flag which is enabled on your system."
+ ewarn ""
+ ewarn "Please remove the 'gpsd' USE flag from your make.conf"
+ ewarn "and/or /etc/portage/package.use files."
+ else
+ ewarn "global 'gps' USE flag."
+ ewarn ""
+ ewarn "In order to have GPS support in OpenCPN you need to"
+ ewarn "enable the 'gps' USE flag."
+ fi
+ fi
+}
diff --git a/sci-geosciences/opencpn/opencpn-3.2.2.ebuild b/sci-geosciences/opencpn/opencpn-3.2.2.ebuild
new file mode 100644
index 00000000000..5de0712406e
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-3.2.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+DESCRIPTION="a free, open source software for marine navigation"
+HOMEPAGE="http://opencpn.org/"
+SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/tinyxml
+ media-libs/freetype:2
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/gtk+:2
+ x11-libs/wxGTK:2.8[X]
+ gps? ( >=sci-geosciences/gpsd-2.96-r1 )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+S="${WORKDIR}/OpenCPN-${P}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use gps GPSD)
+ -DUSE_S57=ON
+ -DUSE_GARMINHOST=ON
+ -DUSE_WIFI_CLIENT=OFF
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/sci-geosciences/opencpn/opencpn-4.0.0.ebuild b/sci-geosciences/opencpn/opencpn-4.0.0.ebuild
new file mode 100644
index 00000000000..6298b6b4389
--- /dev/null
+++ b/sci-geosciences/opencpn/opencpn-4.0.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# TODO: add plugins
+
+## wmm_pi, World Magnetic Model (https://github.com/nohal/wmm_pi, GPL-2+)
+#WMM_PLUGIN_PV="1.0"
+#WMM_PLUGIN_PN="wmm_pi"
+#WMM_PLUGIN_P="${WMM_PLUGIN_PN}-${WMM_PLUGIN_PV}"
+#WMM_PLUGIN_URI="https://github.com/nohal/${WMM_PLUGIN_PN}/archive/${WMM_PLUGIN_PN}-v${WMM_PLUGIN_PV}.tar.gz"
+#WMM_PLUGIN_WD="${WORKDIR}/plugins/${WMM_PLUGIN_PN}"
+
+WX_GTK_VER="2.8"
+inherit cmake-utils wxwidgets
+
+DESCRIPTION="a free, open source software for marine navigation"
+HOMEPAGE="http://opencpn.org/"
+SRC_URI="https://github.com/OpenCPN/OpenCPN/archive/v${PV}.tar.gz -> ${P}.tar.gz
+doc? ( https://launchpad.net/~opencpn/+archive/ubuntu/${PN}/+files/${PN}-doc_${PV}.orig.tar.xz )
+"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gps opengl"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/tinyxml
+ media-libs/freetype:2
+ media-libs/portaudio
+ sys-libs/zlib
+ opengl? ( virtual/opengl )
+ x11-libs/gtk+:2
+ x11-libs/wxGTK:2.8[X]
+ gps? ( >=sci-geosciences/gpsd-2.96-r1 )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+S="${WORKDIR}/OpenCPN-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use gps GPSD)
+ -DUSE_S57=ON
+ -DUSE_GARMINHOST=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ if use doc; then
+ dohtml -r "${S}"/../${PN}/doc/*
+ fi
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ if use doc; then
+ einfo "Documentation is available at file:///usr/share/doc/${P}/html/help_en_US.html"
+ fi
+}
diff --git a/sci-geosciences/osgearth/Manifest b/sci-geosciences/osgearth/Manifest
new file mode 100644
index 00000000000..05f9801cc37
--- /dev/null
+++ b/sci-geosciences/osgearth/Manifest
@@ -0,0 +1 @@
+DIST osgearth-2.6.tar.gz 58605003 SHA256 965c93837520ab9538038843ff83ee1903548f8be191ee211e40abb0e6c1bb4a SHA512 3120547ef639d4c1ff0404358777317c8794a493a772dc7af11b8056fd3f799a5e16358c19970862d16f6ab98f78abb3ea25c3aa113df8a3df68d54818fb03bc WHIRLPOOL 6533e5a92ee973ff1d5bfb80ab3b051279bc65e85d00f0fb9027b6fe2be06efc5bd3907516c27e7e06b4c1cb03569650bf368b5d7728b848bc86ec9666607939
diff --git a/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch b/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch
new file mode 100644
index 00000000000..389609bd6c4
--- /dev/null
+++ b/sci-geosciences/osgearth/files/osgearth-2.6-cmake-options.patch
@@ -0,0 +1,30 @@
+commit d92cee4d9870fab08fdfadf9ab0bfb4658a09aa3
+Author: hasufell <hasufell@gentoo.org>
+Date: Fri Nov 22 14:06:34 2013 +0100
+
+ add cmake options
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 34cd375..dbb4cb4 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,8 +129,17 @@
+
+ # JavaScript Engines:
+ SET(V8_DIR "" CACHE PATH "set to base V8 install path")
+-FIND_PACKAGE(V8)
+-FIND_PACKAGE(JavaScriptCore)
++OPTION(OSGEARTH_USE_V8 "Enable to use V8 JavaScript engine" ON)
++IF(OSGEARTH_USE_V8)
++ FIND_PACKAGE(V8)
++ENDIF(OSGEARTH_USE_V8)
++
++OPTION(OSGEARTH_USE_JAVASCRIPTCORE "Enable use of JavaScriptCore" ON)
++OPTION(OSGEARTH_USE_LIBNOISE "Enable use of LibNoise" ON)
++
++IF (OSGEARTH_USE_JAVASCRIPTCORE)
++ FIND_PACKAGE(JavaScriptCore)
++ENDIF (OSGEARTH_USE_JAVASCRIPTCORE)
+
+ SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
+ IF (WITH_EXTERNAL_DUKTAPE)
diff --git a/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch b/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch
new file mode 100644
index 00000000000..ba43aceb1ed
--- /dev/null
+++ b/sci-geosciences/osgearth/files/osgearth-2.6-disable-qt5.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -146,10 +146,6 @@
+ FIND_PACKAGE(Duktape)
+ ENDIF (WITH_EXTERNAL_DUKTAPE)
+
+-FIND_PACKAGE(Qt5Core QUIET)
+-FIND_PACKAGE(Qt5Widgets QUIET)
+-FIND_PACKAGE(Qt5Gui QUIET)
+-FIND_PACKAGE(Qt5OpenGL QUIET)
+ IF ( Qt5Core_FOUND AND Qt5Widgets_FOUND AND Qt5Gui_FOUND AND Qt5OpenGL_FOUND )
+ SET(QT_INCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5OpenGL_INCLUDE_DIRS})
+ ELSE()
diff --git a/sci-geosciences/osgearth/metadata.xml b/sci-geosciences/osgearth/metadata.xml
new file mode 100644
index 00000000000..f1a2be1303e
--- /dev/null
+++ b/sci-geosciences/osgearth/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ osgEarth is a C++ terrain rendering toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and
+ vector data, load it into your favorite OpenSceneGraph
+ application, and go! osgEarth supports all kinds of data and
+ comes with lots of examples to help you get up and running
+ quickly and easily.
+ </longdescription>
+ <upstream>
+ <doc lang="en">http://docs.osgearth.org/en/latest</doc>
+ <bugs-to>https://github.com/gwaldron/osgearth/issues</bugs-to>
+ <remote-id type="github">gwaldron/osgearth</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/osgearth/osgearth-2.6.ebuild b/sci-geosciences/osgearth/osgearth-2.6.ebuild
new file mode 100644
index 00000000000..9265f0b5fef
--- /dev/null
+++ b/sci-geosciences/osgearth/osgearth-2.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Dynamic map generation toolkit for OpenSceneGraph"
+HOMEPAGE="http://osgearth.org/"
+SRC_URI="https://github.com/gwaldron/osgearth/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc qt4"
+
+RDEPEND="
+ dev-db/sqlite:3
+ >=dev-games/openscenegraph-3.2.1[curl,qt4?]
+ dev-libs/tinyxml
+ net-misc/curl
+ sci-libs/gdal
+ sci-libs/geos
+ sys-libs/zlib[minizip]
+ virtual/opengl
+ x11-libs/libX11
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )"
+
+S=${WORKDIR}/${PN}-${P}
+
+PATCHES=( "${FILESDIR}"/${P}-{disable-qt5,cmake-options}.patch )
+
+src_configure() {
+ # V8 disabled due to
+ # https://github.com/gwaldron/osgearth/issues/333
+ local mycmakeargs=(
+ -DWITH_EXTERNAL_TINYXML=ON
+ $(cmake-utils_use qt4 OSGEARTH_USE_QT)
+ -DOSGEARTH_USE_V8=OFF
+ -DOSGEARTH_USE_JAVASCRIPTCORE=OFF
+ -DOSGEARTH_USE_LIBNOISE=OFF
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use doc ; then
+ emake -C "${S}"/docs man html info
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use doc ; then
+ dohtml -r "${S}"/docs/build/html/*
+ doman "${S}"/docs/build/man/*
+ doinfo "${S}"/docs/build/texinfo/*.info*
+ fi
+}
diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
new file mode 100644
index 00000000000..17f3169c4b9
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/Manifest
@@ -0,0 +1,2 @@
+DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0
+DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch
new file mode 100755
index 00000000000..a91e091331e
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-disable-compiler-warnings.patch
@@ -0,0 +1,12 @@
+diff -ur osm-gps-map-0.7.3/configure.ac osm-gps-map-0.7.3-new/configure.ac
+--- osm-gps-map-0.7.3/configure.ac 2011-03-19 10:55:04.000000000 +0000
++++ osm-gps-map-0.7.3-new/configure.ac 2011-10-20 22:55:59.392575220 +0000
+@@ -62,7 +62,7 @@
+
+ GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
+-GNOME_COMPILE_WARNINGS([maximum])
++#GNOME_COMPILE_WARNINGS([maximum])
+ GNOME_MAINTAINER_MODE_DEFINES
+
+ AC_OUTPUT([
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch
new file mode 100755
index 00000000000..1748c162e38
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-docs-location.patch
@@ -0,0 +1,12 @@
+diff -urN osm-gps-map-0.7.3-old/Makefile.am osm-gps-map-0.7.3/Makefile.am
+--- osm-gps-map-0.7.3-old/Makefile.am 2011-06-16 12:03:29.562435752 +0000
++++ osm-gps-map-0.7.3/Makefile.am 2011-06-16 12:03:58.535612125 +0000
+@@ -7,7 +7,7 @@
+
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+-osm_gps_mapdocdir = ${prefix}/doc/osm-gps-map
++osm_gps_mapdocdir = ${docdir}
+ osm_gps_mapdoc_DATA = \
+ README \
+ COPYING \
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch
new file mode 100644
index 00000000000..350876ce40b
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-introspection.patch
@@ -0,0 +1,10 @@
+--- src/Makefile.am 2011-03-19 10:08:23.000000000 +0300
++++ src/Makefile.am 2013-04-02 23:13:01.408952029 +0400
+@@ -86,6 +86,7 @@
+ OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS)
+ OsmGpsMap_1_0_gir_LIBS = libosmgpsmap.la
+ OsmGpsMap_1_0_gir_FILES = $(introspection_sources)
++OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps
+ INTROSPECTION_GIRS += OsmGpsMap-1.0.gir
+
+ girdir = $(datadir)/gir-1.0
diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch
new file mode 100644
index 00000000000..f6287bfc113
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-0.7.3-fix-python-setup.py.patch
@@ -0,0 +1,15 @@
+--- setup.py 2011-03-19 10:08:23.000000000 +0300
++++ setup.py 2013-04-02 23:35:01.469947224 +0400
+@@ -21,9 +21,9 @@
+
+ _osmgpsmap = Extension(name = 'osmgpsmap',
+ sources= ['osmgpsmapmodule.c','osmgpsmap.c'],
+- include_dirs = get_include('osmgpsmap pygobject-2.0'),
+- library_dirs = get_lib_dirs('osmgpsmap pygobject-2.0'),
+- libraries = get_libs('osmgpsmap pygobject-2.0'),
++ include_dirs = get_include('gtk+-2.0 pygobject-2.0'),
++ library_dirs = get_lib_dirs('gtk+-2.0 pygobject-2.0'),
++ libraries = get_libs('gtk+-2.0 pygobject-2.0') + ["osmgpsmap"],
+ define_macros = [('VERSION', '"""%s"""' % VERSION)],
+ )
+
diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml
new file mode 100644
index 00000000000..58a20a4d2d5
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>bman@gentoo.org</email>
+ <name>Aaron Bauman</name>
+ </maintainer>
+ <longdescription lang="en">
+ A gtk+ viewer for OpenStreetMap files.
+ </longdescription>
+</pkgmetadata>
diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
new file mode 100644
index 00000000000..c83b4a8ad18
--- /dev/null
+++ b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit eutils autotools gnome2 distutils-r1
+
+DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
+HOMEPAGE="http://nzjrs.github.com/osm-gps-map/"
+SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz
+python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/glib-2.16.0:2
+ >=net-libs/libsoup-2.4.0:2.4
+ >=x11-libs/cairo-1.6.0
+ >=x11-libs/gtk+-2.14.0:2[introspection?]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ introspection? ( dev-libs/gobject-introspection )
+ python? ( ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ gnome-base/gnome-common:3
+ virtual/pkgconfig"
+
+PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}"
+
+src_configure() {
+ # Configure script does not accept quoted EPREFIX...
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --docdir=/usr/share/doc/${PF} \
+ --enable-fast-install \
+ --disable-static
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-docs-location.patch" \
+ "${FILESDIR}/${P}-fix-introspection.patch"
+ eautoreconf
+
+ gnome2_src_prepare
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
+ fi
+}
+
+src_compile() {
+ gnome2_src_compile
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python ; then
+ cd "${PYTHON_S}" || die
+ distutils-r1_src_install
+ fi
+}
diff --git a/sci-geosciences/osm2mp/Manifest b/sci-geosciences/osm2mp/Manifest
new file mode 100644
index 00000000000..3b2b7e810e0
--- /dev/null
+++ b/sci-geosciences/osm2mp/Manifest
@@ -0,0 +1 @@
+DIST osm2mp_v080.zip 31372 RMD160 cff4978d29dfb5bc27c10aa449e9fe3b1cb156a0 SHA1 4c6890d706deb901ba842ce192ce113de403674e SHA256 9c76785a3bf4b7bcb327fbc641c7ece2084c0e28ebcb3dcb614512c1124ce855
diff --git a/sci-geosciences/osm2mp/metadata.xml b/sci-geosciences/osm2mp/metadata.xml
new file mode 100644
index 00000000000..3beda91ba20
--- /dev/null
+++ b/sci-geosciences/osm2mp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/osm2mp/osm2mp-0.80.ebuild b/sci-geosciences/osm2mp/osm2mp-0.80.ebuild
new file mode 100644
index 00000000000..a33bd1c7f1e
--- /dev/null
+++ b/sci-geosciences/osm2mp/osm2mp-0.80.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Converts openstreetmap data to mp format (used e. g. by mkgmap)"
+HOMEPAGE="http://forum.openstreetmap.org/viewtopic.php?id=1162"
+SRC_URI="http://garminmapsearch.com/osm/${PN}_v${PV/./}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-perl/Template-Toolkit
+ virtual/perl-Getopt-Long"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ sed -i \
+ -e 's:poi.cfg:/usr/share/osm2mp/poi.cfg:g' \
+ -e 's:poly.cfg:/usr/share/osm2mp/poly.cfg:g' \
+ -e 's:header.tpl:/usr/share/osm2mp/header.tpl:g' \
+ osm2mp.pl || die "sed failed"
+}
+
+src_install() {
+ newbin osm2mp.pl osm2mp
+ insinto /usr/share/osm2mp
+ doins poi.cfg poly.cfg header.tpl
+ dodoc todo
+}
diff --git a/sci-geosciences/osm2pgsql/Manifest b/sci-geosciences/osm2pgsql/Manifest
new file mode 100644
index 00000000000..67d0b541a61
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/Manifest
@@ -0,0 +1,4 @@
+DIST osm2pgsql-0.84.0.tar.gz 1037670 SHA256 cc0a2c4c677833c4c2c0c00a35ed25ad8ee4e378ad0ab834f151aaee5e7f6f85 SHA512 f706c57ecc63382db7f031f5c16ce94949340aa96bf45c85e71e8c5fcafda0756e91673369fa46e1217733dd8aa12a24cf1260362995d1c9dce258242704f42d WHIRLPOOL 49c1be45844693262108d31e23249e41eda2da7319e93b0c9739d8c5d61c035e7e75ea5182e04e3ddc3063cc248865751da8a55651e2c94e1d8a0797eeb68f4e
+DIST osm2pgsql-0.86.0.tar.gz 2101740 SHA256 6599366c562a7ed6b2c92dffc3ebfb4f6917c7216a2f0d01f154b01549525140 SHA512 f16f67c97b771d58df124aa99b1f414f379f293580451dbb288c460814a5b11a5e3c607d9623cc8e9705117a204425af3599498f9358f2efbcd1c408215fe7f0 WHIRLPOOL 437e0ed9923a07a6d9c507c6442b47cf1d1affa9921b2c8d4b36441c03df6577fee18596204928f4bbc291e8c7e6f9cd1e3f6c19e5d0ab65a5e366f1354d47f2
+DIST osm2pgsql-0.87.0.tar.gz 2139841 SHA256 6f5538d098e17a578a384f70f61b335f10edb04114d5cdc5233ca97f868ad0f6 SHA512 f3dd88b6f89c7ecbadf3ad65d548ba0430726bf3c11b5a32c214dddb74f6f7371fd10d712fed965045605749b80d796fc67e4a4d085ffca11310140161059381 WHIRLPOOL 67ef36defd4f0fbbb16ab561790fc4b5abff715e315c83db15735fc11c21069c44d48687dddaba7edd5476f71fe9ce54485e3c8b2279fe7348ee929868233997
+DIST osm2pgsql-0.87.1.tar.gz 2139623 SHA256 49cdfb36ab1abbc568bd5d8593a671d76205ed47efba5a23d84ab1b975b4b62e SHA512 2efa1e350c24cc6a5aac69e9df60172bfbe99a5fc10d4fea8f1af28afaf4c0176e51dd357c89e2d68a264b283457e798746da47515684f2aeee3a26abe6d1171 WHIRLPOOL d00be1f2613c7fa779ece1ce2b16b68d423a365569d4355848fd5fcaa72cbcc49b11b9c083fd28533c92b42c0f59ab3a9538a4cc5253cb74c50ee271aacd948a
diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
new file mode 100644
index 00000000000..abf111457c9
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <herd>postgresql</herd>
+ <longdescription lang="en">
+ Converts OSM planet.osm data to a PostgreSQL / PostGIS database
+ suitable for specific applications like rendering into map tiles by
+ Mapnik or geocoding with Nominatim.
+ </longdescription>
+ <use>
+ <flag name="pbf">
+ Add support for importing the new "Protocolbuffer Binary Format"
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
new file mode 100644
index 00000000000..f2acefa66d1
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.84.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua +pbf"
+
+DEPEND="
+ app-arch/bzip2
+ dev-db/postgresql:=
+ dev-libs/libxml2:2
+ sci-libs/geos
+ sci-libs/proj
+ sys-libs/zlib
+ lua? ( dev-lang/lua:= )
+ pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
new file mode 100644
index 00000000000..f2acefa66d1
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.86.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua +pbf"
+
+DEPEND="
+ app-arch/bzip2
+ dev-db/postgresql:=
+ dev-libs/libxml2:2
+ sci-libs/geos
+ sci-libs/proj
+ sys-libs/zlib
+ lua? ( dev-lang/lua:= )
+ pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
new file mode 100644
index 00000000000..59d937c964b
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+inherit autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua +pbf"
+
+DEPEND="
+ app-arch/bzip2
+ dev-db/postgresql:=
+ dev-libs/libxml2:2
+ dev-libs/boost
+ sci-libs/geos
+ sci-libs/proj
+ sys-libs/zlib
+ lua? ( dev-lang/lua:= )
+ pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
new file mode 100644
index 00000000000..59d937c964b
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-0.87.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# Tries to connect to local postgres server and other shenanigans
+RESTRICT="test"
+
+inherit autotools
+
+DESCRIPTION="Converts OSM data to SQL and insert into PostgreSQL db"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lua +pbf"
+
+DEPEND="
+ app-arch/bzip2
+ dev-db/postgresql:=
+ dev-libs/libxml2:2
+ dev-libs/boost
+ sci-libs/geos
+ sci-libs/proj
+ sys-libs/zlib
+ lua? ( dev-lang/lua:= )
+ pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
new file mode 100644
index 00000000000..3a7fcf724fe
--- /dev/null
+++ b/sci-geosciences/osm2pgsql/osm2pgsql-99999999.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools git-2
+
+EGIT_REPO_URI="git://github.com/openstreetmap/osm2pgsql.git"
+EGIT_BOOTSTRAP="eautoreconf"
+
+DESCRIPTION="Converts OSM planet.osm data to a PostgreSQL/PostGIS database"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Osm2pgsql"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="+lua +pbf"
+
+DEPEND="
+ app-arch/bzip2
+ dev-db/postgresql:=
+ dev-libs/boost
+ dev-libs/libxml2:2
+ sci-libs/geos
+ sci-libs/proj
+ sys-libs/zlib
+ lua? ( dev-lang/lua:= )
+ pbf? ( dev-libs/protobuf-c )
+"
+RDEPEND="${DEPEND}"
diff --git a/sci-geosciences/osmosis/Manifest b/sci-geosciences/osmosis/Manifest
new file mode 100644
index 00000000000..6821c8759d1
--- /dev/null
+++ b/sci-geosciences/osmosis/Manifest
@@ -0,0 +1 @@
+DIST osmosis-0.35.1.tgz 25831441 RMD160 44045e0b9a268a2ec1a60632177050066e09efbe SHA1 699165e194ad16ec14b40971f82a7b40792219a0 SHA256 532c95b580354c69c9b18366c77520e055eac0eafd66aae5708999f0b8c491c3
diff --git a/sci-geosciences/osmosis/metadata.xml b/sci-geosciences/osmosis/metadata.xml
new file mode 100644
index 00000000000..3beda91ba20
--- /dev/null
+++ b/sci-geosciences/osmosis/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/osmosis/osmosis-0.35.1.ebuild b/sci-geosciences/osmosis/osmosis-0.35.1.ebuild
new file mode 100644
index 00000000000..45587e615e9
--- /dev/null
+++ b/sci-geosciences/osmosis/osmosis-0.35.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+WANT_ANT_TASKS="ant-nodeps"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commandline tool to process openstreetmap data"
+HOMEPAGE="http://wiki.openstreetmap.org/index.php/Osmosis"
+SRC_URI="http://bretth.dev.openstreetmap.org/osmosis-build/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres"
+
+DEPEND=">=virtual/jdk-1.5"
+RDEPEND=">=virtual/jre-1.5"
+
+src_compile() {
+ eant build_binary || die
+}
+
+src_install() {
+ java-pkg_newjar "${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ dodoc readme.txt changes.txt doc/*.txt || die "dodoc failed"
+}
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
new file mode 100644
index 00000000000..e28b1b731e0
--- /dev/null
+++ b/sci-geosciences/qgis/Manifest
@@ -0,0 +1,3 @@
+DIST qgis-1.7.0.tar.bz2 23420823 SHA256 4b871e841832c9a4f3cee1981198c30850983d73c848684832fa913167671a34 SHA512 76e5bdc66626881c89945923548c1682c3fa4d217a0e26099960b079413caffa266066305c36dab1d7708490428d3670aa3825b4298a173278171b84f9d51279 WHIRLPOOL 67ae67f16140c2a6a1007115dd2202e5b495492167a124bb78d722354900f94e8e61a81479598f6c3f137131992fe95ff5db798e04a3cfe23e62268b4ace2adc
+DIST qgis-1.8.0.tar.bz2 29997204 SHA256 700be4f81c4a6b6335a0217a6c476328c0ea02543d579a06dc1aaf60201303ab SHA512 475c2087164b325bd6efe49bdca9e5eb563645ea556c34f644cff00fd6bcc0585e9e39daa2e62f0a706db58bc1551af786fc2cb6c17ad90f5734ebea5044e57c WHIRLPOOL ef1fc2832bd20398afdee9eb4c1e81baa3c8c792acc76c0b609a74ae0d61301b00f105221fa27b74b26c68fd8b5d849ea7612e960a8684b885cb8f31d0c71a1c
+DIST qgis_sample_data.tar.gz 13601736 SHA256 a31c54056776e8476e1f959870830f850423645cfb80d88811f3b365c29f2b4a SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78 WHIRLPOOL fe7746f8a72807742427c6fb70f1453e195be75322d5784adc484ac14b0eae55569dbded7468ea2ba0c34781fe14918e07a5a187dca82bff551c6117f941d7f5
diff --git a/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch b/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
new file mode 100644
index 00000000000..65cabb2afe7
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.7.0-avoid-deprecated-pyqtconfig.patch
@@ -0,0 +1,53 @@
+Avoid relying on the deprecated pyqtconfig module.
+
+When PyQt4 is configured using configure-ng.py then no pyqtconfig module
+will be built, causing the automatic detection in the QGIS build system to
+fail.
+
+This change tries to work around the problem by extracting or guessing all
+the relevant settings. It should work reasonably well for a default
+configuration of PyQt, but may fail if PyQt overrides the defaults from sip.
+All may break if SIP v5 is used, since that version apparently won't contain
+a sipconfig module any more. But we'll tackle that once we get there.
+
+References:
+* https://bugs.gentoo.org/show_bug.cgi?id=525700
+
+2014-10-21 Martin von Gagern
+
+Index: qgis-2.4.0/cmake/FindPyQt.py
+===================================================================
+--- qgis-2.4.0.orig/cmake/FindPyQt.py
++++ qgis-2.4.0/cmake/FindPyQt.py
+@@ -30,9 +30,29 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+-import PyQt4.pyqtconfig
++try:
++ import PyQt4.pyqtconfig
++ pyqtcfg = PyQt4.pyqtconfig.Configuration()
++except ImportError:
++ import PyQt4.QtCore
++ import sipconfig # won't work for SIP v5
++ import os.path
++ cfg = sipconfig.Configuration()
++ sip_dir = cfg.default_sip_dir
++ for p in (os.path.join(sip_dir, "PyQt4"), sip_dir):
++ if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")):
++ sip_dir = p
++ break
++ cfg = {
++ 'pyqt_version': PyQt4.QtCore.PYQT_VERSION,
++ 'pyqt_version_str': PyQt4.QtCore.PYQT_VERSION_STR,
++ 'pyqt_sip_flags': PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'],
++ 'pyqt_mod_dir': cfg.default_mod_dir,
++ 'pyqt_sip_dir': sip_dir,
++ 'pyqt_bin_dir': cfg.default_bin_dir,
++ }
++ pyqtcfg = sipconfig.Configuration([cfg])
+
+-pyqtcfg = PyQt4.pyqtconfig.Configuration()
+ print("pyqt_version:%06.0x" % pyqtcfg.pyqt_version)
+ print("pyqt_version_num:%d" % pyqtcfg.pyqt_version)
+ print("pyqt_version_str:%s" % pyqtcfg.pyqt_version_str)
diff --git a/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch
new file mode 100644
index 00000000000..ec3e1c2dccf
--- /dev/null
+++ b/sci-geosciences/qgis/files/qgis-1.8.0-no-python-pyc.patch
@@ -0,0 +1,54 @@
+--- cmake/PythonMacros.cmake
++++ cmake/PythonMacros.cmake
+@@ -22,40 +22,4 @@
+ # Install the source file.
+ INSTALL(FILES ${SOURCE_FILE} DESTINATION ${DESINATION_DIR})
+
+- # Byte compile and install the .pyc file.
+- GET_FILENAME_COMPONENT(_absfilename ${SOURCE_FILE} ABSOLUTE)
+- GET_FILENAME_COMPONENT(_filename ${SOURCE_FILE} NAME)
+- GET_FILENAME_COMPONENT(_filenamebase ${SOURCE_FILE} NAME_WE)
+- GET_FILENAME_COMPONENT(_basepath ${SOURCE_FILE} PATH)
+-
+- if(WIN32)
+- string(REGEX REPLACE ".:/" "/" _basepath "${_basepath}")
+- endif(WIN32)
+-
+- SET(_bin_py ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filename})
+- SET(_bin_pyc ${CMAKE_CURRENT_BINARY_DIR}/${_basepath}/${_filenamebase}.pyc)
+-
+- FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_basepath})
+-
+- SET(_message "-DMESSAGE=Byte-compiling ${_bin_py}")
+-
+- GET_FILENAME_COMPONENT(_abs_bin_py ${_bin_py} ABSOLUTE)
+- IF(_abs_bin_py STREQUAL ${_absfilename}) # Don't copy the file onto itself.
+- ADD_CUSTOM_COMMAND(
+- TARGET compile_python_files
+- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+- DEPENDS ${_absfilename}
+- )
+- ELSE(_abs_bin_py STREQUAL ${_absfilename})
+- ADD_CUSTOM_COMMAND(
+- TARGET compile_python_files
+- COMMAND ${CMAKE_COMMAND} -E echo ${message}
+- COMMAND ${CMAKE_COMMAND} -E copy ${_absfilename} ${_bin_py}
+- COMMAND ${PYTHON_EXECUTABLE} ${_python_compile_py} ${_bin_py}
+- DEPENDS ${_absfilename}
+- )
+- ENDIF(_abs_bin_py STREQUAL ${_absfilename})
+-
+- INSTALL(FILES ${_bin_pyc} DESTINATION ${DESINATION_DIR})
+ ENDMACRO(PYTHON_INSTALL)
+--- python/CMakeLists.txt
++++ python/CMakeLists.txt
+@@ -102,8 +102,6 @@
+
+ SET (QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis)
+
+-ADD_CUSTOM_TARGET(compile_python_files ALL)
+-
+ ADD_CUSTOM_COMMAND(TARGET compile_python_files
+ POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY}
diff --git a/sci-geosciences/qgis/metadata.xml b/sci-geosciences/qgis/metadata.xml
new file mode 100644
index 00000000000..be2c23b6863
--- /dev/null
+++ b/sci-geosciences/qgis/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <longdescription lang="en">
+ Quantum GIS (QGIS) is a user friendly Open Source Geographic
+ Information System (GIS). QGIS supports vector, raster, and database
+ formats. QGIS lets you browse and create map data on your
+ computer. It supports many common spatial data formats (e.g. ESRI
+ ShapeFile, geotiff). QGIS supports plugins to do things like display
+ tracks from your GPS.
+</longdescription>
+ <use>
+ <flag name="bundled-libs">Use internal copy of <pkg>x11-libs/qwtpolar</pkg></flag>
+ <flag name="grass">Add support for <pkg>sci-geosciences/grass</pkg></flag>
+ <flag name="spatialite">Enable Spatial DBMS over sqlite <pkg>dev-db/spatialite</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-geosciences/qgis/qgis-1.7.0.ebuild b/sci-geosciences/qgis/qgis-1.7.0.ebuild
new file mode 100644
index 00000000000..ddc06c006a8
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-1.7.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+PYTHON_USE_WITH="sqlite"
+PYTHON_DEPEND="python? 2"
+inherit python cmake-utils eutils multilib
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples gps grass gsl postgres python spatialite test"
+
+RDEPEND="
+ dev-libs/expat
+ sci-geosciences/gpsbabel
+ >=sci-libs/gdal-1.6.1[geos,python?]
+ sci-libs/geos
+ sci-libs/gsl
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qtsql:4
+ dev-qt/qtwebkit:4
+ x11-libs/qwt:5[svg]
+ x11-libs/qwtpolar
+ grass? ( >=sci-geosciences/grass-6.4.0_rc6[python?] )
+ postgres? ( >=dev-db/postgresql-8.4 )
+ python? ( dev-python/PyQt4[X,sql,svg] )
+ spatialite? (
+ dev-db/sqlite:3
+ dev-db/spatialite
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex"
+
+DOCS=( BUGS ChangeLog CODING.pdf README )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
+)
+
+# Does not find the test binaries at all
+RESTRICT="test"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs+=(
+ "-DQGIS_MANUAL_SUBDIR=/share/man/"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DBINDINGS_GLOBAL_INSTALL=ON"
+ "-DQGIS_LIB_SUBDIR=$(get_libdir)"
+ "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
+ "-DWITH_INTERNAL_SPATIALITE=OFF"
+ "-DWITH_INTERNAL_QWTPOLAR=OFF"
+ "-DPEDANTIC=OFF"
+ "-DWITH_APIDOC=OFF"
+ $(cmake-utils_use_with postgres POSTGRESQL)
+ $(cmake-utils_use_with grass GRASS)
+ $(cmake-utils_use_with python BINDINGS)
+ $(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+ $(cmake-utils_use_with spatialite SPATIALITE)
+ $(cmake-utils_use_enable test TESTS)
+ )
+ use grass && mycmakeargs+=( "-DGRASS_PREFIX=/usr/" )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ newicon images/icons/qgis-icon.png qgis.png || die
+ make_desktop_entry qgis "Quantum GIS" qgis
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r "${WORKDIR}"/qgis_sample_data/* || die "Unable to install examples"
+ fi
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ fi
+}
diff --git a/sci-geosciences/qgis/qgis-1.8.0.ebuild b/sci-geosciences/qgis/qgis-1.8.0.ebuild
new file mode 100644
index 00000000000..1fe1c591cc4
--- /dev/null
+++ b/sci-geosciences/qgis/qgis-1.8.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils gnome2-utils multilib cmake-utils python-single-r1
+
+DESCRIPTION="User friendly Geographic Information System"
+HOMEPAGE="http://www.qgis.org/"
+SRC_URI="http://qgis.org/downloads/${P}.tar.bz2
+ examples? ( http://download.osgeo.org/qgis/data/qgis_sample_data.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="bundled-libs examples gps gsl postgres python spatialite test"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-libs/expat
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qtsql:4
+ dev-qt/qtwebkit:4
+ sci-geosciences/gpsbabel
+ >=sci-libs/gdal-1.6.1[geos,python?]
+ sci-libs/geos
+ sci-libs/gsl
+ sci-libs/libspatialindex
+ sci-libs/proj
+ x11-libs/qwt:5[svg]
+ !bundled-libs? ( <x11-libs/qwtpolar-1 )
+ postgres? ( >=dev-db/postgresql-8.4 )
+ python? (
+ dev-python/PyQt4[X,sql,svg,${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
+ )
+ spatialite? (
+ dev-db/sqlite:3
+ dev-db/spatialite
+ )"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.7.0-avoid-deprecated-pyqtconfig.patch"
+ "${FILESDIR}/${PN}-1.8.0-no-python-pyc.patch"
+)
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "-DQGIS_MANUAL_SUBDIR=/share/man/"
+ "-DBUILD_SHARED_LIBS=ON"
+ "-DQGIS_LIB_SUBDIR=$(get_libdir)"
+ "-DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis"
+ "-DWITH_INTERNAL_SPATIALITE=OFF"
+ "-DWITH_INTERNAL_QWTPOLAR=$(usex bundled-libs "ON" "OFF")"
+ "-DPEDANTIC=OFF"
+ "-DWITH_APIDOC=OFF"
+ "-DWITH_GRASS=OFF"
+ $(cmake-utils_use_with postgres POSTGRESQL)
+ $(cmake-utils_use_with python BINDINGS)
+ $(cmake-utils_use python BINDINGS_GLOBAL_INSTALL)
+ $(cmake-utils_use_with spatialite SPATIALITE)
+ $(cmake-utils_use_enable test TESTS)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc BUGS ChangeLog CODING README
+
+ newicon -s 128 images/icons/qgis-icon.png qgis.png
+ make_desktop_entry qgis "Quantum GIS " qgis
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r "${WORKDIR}"/qgis_sample_data/*
+ fi
+
+ python_fix_shebang "${D}"/usr/share/qgis/grass/scripts
+ python_optimize "${D}"/usr/share/qgis/python/plugins \
+ "${D}"/$(python_get_sitedir)/qgis \
+ "${D}"/usr/share/qgis/grass/scripts
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use postgres; then
+ elog "If you don't intend to use an external PostGIS server"
+ elog "you should install:"
+ elog " dev-db/postgis"
+ fi
+
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/qlandkartegt-garmindev/Manifest b/sci-geosciences/qlandkartegt-garmindev/Manifest
new file mode 100644
index 00000000000..7c50d789fe0
--- /dev/null
+++ b/sci-geosciences/qlandkartegt-garmindev/Manifest
@@ -0,0 +1 @@
+DIST garmindev-0.3.4.tar.gz 85173 SHA256 86c38f65ba1a05c5d5eb076107094cb789db6ffc5d80bfd7bb209d645bcf87d5
diff --git a/sci-geosciences/qlandkartegt-garmindev/metadata.xml b/sci-geosciences/qlandkartegt-garmindev/metadata.xml
new file mode 100644
index 00000000000..9d61c0ed5ad
--- /dev/null
+++ b/sci-geosciences/qlandkartegt-garmindev/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">qlandkartegt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/qlandkartegt-garmindev/qlandkartegt-garmindev-0.3.4.ebuild b/sci-geosciences/qlandkartegt-garmindev/qlandkartegt-garmindev-0.3.4.ebuild
new file mode 100644
index 00000000000..6df805cd3f5
--- /dev/null
+++ b/sci-geosciences/qlandkartegt-garmindev/qlandkartegt-garmindev-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P=${P/qlandkartegt-/}
+
+inherit cmake-utils
+
+DESCRIPTION="Garmin drivers for qlandkartegt"
+HOMEPAGE="http://www.qlandkarte.org/"
+SRC_URI="mirror://sourceforge/qlandkartegt/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ virtual/libusb:0
+ sci-geosciences/qlandkartegt
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/sci-geosciences/qlandkartegt/Manifest b/sci-geosciences/qlandkartegt/Manifest
new file mode 100644
index 00000000000..3c7ea134d79
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/Manifest
@@ -0,0 +1,4 @@
+DIST qlandkartegt-1.7.6.tar.gz 8315692 SHA256 ff1e352d07fd136e75a80035d888efe095f1f44ca15d46262169e98e5a14e1c3 SHA512 15c96a04979666ccafe9badeed5a6973fdeb49339a707adf20b06d76292d5f23042f541276bc7fc1b390d70a3f5db033f749d2bed30e348c472196622dd3c275 WHIRLPOOL abac8e9ed2fbd63d47913184605fc787a2bcff002717436e61303cb14609aefe9369538010a4aa2c86f243d7d0fa5a173876de98ae9274b761967bf227309ac4
+DIST qlandkartegt-1.7.7.tar.gz 6723780 SHA256 0b0d659bef580bff7c6aabd563ad9bf0cf2d32467fe11e613ceaab58be7363d0 SHA512 c55885703821ae835cbf4b914da2510aa377fe6d6a4cec79266408806ceb17d3316e520daf062bb3390f42b148751e0d9feb06258ca47ad9cda8c6e9311ad6f3 WHIRLPOOL 41fe01c96536531ed1886ebbbd8556a3fec27ba4c5eb583cf629aa2b78524bd6bac927f77e3d90dc005ea35a6cc03b0471c41aa8716da2f6e3688d66a212ba7c
+DIST qlandkartegt-1.8.0.tar.gz 6720301 SHA256 e747d2e1a78c1884ce00b4606525d2be3b309089a3b5cafbc8f2b7aa94959b14 SHA512 bc585d76d93ff87ca529d03810c81a31ff2a7ef6661015e4e25cc798907f2c349bead4b1c29f954d77cc98e92e51fa3bb7bcaa3571a533aa43e886403d1c9526 WHIRLPOOL 83bec7a97f3a18392fb5041fd961a15a270cd88300295abca88f8ad3d79db61055943ef4afb4345e993c594ffe6c2960e11d1d1d17bfcc5867de14fb1f0f02df
+DIST qlandkartegt-1.8.1.tar.gz 6706349 SHA256 9e0605ab8f4cbd27741b507f252f08370e9ccca4e05ec35878256c59b22a9be7 SHA512 de32546762db0a6b9311e5b63dc4bbca12a51160c1c50aa63c04270fdc0e7edfce3fa8062dac2aff6837f82f0a243328da591a660c88c4a09c2a0ea7d545dc34 WHIRLPOOL be2318d56cb23ac24b88ca1c8eaa116621bc626e36e97c261ccb9b9f90343fb9455c19db9fd685f545744dfcb63ed7e40dd6d950589c735c82c29938d23d461c
diff --git a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch
new file mode 100644
index 00000000000..91230d8c08f
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-deprecated.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CRouteToolWidget.cpp b/src/CRouteToolWidget.cpp
+index 659d193..ebd4208 100644
+--- a/src/CRouteToolWidget.cpp
++++ b/src/CRouteToolWidget.cpp
+@@ -1015,14 +1015,25 @@ void CRouteToolWidget::startBRouterService(CRoute& rte)
+ isNext = true;
+ }
+ }
+-
++#ifdef QK_QT5_PORT
++ QList< QPair<QString, QString> > queryItems;
++ queryItems << QPair<QString, QString>("lonlats", lonlats.toLatin1());
++ queryItems << QPair<QString, QString>("nogos", "");
++ queryItems << QPair<QString, QString>("profile", comboBRPreference->itemData(comboBRPreference->currentIndex()).toByteArray());
++ queryItems << QPair<QString, QString>("alternativeidx", QVariant(rte.getRouteIdx()).toByteArray());
++ queryItems << QPair<QString, QString>("format", "gpx");
++ QUrlQuery urlQuery;
++ urlQuery.setQueryItems(queryItems);
++ url.setQuery(urlQuery);
++#else
+ QList< QPair<QByteArray, QByteArray> > queryItems;
+- queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toAscii()));
++ queryItems << QPair<QByteArray, QByteArray>(QByteArray("lonlats"),QByteArray(lonlats.toLatin1()));
+ queryItems << QPair<QByteArray, QByteArray>(QByteArray("nogos"), QByteArray(""));
+ queryItems << QPair<QByteArray, QByteArray>(QByteArray("profile"), comboBRPreference->itemData(comboBRPreference->currentIndex()).toByteArray());
+ queryItems << QPair<QByteArray, QByteArray>(QByteArray("alternativeidx"), QVariant(rte.getRouteIdx()).toByteArray());
+ queryItems << QPair<QByteArray, QByteArray>(QByteArray("format"), QByteArray("gpx"));
+ url.setEncodedQueryItems(queryItems);
++#endif
+
+ QNetworkRequest request;
+
diff --git a/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch
new file mode 100644
index 00000000000..aab0288efb7
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/files/qlandkartegt-1.8.0-includes.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CExchangeGarmin.cpp b/src/CExchangeGarmin.cpp
+index 1d0a118..236e4ad 100644
+--- a/src/CExchangeGarmin.cpp
++++ b/src/CExchangeGarmin.cpp
+@@ -21,6 +21,7 @@
+ #include <QtDBus>
+ #include <QtXml>
+ #include <QtGui>
++#include <QMessageBox>
+
+ CGarminTreeWidgetItem::CGarminTreeWidgetItem(const QString& id, QTreeWidget *parent)
+ : IDeviceTreeWidgetItem(id,parent)
diff --git a/sci-geosciences/qlandkartegt/metadata.xml b/sci-geosciences/qlandkartegt/metadata.xml
new file mode 100644
index 00000000000..58b619ab77f
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <use>
+ <flag name="dmtx">Enable libdmtx support for summarizing waypoints as 2D barcode</flag>
+ <flag name="gpsbabel">Enable support for wide range of geodata file formats</flag>
+ <flag name="gpx-extensions">Enable support for GPX extensions</flag>
+ <flag name="mikrokopter">Enable telemtry with a mikrokopter</flag>
+ <flag name="rmap">Enable support for TwoNav RMAP file format</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">qlandkartegt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild
new file mode 100644
index 00000000000..e885733d3b6
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.6-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
+HOMEPAGE="http://www.qlandkarte.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter +rmap"
+
+RDEPEND="
+ >=sci-libs/gdal-1.8
+ >=sci-libs/proj-4.7
+ sys-libs/zlib
+ dev-qt/qtgui:4
+ dev-qt/qtscript:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtwebkit:4
+ dbus? ( dev-qt/qtdbus:4 )
+ dmtx? ( media-libs/libdmtx )
+ exif? ( media-libs/libexif )
+ gps? ( >=sci-geosciences/gpsd-2.90 )
+ gpsbabel? ( sci-geosciences/gpsbabel )
+ dev-qt/qtopengl:4
+ virtual/glu
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use dbus DBUS)
+ $(cmake-utils_use dmtx WITH_DMTX)
+ $(cmake-utils_use exif WITH_EXIF)
+ $(cmake-utils_use gps WITH_GPSD)
+ $(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
+ $(cmake-utils_use mikrokopter MIKROKOPTER)
+ $(cmake-utils_use rmap RMAP)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ sed \
+ -e 's:\(Geography;\):\1Education;:g' \
+ -i ./qlandkartegt.desktop || die
+}
+
+pkg_postinst() {
+ elog "OSM and Opencyclemap internal definitions were dropped upstream"
+ elog "Add it through File -> Load Online Map"
+ elog "or add a tsm definition (http://wiki.openstreetmap.org/wiki/MapQuest#Tile_URLs)"
+}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.7.7.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.7.ebuild
new file mode 100644
index 00000000000..0a6107d396d
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.7.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
+HOMEPAGE="http://www.qlandkarte.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter +rmap"
+
+RDEPEND="
+ >=sci-libs/gdal-1.8
+ >=sci-libs/proj-4.7
+ sys-libs/zlib
+ dev-qt/qtgui:4
+ dev-qt/qtscript:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtwebkit:4
+ dbus? ( dev-qt/qtdbus:4 )
+ dmtx? ( media-libs/libdmtx )
+ exif? ( media-libs/libexif )
+ gps? ( >=sci-geosciences/gpsd-2.90 )
+ gpsbabel? ( sci-geosciences/gpsbabel )
+ dev-qt/qtopengl:4
+ virtual/glu
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DQK_QT5_PORT=OFF
+ $(cmake-utils_use dbus DBUS)
+ $(cmake-utils_use dmtx WITH_DMTX)
+ $(cmake-utils_use exif WITH_EXIF)
+ $(cmake-utils_use gps WITH_GPSD)
+ $(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
+ $(cmake-utils_use mikrokopter MIKROKOPTER)
+ $(cmake-utils_use rmap RMAP)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ sed \
+ -e 's:\(Geography;\):\1Education;:g' \
+ -i ./qlandkartegt.desktop || die
+}
+
+pkg_postinst() {
+ elog "OSM and Opencyclemap internal definitions were dropped upstream"
+ elog "Add it through File -> Load Online Map"
+ elog "or add a tsm definition (http://wiki.openstreetmap.org/wiki/MapQuest#Tile_URLs)"
+}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild
new file mode 100644
index 00000000000..f5ee2ef2aca
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.8.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
+HOMEPAGE="http://www.qlandkarte.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter +rmap qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+ >=sci-libs/gdal-1.8
+ >=sci-libs/proj-4.7
+ sys-libs/zlib
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtscript:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtwebkit:4
+ dbus? ( dev-qt/qtdbus:4 )
+ )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtopengl:5
+ dev-qt/qtserialport:5
+ dev-qt/qtscript:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwebkit:5
+ dbus? ( dev-qt/qtdbus:5 )
+ )
+ dmtx? ( media-libs/libdmtx )
+ exif? ( media-libs/libexif )
+ gps? ( >=sci-geosciences/gpsd-2.90 )
+ gpsbabel? ( sci-geosciences/gpsbabel )
+ virtual/glu
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-deprecated.patch
+ "${FILESDIR}"/${P}-includes.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use qt5 QK_QT5_PORT)
+ $(cmake-utils_use dbus DBUS)
+ $(cmake-utils_use dmtx WITH_DMTX)
+ $(cmake-utils_use exif WITH_EXIF)
+ $(cmake-utils_use gps WITH_GPSD)
+ $(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
+ $(cmake-utils_use mikrokopter MIKROKOPTER)
+ $(cmake-utils_use rmap RMAP)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ sed \
+ -e 's:\(Geography;\):\1Education;:g' \
+ -i ./qlandkartegt.desktop || die
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ elog "OSM and Opencyclemap internal definitions were dropped upstream"
+ elog "Add it through File -> Load Online Map"
+ elog "or add a tsm definition (http://wiki.openstreetmap.org/wiki/MapQuest#Tile_URLs)"
+}
diff --git a/sci-geosciences/qlandkartegt/qlandkartegt-1.8.1.ebuild b/sci-geosciences/qlandkartegt/qlandkartegt-1.8.1.ebuild
new file mode 100644
index 00000000000..41fed6ca0a3
--- /dev/null
+++ b/sci-geosciences/qlandkartegt/qlandkartegt-1.8.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="View and upload map files, track and waypoint data to your Garmin GPS device"
+HOMEPAGE="http://www.qlandkarte.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus dmtx exif gps +gpsbabel +gpx-extensions mikrokopter +rmap qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+ >=sci-libs/gdal-1.8
+ >=sci-libs/proj-4.7
+ sys-libs/zlib
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ dev-qt/qtscript:4
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtwebkit:4
+ dbus? ( dev-qt/qtdbus:4 )
+ )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qtmultimedia:5
+ dev-qt/qtopengl:5
+ dev-qt/qtserialport:5
+ dev-qt/qtscript:5
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtwebkit:5
+ dbus? ( dev-qt/qtdbus:5 )
+ )
+ dmtx? ( media-libs/libdmtx )
+ exif? ( media-libs/libexif )
+ gps? ( >=sci-geosciences/gpsd-2.90 )
+ gpsbabel? ( sci-geosciences/gpsbabel )
+ virtual/glu
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.0-deprecated.patch
+ "${FILESDIR}"/${PN}-1.8.0-includes.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use qt5 QK_QT5_PORT)
+ $(cmake-utils_use dbus DBUS)
+ $(cmake-utils_use dmtx WITH_DMTX)
+ $(cmake-utils_use exif WITH_EXIF)
+ $(cmake-utils_use gps WITH_GPSD)
+ $(cmake-utils_use gpx-extensions GPX_EXTENSIONS)
+ $(cmake-utils_use mikrokopter MIKROKOPTER)
+ $(cmake-utils_use rmap RMAP)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ sed \
+ -e 's:\(Geography;\):\1Education;:g' \
+ -i ./qlandkartegt.desktop || die
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ elog "OSM and Opencyclemap internal definitions were dropped upstream"
+ elog "Add it through File -> Load Online Map"
+ elog "or add a tsm definition (http://wiki.openstreetmap.org/wiki/MapQuest#Tile_URLs)"
+}
diff --git a/sci-geosciences/readosm/Manifest b/sci-geosciences/readosm/Manifest
new file mode 100644
index 00000000000..7999008361d
--- /dev/null
+++ b/sci-geosciences/readosm/Manifest
@@ -0,0 +1 @@
+DIST readosm-1.0.0.tar.gz 1004717 RMD160 4f4dece0508a64a62c84871fc7c95e885cd4bd24 SHA1 2116018f2f761439e161ad69682b1b98387accd0 SHA256 8c26477b2de827c815b763bcecd0318ac3f803b9846d7f696272fc809bae3ad8
diff --git a/sci-geosciences/readosm/metadata.xml b/sci-geosciences/readosm/metadata.xml
new file mode 100644
index 00000000000..3190fbf9c37
--- /dev/null
+++ b/sci-geosciences/readosm/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+</pkgmetadata>
diff --git a/sci-geosciences/readosm/readosm-1.0.0.ebuild b/sci-geosciences/readosm/readosm-1.0.0.ebuild
new file mode 100644
index 00000000000..364a09b8058
--- /dev/null
+++ b/sci-geosciences/readosm/readosm-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="A complete Spatial DBMS in a nutshell built upon sqlite"
+HOMEPAGE="http://www.gaia-gis.it/spatialite"
+SRC_URI="http://www.gaia-gis.it/gaia-sins/${PN}-sources/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/sci-geosciences/seawater/Manifest b/sci-geosciences/seawater/Manifest
new file mode 100644
index 00000000000..9f451e4f32c
--- /dev/null
+++ b/sci-geosciences/seawater/Manifest
@@ -0,0 +1,2 @@
+DIST seawater-2.0.1.tar.gz 2680741 SHA256 e343ef9dba9cc5806b4040af5a63132e2d04bab6406216d5041f81f76d4b25cf SHA512 9d59d5c41f46311240934e18b8727514babc4e714553ba595017a17b95edf040c10ac7161f607c7e262c751e238a909d55a639a94fab4d4ce004a4c297af1e79 WHIRLPOOL 7bdff25f7f2152aa8c4c4184a05397b01a718b5198f821aabb1389acd54860038e5655c6f18e9a63ff699e61c4e66911e33e4085e03021f77452cb185e674ec6
+DIST seawater-3.3.2.tar.gz 33073 SHA256 41363a6e280db6f047c40eb87fe9f576ce17e991514dfaeb82444ab5e25950c8 SHA512 221c7e9716247b2a79b1182a4acac7e01c68298262f31d5ff53267c8f4e9d4302f2f46bab5361300742c4eae2a44eff3521b34ef380cfaeb2aaa9f0bdd28df6c WHIRLPOOL ced79e7bdfdc037ee73ee17608735b695de1ef2b99f1d5166e7453b3f272ee73533f3a9e2ccba62d2d98119061ae9a0bd5e11acafd88f469b007fc7619d9c052
diff --git a/sci-geosciences/seawater/metadata.xml b/sci-geosciences/seawater/metadata.xml
new file mode 100644
index 00000000000..9877da18502
--- /dev/null
+++ b/sci-geosciences/seawater/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">seawater</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/seawater/seawater-2.0.1.ebuild b/sci-geosciences/seawater/seawater-2.0.1.ebuild
new file mode 100644
index 00000000000..090ab7bc972
--- /dev/null
+++ b/sci-geosciences/seawater/seawater-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1
+
+DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
+HOMEPAGE="http://pypi.python.org/pypi/seawater/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+
+DOCS=( "${S}"/docs/. )
diff --git a/sci-geosciences/seawater/seawater-3.3.2.ebuild b/sci-geosciences/seawater/seawater-3.3.2.ebuild
new file mode 100644
index 00000000000..3b3bc819f0c
--- /dev/null
+++ b/sci-geosciences/seawater/seawater-3.3.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+inherit distutils-r1
+
+DESCRIPTION="Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water"
+HOMEPAGE="http://pypi.python.org/pypi/seawater/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="test" # seems there are files missing
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/oct2py[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ esetup.py test
+}
diff --git a/sci-geosciences/swmm/Manifest b/sci-geosciences/swmm/Manifest
new file mode 100644
index 00000000000..89e6c7a891b
--- /dev/null
+++ b/sci-geosciences/swmm/Manifest
@@ -0,0 +1 @@
+DIST swmm50022_engine.zip 338011 SHA256 4dba36cbe5e39524c06b826e265ae8fdd2afb82b1c63bb5d9fd72214ed2d7409 SHA512 aa424d36c062656611bc6d6e4ced3108b6fd05806bf47ace30b44cc631860423073ad4fcafb523b2bf0ce7c73c5edc4386e5129009984d3d34f34e9260c69006 WHIRLPOOL feea6403a47ab88e95cc04b1d9b4f99e8fc26c2b5f1c51f69cf78f9ea71e70852bbfa71cea2466771c74ddf555cc5c92b7afa81ea1bc83baddb9cbf5a6a9f7fa
diff --git a/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch b/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch
new file mode 100644
index 00000000000..c84d50f5f6b
--- /dev/null
+++ b/sci-geosciences/swmm/files/swmm-5.0.022-QA.patch
@@ -0,0 +1,14 @@
+--- Makefile
++++ Makefile
+@@ -7,9 +7,10 @@
+ rain.o rdii.o report.o routing.o runoff.o shape.o snow.o stats.o \
+ statsrpt.o subcatch.o table.o toposort.o transect.o treatmnt.o xsect.o
+
++LIBS += -lm
+
+ swmm5 : $(objs)
+- cc -o swmm5 -lm $(objs)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o swmm5 $(objs) $(LIBS)
+
+ swmm5.o : consts.h macros.h enums.h error.h datetime.h objects.h funcs.h text.h globals.h swmm5.h
+ climate.o : headers.h
diff --git a/sci-geosciences/swmm/metadata.xml b/sci-geosciences/swmm/metadata.xml
new file mode 100644
index 00000000000..e96e35b1a37
--- /dev/null
+++ b/sci-geosciences/swmm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/sci-geosciences/swmm/swmm-5.0.022.ebuild b/sci-geosciences/swmm/swmm-5.0.022.ebuild
new file mode 100644
index 00000000000..7059bb8efba
--- /dev/null
+++ b/sci-geosciences/swmm/swmm-5.0.022.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils versionator toolchain-funcs
+
+MY_PV=$(delete_all_version_separators)
+MY_SRC="swmm${MY_PV}_engine.zip"
+DESCRIPTION="Storm Water Management Model - SWMM, hydrology, hydraulics, and water quality model"
+HOMEPAGE="http://www.epa.gov/ednnrmrl/models/swmm/index.htm"
+SRC_URI="http://www.epa.gov/nrmrl/wswrd/wq/models/swmm/${MY_SRC}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+pkg_setup() {
+ tc-export CC
+}
+
+src_unpack() {
+ unpack ${MY_SRC}
+ # Need to delete Readme.txt, because it is in makefiles.zip
+ rm Readme.txt || die
+ unpack ./makefiles.zip
+ unpack ./GNU_CON.zip
+ unpack ./source*.ZIP
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-QA.patch
+}
+
+src_compile(){
+ # 'sed' command has to accomodate DOS formatted file.
+ sed -i \
+ -e 's;^#define DLL;//#define DLL;' \
+ -e 's;^//#define CLE;#define CLE;' \
+ swmm5.c || die
+ emake
+}
+
+src_install(){
+ newbin swmm5 swmm
+ dodoc Roadmap.txt
+}
diff --git a/sci-geosciences/tappy/Manifest b/sci-geosciences/tappy/Manifest
new file mode 100644
index 00000000000..7eb7ed06301
--- /dev/null
+++ b/sci-geosciences/tappy/Manifest
@@ -0,0 +1 @@
+DIST tappy-0.9.0.tar.gz 1250867 SHA256 273dce2595a0c2161752d9cb26e4e2569d6f42028cdf0b418c90775ff2443bf0 SHA512 2f3c7676c166dbfe88436cac9a0c4e3d3d4c027e17c39617c45eb02c1c2eda9276afb1ceaa16afd54bb6de130248f83c8c66aeb3509483cce642d2eb631fb9df WHIRLPOOL 83c24a29c2818c0ed6767b8e18c6b899befd26935de31ac933d83c5dd5d0e74bd908f52a174fe6dff8fcdd47e4cad8658be5a9f3c2bf12d70978cb1c2edc7ed0
diff --git a/sci-geosciences/tappy/metadata.xml b/sci-geosciences/tappy/metadata.xml
new file mode 100644
index 00000000000..2de79001b4a
--- /dev/null
+++ b/sci-geosciences/tappy/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">tappy</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/tappy/tappy-0.9.0.ebuild b/sci-geosciences/tappy/tappy-0.9.0.ebuild
new file mode 100644
index 00000000000..9544490fa0a
--- /dev/null
+++ b/sci-geosciences/tappy/tappy-0.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+inherit distutils-r1
+
+DESCRIPTION="Tidal Analysis in Python breaks hourly water level into tidal components"
+HOMEPAGE="http://tappy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/pywavelets
+ sci-libs/scipy[${PYTHON_USEDEP}]"
diff --git a/sci-geosciences/tcd-utils/Manifest b/sci-geosciences/tcd-utils/Manifest
new file mode 100644
index 00000000000..c492e1c99d8
--- /dev/null
+++ b/sci-geosciences/tcd-utils/Manifest
@@ -0,0 +1 @@
+DIST tcd-utils-20120115.tar.bz2 118652 SHA256 85efc69209c41c089f0a93dec0356b2ce16ae2efba51bd73570828961cdb894e SHA512 be4f4b17e24d378cee45c6de20aa4727648f9b0c755118094a06fd830fb4ca78bf467cb4c5b0f430917ae124b2040fef83dcae60186893baf785342585b5d8aa WHIRLPOOL 3d7bafbed8ee412ef3181bca977b5c439c8e89a3195d8fc49d377c9d873dd8a3119d984cdd0e24440254ea9139c48d7895948523e96aea2644efce3ad8701506
diff --git a/sci-geosciences/tcd-utils/metadata.xml b/sci-geosciences/tcd-utils/metadata.xml
new file mode 100644
index 00000000000..4d570de58ab
--- /dev/null
+++ b/sci-geosciences/tcd-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>hasufell@gentoo.org</email>
+ <name>Julian Ospald</name>
+</maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/tcd-utils/tcd-utils-20120115.ebuild b/sci-geosciences/tcd-utils/tcd-utils-20120115.ebuild
new file mode 100644
index 00000000000..01e46269bb3
--- /dev/null
+++ b/sci-geosciences/tcd-utils/tcd-utils-20120115.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Utilities for working with Tidal Constituent Databases"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=sci-geosciences/libtcd-2.2.4"
+RDEPEND="${DEPEND}"
diff --git a/sci-geosciences/tilecache/Manifest b/sci-geosciences/tilecache/Manifest
new file mode 100644
index 00000000000..da46746acce
--- /dev/null
+++ b/sci-geosciences/tilecache/Manifest
@@ -0,0 +1 @@
+DIST tilecache-2.11.tar.gz 68705 SHA256 b46dc2731a19b40e3207cf3c9b43ea59b899a622a586aaa3c397c3b5aa00f887 SHA512 234fdba3465b9f940b4bf45a4427c61a803f4458266c59ac08d52bdaace4a186d7bf37cce7af6f273ba0ade9e8d6118fa58ce6dd37645a0667230dc507ee991a WHIRLPOOL aa3da22b95b35da7b6612ed6078ccec34828c0488ddff18b33642cdcbb7dc45a502f6b5717f25264b6d9ffc0b5d2bdd1fb4091bc49277d5c135d216f24b3567c
diff --git a/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch b/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch
new file mode 100644
index 00000000000..b596ae449ff
--- /dev/null
+++ b/sci-geosciences/tilecache/files/tilecache-2.11-pil.patch
@@ -0,0 +1,21 @@
+diff -Nuar tilecache-2.11.orig/TileCache/Layer.py tilecache-2.11/TileCache/Layer.py
+--- tilecache-2.11.orig/TileCache/Layer.py 2010-10-15 04:00:18.000000000 -0700
++++ tilecache-2.11/TileCache/Layer.py 2013-11-09 11:05:17.620475332 -0800
+@@ -391,7 +391,7 @@
+ return MetaTile(self, x, y, tile.z)
+
+ def renderMetaTile (self, metatile, tile):
+- import StringIO, Image
++ import StringIO, PIL.Image as Image
+
+ data = self.renderTile(metatile)
+ image = Image.open( StringIO.StringIO(data) )
+@@ -444,7 +444,7 @@
+ return self.renderTile(tile)
+
+ def watermark (self, img):
+- import StringIO, Image, ImageEnhance
++ import StringIO, PIL.Image as Image, PIL.ImageEnhance as ImageEnhance
+ tileImage = Image.open( StringIO.StringIO(img) )
+ wmark = Image.open(self.watermarkimage)
+ assert self.watermarkopacity >= 0 and self.watermarkopacity <= 1
diff --git a/sci-geosciences/tilecache/metadata.xml b/sci-geosciences/tilecache/metadata.xml
new file mode 100644
index 00000000000..d21d1188455
--- /dev/null
+++ b/sci-geosciences/tilecache/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-geosciences</herd>
+</pkgmetadata>
diff --git a/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
new file mode 100644
index 00000000000..b06e82a84d7
--- /dev/null
+++ b/sci-geosciences/tilecache/tilecache-2.11-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Web map tile caching system"
+HOMEPAGE="http://tilecache.org/"
+SRC_URI="http://${PN}.org/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/python-imaging
+ dev-python/paste"
+DEPEND="${RDEPEND}
+ dev-python/setuptools
+"
+
+PATCHES=( "${FILESDIR}/tilecache-2.11-pil.patch" )
+
+src_install() {
+ distutils-r1_src_install "--debian"
+}
+
+python_test() {
+ python setup.py test || die "Failed tests"
+}
diff --git a/sci-geosciences/viking/Manifest b/sci-geosciences/viking/Manifest
new file mode 100644
index 00000000000..cc47ba2b7a2
--- /dev/null
+++ b/sci-geosciences/viking/Manifest
@@ -0,0 +1,2 @@
+DIST viking-1.6.tar.bz2 3060389 SHA256 21f1bd372c571b8d021e4509a69ec6448efefec623355a9db26cd81898b5920a SHA512 7716f5720bcd410fa4a2a89ff87548c82a83132003733e6a3f516c51df99ffed4fa3b19631cec9ccedd27b222188a0f092c28ab9af1cefd8d8137b5801eff042 WHIRLPOOL 2f50b35e1362e993553f57682b25a7349c92d140c70f85ab3f22bc5a176769d15728ab643a35fd75fc63c836235f734c7e6388c74cfb5e41dfd868dcb9a7ec2d
+DIST viking.pdf 383200 SHA256 b45d2c35c36484f9e3550c2b161fc7c60609e0f1f6f163f73ff70886f5532138 SHA512 481c88afd43783475366d41cd46a7fa5fdbcd20fec27b3ce286fb8abe1e9efbb4164def0d19fca2380fa95b5b97e9472f25ff5e10f8d95261e85b7c4a52d29ee WHIRLPOOL b674549c160429de8757f337699d596be2573158a64f6d873b59769eddc1afa8519e4ab0ac8f13f6a36b57da11f85c5f1fa061eb06ba61cdc026bbc4702ab33e
diff --git a/sci-geosciences/viking/files/1.3-autoreconf.patch b/sci-geosciences/viking/files/1.3-autoreconf.patch
new file mode 100644
index 00000000000..c8ddd6f6873
--- /dev/null
+++ b/sci-geosciences/viking/files/1.3-autoreconf.patch
@@ -0,0 +1,12 @@
+--- configure.ac.orig 2012-05-31 09:40:33.543090992 +0200
++++ configure.ac 2012-05-31 09:40:44.372640811 +0200
+@@ -350,9 +350,6 @@
+ help/Makefile
+ doc/Makefile
+ doc/examples/Makefile])
+-if test x$enable_gtk_doc = xyes; then
+-AC_CONFIG_FILES([doc/reference/Makefile])
+-fi
+ AC_OUTPUT([
+ viking.spec
+ ])
diff --git a/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch b/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch
new file mode 100644
index 00000000000..d559746ff81
--- /dev/null
+++ b/sci-geosciences/viking/files/viking-1.5.1-gpsd-3.13.patch
@@ -0,0 +1,53 @@
+commit 25043ca24a55468dc9eeaa7335a24d132c51b07d
+Author: Rob Norris <rw_norris@hotmail.com>
+Date: Mon Mar 9 23:25:15 2015 +0000
+
+ SF Bugs#117: Confirm capability with GPSD_API_MAJOR_VERSION=6 (gpsd 3.12 / libgps.so.22)
+
+diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c
+index daf6d42..ca4be29 100644
+--- a/src/vikgpslayer.c
++++ b/src/vikgpslayer.c
+@@ -1673,7 +1673,7 @@ static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition,
+ if (condition == G_IO_IN) {
+ #if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4
+ if (!gps_poll(&vgl->vgpsd->gpsd)) {
+-#elif GPSD_API_MAJOR_VERSION == 5
++#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+ if (gps_read(&vgl->vgpsd->gpsd) > -1) {
+ // Reuse old function to perform operations on the new GPS data
+ gpsd_raw_hook(vgl->vgpsd, NULL);
+@@ -1718,7 +1718,7 @@ static gboolean rt_gpsd_try_connect(gpointer *data)
+ vgl->vgpsd = g_malloc(sizeof(VglGpsd));
+
+ if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) {
+-#elif GPSD_API_MAJOR_VERSION == 5
++#elif GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+ vgl->vgpsd = g_malloc(sizeof(VglGpsd));
+ if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) {
+ #else
+@@ -1757,7 +1757,7 @@ static gboolean rt_gpsd_try_connect(gpointer *data)
+ #if GPSD_API_MAJOR_VERSION == 3
+ gps_query(&vgl->vgpsd->gpsd, "w+x");
+ #endif
+-#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
++#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+ gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL);
+ #endif
+
+@@ -1813,13 +1813,13 @@ static void rt_gpsd_disconnect(VikGpsLayer *vgl)
+ vgl->realtime_io_channel = NULL;
+ }
+ if (vgl->vgpsd) {
+-#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
++#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+ gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL);
+ #endif
+ gps_close(&vgl->vgpsd->gpsd);
+ #if GPSD_API_MAJOR_VERSION == 3
+ free(vgl->vgpsd);
+-#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5
++#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 || GPSD_API_MAJOR_VERSION == 6
+ g_free(vgl->vgpsd);
+ #endif
+ vgl->vgpsd = NULL;
diff --git a/sci-geosciences/viking/metadata.xml b/sci-geosciences/viking/metadata.xml
new file mode 100644
index 00000000000..b1a37b4886e
--- /dev/null
+++ b/sci-geosciences/viking/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>graaff@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="libexif">
+ Use <pkg>media-libs/libexif</pkg> for EXIF support
+ </flag>
+ <flag name="magic">
+ Use libmagic to determine mimetypes
+ </flag>
+ <flag name="mapnik">
+ Enable a layer based on <pkg>sci-geosciences/mapnik</pkg>
+ </flag>
+ <flag name="sqlite">
+ Enable MBTiles support based on <pkg>dev-db/sqlite</pkg>
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">viking</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sci-geosciences/viking/viking-1.6-r2.ebuild b/sci-geosciences/viking/viking-1.6-r2.ebuild
new file mode 100644
index 00000000000..1a7baa72595
--- /dev/null
+++ b/sci-geosciences/viking/viking-1.6-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="GPS data editor and analyzer"
+HOMEPAGE="http://viking.sourceforge.net/"
+IUSE="doc +exif libexif gps +magic mapnik nls sqlite"
+SRC_URI="
+ mirror://sourceforge/${PN}/${P}.tar.bz2
+ doc? ( mirror://sourceforge/${PN}/${PN}.pdf )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+COMMONDEPEND="
+ app-arch/bzip2
+ dev-libs/expat
+ dev-libs/glib:2
+ net-misc/curl
+ sys-libs/zlib
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ gps? ( >=sci-geosciences/gpsd-2.96 )
+ exif? ( libexif? ( media-libs/libexif ) !libexif? ( media-libs/gexiv2 ) )
+ magic? ( sys-apps/file )
+ mapnik? ( sci-geosciences/mapnik )
+ sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${COMMONDEPEND}
+ sci-geosciences/gpsbabel
+"
+DEPEND="${COMMONDEPEND}
+ app-text/gnome-doc-utils
+ dev-util/intltool
+ dev-util/gtk-doc-am
+ app-text/rarian
+ dev-libs/libxslt
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+src_configure() {
+ econf \
+ --disable-deprecations \
+ --with-libcurl \
+ --with-expat \
+ --enable-google \
+ --enable-terraserver \
+ --enable-expedia \
+ --enable-openstreetmap \
+ --enable-bluemarble \
+ --enable-geonames \
+ --enable-geocaches \
+ --disable-dem24k \
+ $(use_enable exif geotag) \
+ $(use_with libexif ) \
+ $(use_enable gps realtime-gps-tracking) \
+ $(use_enable magic) \
+ $(use_enable mapnik) \
+ $(use_enable nls) \
+ $(use_enable sqlite mbtiles )
+}
+
+src_install() {
+ default
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ doins "${DISTDIR}"/${PN}.pdf
+ fi
+}
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
new file mode 100644
index 00000000000..00e93bb9a91
--- /dev/null
+++ b/sci-geosciences/xtide/Manifest
@@ -0,0 +1,2 @@
+DIST xtide-2.13.1.tar.bz2 476238 SHA256 f537377223ebc073998bbf2c7c475e57374ee60a638e29d029f84ba01fb6f365 SHA512 90ad5f50c0f234a8993e8fca99865587617996ac422941c3450826a998556b0429ff1c16a9f8ab7a1b4255b938a7e928258fd090094ad3c8556f94a64eb8e54d WHIRLPOOL aed1390712895b866d96923c46281517ee7157e2460defb9049ec484c51e9828af8306b5a42e10d130de83186e4d36b7d9fac0c3e74635958e2245e6c52f6ece
+DIST xtide-2.13.tar.bz2 465679 SHA256 a73c530c83a9346bf85fe9545551eef3fbedfb24adf18f63c9e7dba0388e0d0a SHA512 2324d3f5150a46ea1fd6c2af3379c8ea4f147034f153ac4b0393ef3aaa2178bfdafc01499f27db643b5ec78b4825c99b20957f5e47f6174fe1612480dc79dcd1 WHIRLPOOL af9fe8377fec84a449e06cfac542b2d792ebe1df904e036775b3e5b659e874d5193e0416b061dddcffc2419610d48864207bba27d557fe05fdcd7560c20afb53
diff --git a/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch b/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
new file mode 100644
index 00000000000..fcfd147e51b
--- /dev/null
+++ b/sci-geosciences/xtide/files/xtide-2.13.1-Werror.patch
@@ -0,0 +1,21 @@
+commit 9cf2369051fa887bd5f13bf7df80c51bcf040306
+Author: hasufell <hasufell@gentoo.org>
+Date: Sat Jul 13 13:25:42 2013 +0200
+
+ BUILD: remove -Werror
+
+ It's discouraged to add non-specific Werror flags.
+
+diff --git a/configure.ac b/configure.ac
+index b366337..86c7569 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ m4_if(2.65, AC_AUTOCONF_VERSION, [m4_fatal([autoconf version 2.65 is broken and
+ # FIXME: Update version info on each release
+ AC_INIT([XTide], [2.13.1], [dave@flaterco.com])
+
+-AM_INIT_AUTOMAKE([-Wall -Werror])
++AM_INIT_AUTOMAKE([-Wall])
+
+ AC_LANG([C++])
+ AC_PROG_CXX
diff --git a/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch b/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
new file mode 100644
index 00000000000..54c6546fe29
--- /dev/null
+++ b/sci-geosciences/xtide/files/xtide-2.13.1-gps-switch.patch
@@ -0,0 +1,88 @@
+commit 755677baae16fd8772efd523a25b787ea3fc0772
+Author: hasufell <hasufell@gentoo.org>
+Date: Sat Jul 13 13:26:24 2013 +0200
+
+ BUILD: add --with-gps switch
+
+ We don't want automagic gps detection, but give control
+ to the user.
+
+diff --git a/configure.ac b/configure.ac
+index 86c7569..307def4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -156,6 +156,12 @@ if test -z "${SKIP_COMPLICATED}"; then
+ fi
+ CXXFLAGS="${SAVED_CXXFLAGS}"
+
++AC_ARG_WITH([gps],
++ [AS_HELP_STRING([--with-gps],
++ [use libgpsd (default: no)])],
++ [gps=$withval],
++ [gps=no])
++
+ # xttpd configs
+ AC_ARG_WITH([xttpd-user],
+ [AS_HELP_STRING([--with-xttpd-user=user],
+@@ -381,32 +387,35 @@ AC_CHECK_HEADER([Dstr], [AC_CHECK_LIB([dstr], [DstrCompat20070215Check])])
+ AM_CONDITIONAL(NO_LIBDSTR, test "$ac_cv_lib_dstr_DstrCompat20070215Check" != "yes")
+
+ # libgps is optional; use it if you have a compatible version.
+-AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
+- AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
+- AC_COMPILE_IFELSE(
+- [AC_LANG_SOURCE([[
+-#include <gps.h>
+-#if (GPSD_API_MAJOR_VERSION < 5)
+-#FAIL
+-#endif
+-int main (int argc, char **argv) {
+- struct gps_data_t gpsdata;
+- gps_open ("127.0.0.1", "2947", &gpsdata);
+- gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
+- gps_read (&gpsdata);
+- return (gpsdata.fix.mode >= MODE_2D);
+-}
+- ]])],
+- [
+- AC_MSG_RESULT(yes)
+- AC_DEFINE([GPS_GOOD])
+- AC_SUBST([GPSD_LIBS], ["-lgps"])
+- ],
+- [
+- AC_MSG_RESULT(no)
+- ]
+- )
+-])])
++
++AS_IF([test "x$gps" = "xyes"], [
++ AC_CHECK_HEADER([gps.h], [AC_CHECK_LIB([gps], [timestamp], [
++ AC_MSG_CHECKING([if libgps is 3.x or newer, compatible version])
++ AC_COMPILE_IFELSE(
++ [AC_LANG_SOURCE([[
++ #include <gps.h>
++ #if (GPSD_API_MAJOR_VERSION < 5)
++ #FAIL
++ #endif
++ int main (int argc, char **argv) {
++ struct gps_data_t gpsdata;
++ gps_open ("127.0.0.1", "2947", &gpsdata);
++ gps_stream (&gpsdata, WATCH_ENABLE|WATCH_NEWSTYLE, NULL);
++ gps_read (&gpsdata);
++ return (gpsdata.fix.mode >= MODE_2D);
++ }
++ ]])],
++ [
++ AC_MSG_RESULT(yes)
++ AC_DEFINE([GPS_GOOD])
++ AC_SUBST([GPSD_LIBS], ["-lgps"])
++ ],
++ [
++ AC_MSG_RESULT(no)
++ ]
++ )
++ ], [AC_MSG_ERROR([cannot find libgps])])], [AC_MSG_ERROR([cannot find gps.h])])
++ ])
+
+ AC_TYPE_INT8_T
+ AC_TYPE_INT16_T
diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
new file mode 100644
index 00000000000..208d7793f20
--- /dev/null
+++ b/sci-geosciences/xtide/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name='gps'>Use <pkg>sci-geosciences/gpsd</pkg></flag>
+ </use>
+</pkgmetadata>
+
diff --git a/sci-geosciences/xtide/xtide-2.13.1.ebuild b/sci-geosciences/xtide/xtide-2.13.1.ebuild
new file mode 100644
index 00000000000..81f0efb8925
--- /dev/null
+++ b/sci-geosciences/xtide/xtide-2.13.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils gnome2-utils
+
+DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gps"
+
+DEPEND="
+ media-libs/libpng:0
+ >=sci-geosciences/libtcd-2.2.5_p2
+ x11-libs/libX11
+ x11-libs/libXaw3d
+ x11-libs/libXpm
+ x11-libs/libXt
+ gps? ( sci-geosciences/gpsd )"
+RDEPEND="${DEPEND}
+ media-fonts/font-schumacher-misc"
+DEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-{Werror,gps-switch}.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_with gps)
+}
+
+src_install() {
+ dobin xtide tide xttpd
+ doman *.[18]
+
+ echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
+ doenvd 50xtide_harm
+
+ newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
+
+ make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/sci-geosciences/xtide/xtide-2.13.ebuild b/sci-geosciences/xtide/xtide-2.13.ebuild
new file mode 100644
index 00000000000..da64c47266b
--- /dev/null
+++ b/sci-geosciences/xtide/xtide-2.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils gnome2-utils
+
+DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
+HOMEPAGE="http://www.flaterco.com/xtide/"
+SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="media-fonts/font-schumacher-misc
+ media-libs/libpng:0
+ >=sci-geosciences/libtcd-2.2.5_p2
+ x11-libs/libX11
+ >=x11-libs/libXaw-1.0.3
+ >=x11-libs/libXpm-3.5.6
+ x11-libs/libXt"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ dobin xtide tide xttpd
+ doman *.[18]
+
+ echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
+ doenvd 50xtide_harm
+
+ newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
+
+ make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}