gentoo resync : 19.01.2018

9 files changed, 50 insertions, 464 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 523f161cd31f..15cc170c3300 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 90726a253c3e..a1c287ad2747 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,16 +1,11 @@
-AUX gdal-1.5.0-install_name.patch 1731 BLAKE2B 54aed8a9ef19447ff2938f481ca77f00926b4ffe2ae717cdaf8912fd1ee7b741c69200739a2d5bdf8c2c59f65d42b968b58b5351256b73516648151acf8edabf SHA512 fa5ecc9e14cbfc282a41d0c55e328c2f56bd92d8fac1897d8e921d59c9705b1291eff66e7f6cf8a1305b2c5f044e0813d28affb398b715d9d207c31af341318e
 AUX gdal-1.5.0-soname-r1.patch 491 BLAKE2B 210a50e61990fa79c7ff3c489f0f184ab36eb655851027799015b6932a3cffd1290ad68af181d650ed5f5e209c8346148f225415469efb7437bd26995be349ea SHA512 883828de32d55a79a390f4737b640c8d50d174117e86396545d075fb5328a7e5ffffa150c11a6e9a6317b7cfd5458eb5ac543152fc2acafb1abf3688b78a573f
-AUX gdal-1.5.0-soname.patch 483 BLAKE2B cbdcf65f43ae5e51a790551fed6abd5c8e1068c4379f09d34a727277db310fc6b765193b7e2c905864bf51f316e9ab6ff443dde6c02af6f34c1f6b35106a3fee SHA512 c7c022524fd11de2137e15ec8dc31106887a2d23d583f61f1f9bab1d41a01e558faccc162166150c43903dbcaad14af65afd8ddc090670ebbd15dc57f05f228e
-AUX gdal-2.0.2-jasper.patch 501 BLAKE2B d7927b5c49458f5ce075d42ea57da5ddff4d95e2ff7a4c934fe5971f778e05bc4f4ebfbfd9f25520e031ed249d646775085e2495b5089862246176a1b2e6c766 SHA512 f564ee0556c1c62f88adb950310a321bd22eafc801e693b828e4cd9e6d2ec5245271c5be4133c59ea3953c7a7f7bf9c8596dbfffcd5726c87b4281e81100e271
-AUX gdal-2.0.2-jasper2.patch 2470 BLAKE2B 1f9e4c09a11729edf1d969171986f453a7dfda994b9d5293b091e5bc579e41ba2d5e9006e77d77f8835162ffbf8d7f5c0853f593131ce4cc500a2afd70af9905 SHA512 fde3459c91ea70e2750ba5c2dfd926fc1619a3df714f54982eaf26443be6ebd6ca8960c0569aec52aeba8ab48707ccff6d8a7cb00806a14c216ee89a289300f3
 AUX gdal-2.0.3-add-dlopen-support-for-jvm.patch 8840 BLAKE2B e4361d8ca2f42a74c60644cdecc3ba9329b2fb67edcecf71bad903899cfe4b1782a623dde962270c6139c442ee76a4274a5eb9afe45e81b40d4427575838621e SHA512 9af9a9a6063476a9a62807addf542b67e47a7323377f80a92ea163f9d36396879d7dd92af81d296d6bc2956c27b271c5dbe729598d91b68f64991f14e5cf8c0b
 AUX gdal-2.0.3-install_name.patch 1825 BLAKE2B 989f4c4e224dfa7974c2c29a938600d1f377931cc5c7deed11c3a9538da31dfd2a15897764ecf4b8515c7e771409f5208dfeb5437dc46318585e780e23456f76 SHA512 ebe21b9794a81de79ec6ae1e5ef225cbc74b7e36941ddec162b8ddee91778ac6cca2169464281168351fe8356ff4a14d503da7769871054f30592ce6560a0397
+AUX gdal-2.2.3-bashcomp-path.patch 621 BLAKE2B 0f825aa27d68e35afdcbd7c5d3239b6b63e1c9b2814acc307e0b5082e7326f495102d10c4b2bdc86b17b7f4ae8ae11231c99215d87fc59217115f0fd92fc96f0 SHA512 16ed7bbd5569166c80cf4d8beba81195a177ee36bcd7e14ca6d00e3add6fe57c7980cbe1853747325443699daa331fc23e53fc86150b6c7cf871ef4812936c39
 AUX gdal-2.2.3-json-c-0.13.patch 3733 BLAKE2B 34921f8e2717a446bead6d8b07c6a8e2455752bd4534d066c4bb6150f1cd03856269a8510535517cbf60e609053e470107e9ce62d58358afcb48aa819a546563 SHA512 f4beaa11431b1eb2c6986c3da24a696cdade04f025a9bdeb9726c392aecdf597126c7735b1b2c1175bd0de71a2441b2c1e5d01e597acd7869e9c75644660994d
 AUX gdal-2.2.3-soname.patch 2062 BLAKE2B 159b3d8eec126a141ff21c908d45193411bdbcc50e03386131c313cbd71861859a1b8a5a5648307868fee484b8a1dd816b580bb2304cb7e1e72e42df40cea042 SHA512 0f06d8de537ddc19c6c4ee800c0c4b084ceb04a47fd24f28c3095909219e27634e66086158f80f011ccfb7865fc559a966770bfa95d3a8fd144f3f8a3d34571d
-DIST gdal-2.0.2.tar.gz 11643726 BLAKE2B aac80990d800acb8b0881caf84229a3c73b57aad1acbd05adb911c9c2ca56fff145eae5a77dcaa934003a22188178883381db5a4c10e7fc082b8f4d98aa146c6 SHA512 b3fedc8d1d0522d2a6fd22fbc722c551ebf2e4326f64b76c9c43cd3848f7c97a0636c691ee383b3f3c872dc79cd0e216527d3985c6aac3103395fde657db1266
 DIST gdal-2.0.3.tar.gz 11589011 BLAKE2B 2b9d319be24e377aff751c7ae4d6c89812c47fe2a0b9476936b2f3423e4f5593034a6303346e05709c9a7cffd71703ae80f72c689218ae0337794d35afcb3a1d SHA512 3ed2a084fa146fab8d5f5e039480ab935edaefebe9e55f85bf637a4487a3f56951c93055395850e7bf35d5a6d6e901f741ae01ad64be87597aabfad52f1c5e90
 DIST gdal-2.2.3.tar.gz 13754766 BLAKE2B d9482e7ee40bb5558fbbb43b750dfb95344abe45142c19e1f767535d3fc127fa9d6ed4496d730a25cb4132980efbffb4685e8663798fa05515b8548edb689e42 SHA512 841e5ba3c1a442b678dcaabac719ea7707b817f3dc717a34430dc7ba1f2c27fa88e27b7a8645075fae6e16373b36e6c50f674bdd6b70d10059e6bc4be7a72046
-EBUILD gdal-2.0.2-r3.ebuild 7176 BLAKE2B 9c312840c67110cd7dc5b8fb42fe4828e06cb761440dfacfb1fad8d6c9f3d98432e3e3d57623ac1ca09db8f26da5700ca1ee69da3de2b9cfd33857b8a86569f8 SHA512 b5e7fc804e892cf60b8b6ccafb3357def5434be1c6f9b47028f877de002b4e6b654429cb62d2274e0f9fe2a5c0fa7b3877c93c9ccddebe1cccb603eeda3f1cb9
 EBUILD gdal-2.0.3.ebuild 7525 BLAKE2B aa70d3e8b2bfb3213ea247f9c3c838a72cdf5e74061b6b4aa873726e14242f1d9635fc45436bebbbcaad443c89f0ad01546d02ad0f3d98238f2f8d4a006c2600 SHA512 eef801d86c845a1b880dee6aa20381ff06175d0c6b88431230e23ef772a5618455361dc6f38c5a7808d5dc97eb51cfb1fd9bf751b2d875d44d387f60fbf7685f
-EBUILD gdal-2.2.3.ebuild 7449 BLAKE2B a97c987d0063f884077a6b3388be8d121aec3234d51a14abfd76188fcdcd4199c436bd6841f1e1892d20c7eb908b62841eb5df6df9527cb50b62c176a212c175 SHA512 58788ab996560f7abb2e34f7859906c30ba9bdf63a1337e155b42550c178cd2223c84643453d957f8bd38b02f846626e14a96359b97958587cc5a0b36a6ab031
+EBUILD gdal-2.2.3-r1.ebuild 7471 BLAKE2B 069f778d10c62e1a91ae1c316c591757dbb24efb2eee59d711b8dc608a974161ac5a7f91af58c1c1bfaa52335a864ce3af1fcdf51fcb11b3f7fd7f6840e4fcbc SHA512 fad6fc629473dc5bb15f8bb322bae8a6b9287974465b2ce9c94b5df1da606294aacf8b1e814e20669e2ac022c919a547d7d2a278c303132c55d54acba69a2503
 MISC metadata.xml 1522 BLAKE2B b67678f81739e2fb2866cc6ca49545368fce4a85b145ba3f8228b8a39ecb2d7f75b55500f13768838c9ed11a47f586ab7b05eb31e2dbf6fcd4d29c5d8896107f SHA512 091112e555a5a77c5643cbd4465046bfd9fe287e209b42f5410787a2f1a2e4d7ec640efad93c277f0f6581db2264fa104d5aba2e8cbc4126c2c14fe4d86afcee
diff --git a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch b/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
deleted file mode 100644
index e17575267d6e..000000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-install_name.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
-+++ GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =	-install_name $(INST_LIB)/libgdal.$(GDAL_VERSION_MAJOR).$(SO_EXT)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 
---- GNUmakefile.orig	2010-03-09 14:03:08 +0100
-+++ GNUmakefile	2010-03-09 14:05:29 +0100
-@@ -218,7 +218,7 @@
- 
- ifeq ($(HAVE_LD_SHARED),yes)
- 
--GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
-+GDAL_SLIB_B	=	libgdal
- 
- install-lib:
- 
-@@ -226,14 +226,14 @@
- ifeq ($(MACOSX_FRAMEWORK),yes)
- 	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/GDAL
- else
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B)
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR)
--	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
--	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).dylib
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib
-+	rm -f $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
-+	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER).dylib
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VER) $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_VER).dylib $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib)
- 	(cd $(DESTDIR)$(INST_LIB) ; \
--	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR) $(GDAL_SLIB_B))
-+	 ln -s $(GDAL_SLIB_B).$(GDAL_VERSION_MAJOR).dylib $(GDAL_SLIB_B).dylib)
- endif
- 
- else
diff --git a/sci-libs/gdal/files/gdal-1.5.0-soname.patch b/sci-libs/gdal/files/gdal-1.5.0-soname.patch
deleted file mode 100644
index f784536316c2..000000000000
--- a/sci-libs/gdal/files/gdal-1.5.0-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- GDALmake.opt.in.orig	2008-02-02 18:25:48.000000000 -0800
-+++ GDALmake.opt.in	2008-02-02 18:54:53.000000000 -0800
-@@ -97,6 +97,10 @@
- GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
- GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
- 
-+# for building without libtool
-+GDAL_SLIB_SO_VER =	$(GDAL_VERSION_MAJOR).$(LIBGDAL_CURRENT).$(LIBGDAL_REVISION)
-+GDAL_SLIB_SONAME =	-Wl,-soname,libgdal.$(SO_EXT).$(GDAL_VERSION_MAJOR)
-+
- # Mac OS X Framework definition
- MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
- 
diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch b/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
deleted file mode 100644
index 00cf5c16fa4d..000000000000
--- a/sci-libs/gdal/files/gdal-2.0.2-jasper.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urpN gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h
---- gdal-2.0.2.orig/frmts/jpeg2000/jpeg2000_vsil_io.h	2016-01-26 07:21:48.000000000 -0800
-+++ gdal-2.0.2/frmts/jpeg2000/jpeg2000_vsil_io.h	2016-10-31 23:45:28.939407322 -0700
-@@ -29,7 +29,8 @@
- 

- #ifndef JPEG2000_VSIL_IO_H

- #define JPEG2000_VSIL_IO_H

-- 

-+

-+#include <sys/types.h>

- #include <jasper/jasper.h>

- 

- jas_stream_t *JPEG2000_VSIL_fopen(const char *filename, const char *mode);

diff --git a/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch b/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch
deleted file mode 100644
index a418e4159c0a..000000000000
--- a/sci-libs/gdal/files/gdal-2.0.2-jasper2.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -urN orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp
---- orig/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2016-01-26 16:21:48.000000000 +0100
-+++ dwok/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2016-11-16 21:53:15.280302723 +0100
-@@ -179,40 +179,25 @@
- * Buffer initialization code.

- \******************************************************************************/

- 

--static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,

--  int bufsize)

-+static void JPEG2000_VSIL_jas_stream_initbuf(jas_stream_t *stream, int bufmode)

- {

- 	/* If this function is being called, the buffer should not have been

- 	  initialized yet. */

- 	assert(!stream->bufbase_);

- 

- 	if (bufmode != JAS_STREAM_UNBUF) {

--		/* The full- or line-buffered mode is being employed. */

--		if (!buf) {

--			/* The caller has not specified a buffer to employ, so allocate

--			  one. */

--			if ((stream->bufbase_ = (unsigned char*)jas_malloc(JAS_STREAM_BUFSIZE +

--			  JAS_STREAM_MAXPUTBACK))) {

--				stream->bufmode_ |= JAS_STREAM_FREEBUF;

--				stream->bufsize_ = JAS_STREAM_BUFSIZE;

--			} else {

--				/* The buffer allocation has failed.  Resort to unbuffered

--				  operation. */

--				stream->bufbase_ = stream->tinybuf_;

--				stream->bufsize_ = 1;

--			}

-+		if ((stream->bufbase_ = (unsigned char*)jas_malloc(JAS_STREAM_BUFSIZE +

-+		  JAS_STREAM_MAXPUTBACK))) {

-+			stream->bufmode_ |= JAS_STREAM_FREEBUF;

-+			stream->bufsize_ = JAS_STREAM_BUFSIZE;

- 		} else {

--			/* The caller has specified a buffer to employ. */

--			/* The buffer must be large enough to accommodate maximum

--			  putback. */

--			assert(bufsize > JAS_STREAM_MAXPUTBACK);

--			stream->bufbase_ = JAS_CAST(uchar *, buf);

--			stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;

-+			/* The buffer allocation has failed.  Resort to unbuffered

-+			  operation. */

-+			stream->bufbase_ = stream->tinybuf_;

-+			stream->bufsize_ = 1;

- 		}

- 	} else {

- 		/* The unbuffered mode is being employed. */

--		/* A buffer should not have been supplied by the caller. */

--		assert(!buf);

- 		/* Use a trivial one-character buffer. */

- 		stream->bufbase_ = stream->tinybuf_;

- 		stream->bufsize_ = 1;

-@@ -282,7 +267,7 @@
- 	}

- 

- 	/* By default, use full buffering for this type of stream. */

--	JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);

-+	JPEG2000_VSIL_jas_stream_initbuf(stream, JAS_STREAM_FULLBUF);

- 

- 	return stream;

- }

diff --git a/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
new file mode 100644
index 000000000000..620b05fecbd1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-2.2.3-bashcomp-path.patch
@@ -0,0 +1,12 @@
+Fixes Gentoo-bug #641866
+
+--- a/scripts/GNUmakefile
++++ b/scripts/GNUmakefile
+@@ -6,5 +6,5 @@
+ install:
+ 	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
+-		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
+-		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
++		$(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=completionsdir bash-completion` ; \
++		cp gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=completionsdir bash-completion`/gdal.sh; \
+ 	fi
diff --git a/sci-libs/gdal/gdal-2.0.2-r3.ebuild b/sci-libs/gdal/gdal-2.0.2-r3.ebuild
deleted file mode 100644
index 836f98c0938c..000000000000
--- a/sci-libs/gdal/gdal-2.0.2-r3.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 python3_4 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools eutils libtool perl-module distutils-r1 flag-o-matic toolchain-funcs java-pkg-opt-2
-
-DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
-
-SLOT="0/2"
-LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python spatialite sqlite threads xls"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/json-c
-	dev-libs/libpcre
-	dev-libs/libxml2
-	media-libs/tiff:0=
-	sci-libs/libgeotiff
-	sys-libs/zlib[minizip(+)]
-	armadillo? ( sci-libs/armadillo[lapack] )
-	curl? ( net-misc/curl )
-	fits? ( sci-libs/cfitsio )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	gif? ( media-libs/giflib:= )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
-	java? ( >=virtual/jre-1.6:* )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper:= )
-	mysql? ( virtual/mysql )
-	netcdf? ( sci-libs/netcdf )
-	odbc?   ( dev-db/unixODBC )
-	ogdi? ( sci-libs/ogdi )
-	opencl? ( virtual/opencl )
-	pdf? ( >=app-text/poppler-0.24.3:= )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postgres? ( >=dev-db/postgresql-8.4:= )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	spatialite? ( dev-db/spatialite )
-	xls? ( dev-libs/freexl )
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.6 )
-	perl? ( dev-lang/swig:0 )
-	python? ( dev-lang/swig:0 )"
-
-AT_M4DIR="${S}/m4"
-
-REQUIRED_USE="
-	spatialite? ( sqlite )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	mdb? ( java )
-"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-
-	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
-
-	if use jpeg2k; then
-		epatch "${FILESDIR}"/${P}-jasper.patch
-		epatch "${FILESDIR}"/${P}-jasper2.patch #bug 599626
-	fi
-
-	# -soname is only accepted by GNU ld/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
-		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
-
-	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.in || die
-
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
-		-i configure.in || die
-
-	sed \
-		-e 's:^ar:$(AR):g' \
-		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
-
-	# updated for newer swig (must specify the path to input files)
-	sed -i \
-		-e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -i \
-		-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-
-	# bug 626844, poppler headers require C++11
-	use pdf && append-cxxflags -std=c++11
-
-	tc-export AR RANLIB
-
-	eautoreconf
-}
-
-src_configure() {
-	local myopts=""
-
-	if use java; then
-		myopts+="
-			--with-java=$(java-config --jdk-home 2>/dev/null)
-			$(use_with mdb)"
-	else
-		myopts+=" --without-java --without-mdb"
-		use mdb && ewarn "mdb requires java use enabled. disabling"
-	fi
-
-	if use sqlite; then
-		myopts+=" LIBS=-lsqlite3"
-	fi
-
-	# pcidsk is internal, because there is no such library yet released
-	#     also that thing is developed by the gdal people
-	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
-	# bsb - legal issues
-	# oracle - disabled, i dont have and can't test
-	# ingres - same story as oracle oci
-	# podofo - we use poppler instead they are exclusive for each other
-	# tiff is a hard dep
-	ECONF_SOURCE="${S}" econf \
-		--includedir="${EPREFIX}/usr/include/${PN}" \
-		--disable-static \
-		--enable-shared \
-		--with-expat \
-		--with-geotiff \
-		--with-grib \
-		--with-libtiff \
-		--with-libz="${EPREFIX}/usr/" \
-		--with-ogr \
-		--without-bsb \
-		--without-dods-root \
-		--without-dwgdirect \
-		--without-epsilon \
-		--without-fme \
-		--without-grass \
-		--without-hdf4 \
-		--without-idb \
-		--without-ingres \
-		--without-jp2mrsid \
-		--without-kakadu \
-		--without-libtool \
-		--without-mrsid \
-		--without-msg \
-		--without-oci \
-		--without-pcraster \
-		--without-podofo \
-		--without-python \
-		--without-sde \
-		$(use_enable debug) \
-		$(use_with armadillo) \
-		$(use_with aux_xml pam) \
-		$(use_with curl) \
-		--without-ecw \
-		$(use_with fits cfitsio) \
-		$(use_with geos) \
-		$(use_with gif) \
-		$(use_with gml xerces) \
-		$(use_with hdf5) \
-		$(use_with jpeg pcidsk) \
-		$(use_with jpeg) \
-		$(use_with jpeg2k jasper) \
-		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
-		$(use_with netcdf) \
-		$(use_with odbc) \
-		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
-		$(use_with opencl) \
-		$(use_with pdf poppler) \
-		$(use_with perl) \
-		$(use_with png) \
-		$(use_with postgres pg) \
-		$(use_with spatialite) \
-		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
-		$(use_with threads) \
-		$(use_with xls freexl) \
-		${myopts}
-
-	# mysql-config puts this in (and boy is it a PITA to get it out)
-	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
-	fi
-}
-
-src_compile() {
-	if use perl; then
-		rm "${S}"/swig/perl/*_wrap.cpp || die
-		emake -C "${S}"/swig/perl generate
-	fi
-
-	# gdal-config needed before generating Python bindings
-	default
-
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-
-	if use python; then
-		rm -f "${S}"swig/python/*_wrap.cpp || die
-		emake -C "${S}"/swig/python generate
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-
-	use doc && emake docs
-}
-
-src_install() {
-	if use perl ; then
-		pushd "${S}"/swig/perl > /dev/null || die
-		perl-module_src_install
-		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
-	fi
-
-	default
-
-	use perl && perl_delete_localpod
-
-	dodoc Doxyfile HOWTO-RELEASE NEWS
-
-	use doc && dohtml html/*
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-	if use python; then
-		pushd "${S}"/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-		newdoc swig/python/README.txt README-python.txt
-		insinto /usr/share/${PN}/samples
-		doins swig/python/samples/*
-	fi
-
-	pushd man/man1 > /dev/null || die
-	for i in * ; do
-		newman ${i} ${i}
-	done
-	popd > /dev/null || die
-}
-
-pkg_postinst() {
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-}
diff --git a/sci-libs/gdal/gdal-2.2.3.ebuild b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
index d9baddecf2b7..764ca26a16fd 100644
--- a/sci-libs/gdal/gdal-2.2.3.ebuild
+++ b/sci-libs/gdal/gdal-2.2.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 
 GENTOO_DEPEND_ON_PERL="no"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
@@ -15,10 +15,11 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.2"
 LICENSE="BSD Info-ZIP MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls"
 
-COMMON_DEPEND="dev-libs/expat
+COMMON_DEPEND="
+	dev-libs/expat
 	dev-libs/json-c:=
 	dev-libs/libpcre
 	dev-libs/libxml2:=
@@ -28,7 +29,7 @@ COMMON_DEPEND="dev-libs/expat
 	armadillo? ( sci-libs/armadillo:=[lapack] )
 	curl? ( net-misc/curl )
 	fits? ( sci-libs/cfitsio:= )
-	geos?   ( >=sci-libs/geos-2.2.1 )
+	geos? ( >=sci-libs/geos-2.2.1 )
 	gif? ( media-libs/giflib:= )
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
@@ -37,7 +38,7 @@ COMMON_DEPEND="dev-libs/expat
 	mdb? ( dev-java/jackcess:1 )
 	mysql? ( virtual/mysql )
 	netcdf? ( sci-libs/netcdf:= )
-	odbc?   ( dev-db/unixODBC )
+	odbc? ( dev-db/unixODBC )
 	ogdi? ( sci-libs/ogdi )
 	opencl? ( virtual/opencl )
 	oracle? ( dev-db/oracle-instantclient:= )
@@ -49,8 +50,8 @@ COMMON_DEPEND="dev-libs/expat
 		${PYTHON_DEPS}
 		dev-python/numpy[${PYTHON_USEDEP}]
 	)
-	sqlite? ( dev-db/sqlite:3 )
 	spatialite? ( dev-db/spatialite )
+	sqlite? ( dev-db/sqlite:3 )
 	webp? ( media-libs/libwebp:= )
 	xls? ( dev-libs/freexl )"
 
@@ -58,61 +59,58 @@ RDEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jre-1.7:* )"
 
 DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	app-shells/bash-completion
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.7:* )
 	perl? ( dev-lang/swig:0 )
-	python? ( dev-lang/swig:0 )"
+	python? (
+		dev-lang/swig:0
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)"
 
-REQUIRED_USE="mdb? ( java )
+REQUIRED_USE="
+	mdb? ( java )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	spatialite? ( sqlite )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.2.3-json-c-0.13.patch" # bug 641658
+	"${FILESDIR}/${P}-soname.patch"
+	"${FILESDIR}/${P}-json-c-0.13.patch" # bug 641658
+	"${FILESDIR}/${P}-bashcomp-path.patch" # bug 641866
 )
 
 src_prepare() {
 	# fix datadir and docdir placement
-	sed -i \
-		-e "s:@datadir@:@datadir@/gdal:" \
+	sed -e "s:@datadir@:@datadir@/gdal:" \
 		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		"${S}"/GDALmake.opt.in || die
+		-i "${S}"/GDALmake.opt.in || die
 
 	# the second sed expression should fix bug 371075
-	sed -i \
-		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
 		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		"${S}"/swig/python/GNUmakefile || die
+		-i "${S}"/swig/python/GNUmakefile || die
 
 	# Fix spatialite/sqlite include issue
-	sed -i \
-		-e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
+	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
+		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
 
 	# Fix freexl configure check
-	sed -i \
-		-e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		configure.ac || die
+	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
+		-i configure.ac || die
 
-	sed \
-		-e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
+	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
 		-i configure.ac || die
 
-	sed \
-		-e 's:^ar:$(AR):g' \
+	sed -e 's:^ar:$(AR):g' \
 		-i ogr/ogrsf_frmts/sdts/install-libs.sh || die
 
 	# updated for newer swig (must specify the path to input files)
-	sed -i \
-		-e "s: gdal_array.i: ../include/gdal_array.i:" \
+	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
 		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	sed -i \
-		-e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
+		-i swig/python/GNUmakefile || die "sed python makefile failed"
+	sed -e "s:library_dirs = :library_dirs = /usr/$(get_libdir):g" \
+		-i swig/python/setup.cfg || die "sed python setup.cfg failed"
 
 	default
 	eautoreconf
@@ -127,7 +125,8 @@ src_configure() {
 		myopts+=(
 			--with-java=$(java-config --jdk-home 2>/dev/null)
 			--with-jvm-lib=dlopen
-			$(use_with mdb))
+			$(use_with mdb)
+		)
 	else
 		myopts+=( --without-java --without-mdb )
 	fi
@@ -212,9 +211,8 @@ src_configure() {
 
 	# mysql-config puts this in (and boy is it a PITA to get it out)
 	if use mysql; then
-		sed -i \
-			-e "s: -rdynamic : :" \
-			GDALmake.opt || die "sed LIBS failed"
+		sed -e "s: -rdynamic : :" \
+			-i GDALmake.opt || die "sed LIBS failed"
 	fi
 }