gentoo resync : 05.02.2020

5 files changed, 213 insertions, 76 deletions

diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index bae5a41ea627..cc3c551cdb12 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -7,9 +7,12 @@ AUX gdal-2.4.1-poppler-0.82.patch 2322 BLAKE2B a07590bdd3d910b6da8e99989f648251d
 AUX gdal-2.4.1-poppler-0.83-1.patch 993 BLAKE2B 8ecf716c8f64c6ee51be6cc8e1ebfe242d5fc2d4b8f5ec2b116c52137bc3bfbec24b7260533f610777f106e8fc5d302828ba615435568342025ba365f68f52e6 SHA512 3ff3f08c18cd9980e947948b19ea229608bbc2e59dba39c40d374d417104155b956e4077c0ef4f0dfd0625c1af54f9cdc19d812345495716c82690f3e2beff2b
 AUX gdal-2.4.1-poppler-0.83-2.patch 1501 BLAKE2B 3b85001fe0e9c01bf97cd94da3ce063c5b43aa5c6e258dbe3f81d6d179fb668597945ac2c5c66a8f84c2235f40a66bd12ebb811d9b5f0d56dcd5d3aa5beeea59 SHA512 953b8f819275f882820e0346617b522d35da4a756ecdb889e3862a7526addcf1794f9d1f9c4fcf70b4876fe20e0b3127827df48fe50d841c07f89a8f6bf9356c
 AUX gdal-2.4.1-swig-4.patch 4239 BLAKE2B d3bfc88aa79fa94015816cd6e620b7520c765379668542dc1fa5c20192898e9e25fcd1a4cc7aed98fca8d07dc1e0a06b6bcd60fa19049af738f061f7537a7129 SHA512 7db4206ce24a35b4b71859310cc4218fd02c3c2900892fc51950d7ddb90b5e743dc42fe4fe545404063ffeb2f0eaa4319f616a200ed3e92723ed04db4300f7c0
+AUX gdal-3.0.2-complete.patch 3533 BLAKE2B 5b62041f4be9f8a846f35f8d54e4cf6eb5d0902a009197d1d994e500a0e23e57149dff28d7baa20817d40db103b37c93b7ab88f54b12f7e2b324dc1d5c6f61e5 SHA512 c7ade447b857977f8949de2d44dde34ab581b11603afbb9f1e2fcaffa65941aa037a69a34b1915d33f1cde6bfec92ff91859b80bfdc06a27cdcc25733c9b60a1
+AUX gdal-3.0.2-datadir.patch 2516 BLAKE2B 5d67889e468cee04f780e9f15cb167d27dbf955db9464155170afdcd2fc72744ab699c8a7de34872b1dd085268f7ee80a54d73397503919955f6898f0b161560 SHA512 327f2a7e6b2d2665153350a6419bec9396b51f6374bcffb8101986f740363b47ae2db9c2fb7b6e3c0f512bdfd502a1abb531be178d27b4138948018cd1564532
 DIST gdal-2.4.1.tar.gz 14546610 BLAKE2B 92404336339c6f46877f3e6599af6fc67a53714888ff66fc0142efa8ddf185ad34d9ec337dcbad67f059041da31e70073a9e41872a7332fd9977552d79fcbc61 SHA512 b25e49f343986af6f37e0bec6dc3084cbcf1a0080da5cfd91d1a58c1d9ffd2ac355299d66534e63e89358cbb15ecd0f2ae934d91bbd2a3749889dadaf266e483
 DIST gdal-2.4.3.tar.gz 14726748 BLAKE2B 104c29912a96b03d0913be40f91a844b2f04f1e972b1ae8764bd277e7d51960b45d4a67a8f9240130de7ce8752f69f4172ca9a54bb11e70635aa55b6c6924cb5 SHA512 e532ce86c92724300ab443c42dd8cec0e74e41411a54d30222f98faa10623b31e616eda44da8f406ed01f3fc3c72c76e8ceb80c1dff733f8efcaa2e2e18132f6
+DIST gdal-3.0.4.tar.gz 14379480 BLAKE2B 1ced7f791608be2ea1aede8705826135a015a3bf376af087b10e0b17a6884c141df4b24654eeac136afd959c1360ce0cf1f1312438093ca305fa38a242d7e364 SHA512 bc5032a123a2cc90145fef8b467a4c9b78ddf7b4d850ceaae8350aacc3f6f23e13dd52219844a2b930b59d000854d3f2cce117643d62ead176b71939f4760ce9
 EBUILD gdal-2.4.1-r1.ebuild 8176 BLAKE2B 0ccaedec2cdd24e0b572483595445ade24d1dada60540137840d4e6947d238ff675dff191aaa6dbb569736721d71f297cb2c7cfcec709a872194f07313dfedd8 SHA512 f8642e106d247e8e5ba7b8d89fbad81cb767655fd6ebcb1ae6f0cabb8b75de83d48108c37d9805cc040861288cb696843dc0e609eff1cea7c0c55f3f769f1b19
-EBUILD gdal-2.4.1-r2.ebuild 8218 BLAKE2B 7e7698933dbbf6044c4fa55eb933664fe3650ed3b64b36e4053efa688870e19bfb41fc17a378c86563147326b295dbce59b13bdd9c5b04e42fb4207f62884704 SHA512 fbf469b9278e075e47b4fb66c472e57f04ce5189b897adf650205dd3566122da6bdcd4c274da44275a6acca9cc95881c2629d6ede197630fd8e1f49880a170be
-EBUILD gdal-2.4.3.ebuild 8094 BLAKE2B c4c019b3ddf2c7cc7da69ee8b701c9c9ba67a863d372d7e417f349527cd364ecfecdcb4a232f726db1849dbf3d954ec2ecb23733de224f95a97bb021acb39144 SHA512 23f1b6fa1129c3f0e95a9f21ed51c928e95e739f34146190a62b14254d7fd812a61fdc62cfb7c5b3d54865b027596fb6e1d67511f61d0b67c31194a05d9b28fa
+EBUILD gdal-2.4.3.ebuild 8091 BLAKE2B a77324f0c7ae3a4d36239af63ab15a366f9969e1b590c3c5d9e37fbe4b9419c4e6c1bab0b284c9932b2b73570d77e07f01f29d27d46d7eabe80a477144d41145 SHA512 18f4314bc98dd44b1b42e863334b6049f2520d6cfed2ad7612efe8562211f927bc33a8f6a9a2bbbc07a8cffa0ced25cb235ff17ea61d46c86c5832c2de0cae9b
+EBUILD gdal-3.0.4.ebuild 7310 BLAKE2B 5507f941cdb6bab04d9d70766fb70f806506bccd71ca13965d3c1b4af007e0d30ad9b9e836297df979a11df161b1580d1f4bff505b4424e04456ca88e9b8a522 SHA512 5dbac49df9b665e3defd56e664f48b429729489b054cd8443388adbeefc689870f095760b50d3417c879d5a2a606bd70a1847e42adcdf2f8c34d58821114449b
 MISC metadata.xml 1420 BLAKE2B 1887e48a94b0d8596913fda0e102c0e23768e1fe9df32f8f0387c5966d9e9b1e0bdd6d06f6d281660494c871d887ed20d4254f1aaa9b23cda9830f7a4810ef00 SHA512 be3a0fdc46e1b022fce052908ce7f43399f1be9d4f4b1cf23e3cca8e43d6280d1f8f820fe1d0ac1d65d2dacde1ddc859c1ce3b8d067e0f6114ab3900abc419eb
diff --git a/sci-libs/gdal/files/gdal-3.0.2-complete.patch b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
new file mode 100644
index 000000000000..5d6716c7280c
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-complete.patch
@@ -0,0 +1,84 @@
+diff --git a/GDALmake.opt.in b/GDALmake.opt.in
+index fd8e8f374d..655c004c56 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -63,6 +63,7 @@ INST_INCLUDE	=	@includedir@
+ INST_DATA 	=	@datadir@
+ INST_LIB	=	@libdir@
+ INST_BIN	=	@bindir@
++INST_BASH_COMPLETION	=	@bashcompdir@
+ INST_PYMOD      =       @pymoddir@
+ INST_DOCS	=	@exec_prefix@/doc
+ INST_MAN	=	@mandir@
+diff --git a/GNUmakefile b/GNUmakefile
+index 92467d6cf6..6d5e7d9fc0 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -229,7 +229,9 @@ endif
+ ifneq ($(BINDINGS),)
+ 	(cd swig; $(MAKE) install)
+ endif
++ifdef INST_BASH_COMPLETION
+ 	(cd scripts; $(MAKE) install)
++endif
+ 	for f in LICENSE.TXT data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
+ 	$(LIBTOOL_FINISH) $(DESTDIR)$(INST_LIB)
+ 	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)/pkgconfig
+diff --git a/configure.ac b/configure.ac
+index 93ddca84d9..5d0e7ab8be 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1187,6 +1187,24 @@ if test "$am_func_iconv" = "yes"; then
+     AC_DEFINE_UNQUOTED(ICONV_CPP_CONST,$ICONV_CPP_CONST, [For.cpp files, define as const if the declaration of iconv() needs const.])
+ fi
+ 
++dnl ---------------------------------------------------------------------------
++dnl Bash completions
++dnl ---------------------------------------------------------------------------
++
++AC_ARG_WITH([bash-completion],
++  AS_HELP_STRING([--with-bash-completion[=ARG]],
++    [Install Bash completions (ARG=yes or path)]),,)
++
++if test "x$with_bash_completion" = "xno" -o "x$with_bash_completion" = "x"; then
++  AC_MSG_NOTICE([Bash completions not requested])
++elif test "x$with_bash_completion" = "xyes"; then
++  PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], ,
++    bashcompdir="${sysconfdir}/bash_completion.d")
++  AC_SUBST(bashcompdir)
++else
++  AC_SUBST(bashcompdir, $with_bash_completion)
++fi
++
+ dnl ---------------------------------------------------------------------------
+ dnl PROJ.6 related stuff
+ dnl ---------------------------------------------------------------------------
+diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile
+index 8f039e469a..511fbb499c 100644
+--- a/scripts/GNUmakefile
++++ b/scripts/GNUmakefile
+@@ -1,10 +1,20 @@
+ include  ../GDALmake.opt
+ 
++PROGRAMS := gdal2tiles.py gdal2xyz.py gdaladdo gdalbuildvrt gdal_calc.py \
++            gdalchksum.py gdalcompare.py gdal-config gdal_contour gdaldem \
++            gdal_edit.py gdalenhance gdal_fillnodata.py gdal_grid \
++            gdalident.py gdalimport.py gdallocationinfo gdalmanage \
++            gdal_merge.py gdalmove.py gdal_polygonize.py gdal_proximity.py \
++            gdal_rasterize gdal_retile.py gdalserver gdal_sieve.py \
++            gdalsrsinfo gdaltindex gdaltransform gdal_translate gdalwarp \
++            ogr2ogr ogrinfo ogrlineref ogrmerge.py ogrtindex
++
+ completion:
+ 	PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
+ 
+ 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`; \
+-	fi
++	$(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
++	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
++	for p in $(PROGRAMS); do \
++		ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
++	done
diff --git a/sci-libs/gdal/files/gdal-3.0.2-datadir.patch b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
new file mode 100644
index 000000000000..95c525ca1b8e
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-3.0.2-datadir.patch
@@ -0,0 +1,69 @@
+diff --git a/gdal/GDALmake.opt.in b/gdal/GDALmake.opt.in
+index 655c004c56..7d8f3708d6 100644
+--- a/GDALmake.opt.in
++++ b/GDALmake.opt.in
+@@ -56,18 +56,23 @@ GNM_ENABLED = @GNM_ENABLED@
+ OSX_FRAMEWORK_PREFIX = /Library/Frameworks/GDAL.framework
+ OSX_VERSION_FRAMEWORK_PREFIX = ${OSX_FRAMEWORK_PREFIX}/Versions/@GDAL_VERSION_MAJOR@.@GDAL_VERSION_MINOR@
+ 
++PACKAGE = @PACKAGE@
++
+ prefix		=	@prefix@
+ exec_prefix	=	@exec_prefix@
++datarootdir	=	@datarootdir@
++docdir	=	@docdir@
++htmldir	=	@htmldir@
+ INST_PREFIX	=	@exec_prefix@
+ INST_INCLUDE	=	@includedir@
+-INST_DATA 	=	@datadir@
++INST_DATA 	=	@datadir@/gdal
+ INST_LIB	=	@libdir@
+ INST_BIN	=	@bindir@
+ INST_BASH_COMPLETION	=	@bashcompdir@
+ INST_PYMOD      =       @pymoddir@
+-INST_DOCS	=	@exec_prefix@/doc
++INST_DOCS	=	@htmldir@
+ INST_MAN	=	@mandir@
+-INST_HTML	=	$(HOME)/www/gdal
++INST_WEB	=	$(HOME)/www/gdal
+ 
+ CPPFLAGS	:= @CPPFLAGS@ -I$(GDAL_ROOT)/port @EXTRA_INCLUDES@ -DGDAL_COMPILATION
+ CFLAGS		= @CFLAGS@ @C_WFLAGS@ $(USER_DEFS)
+diff --git a/gdal/configure.ac b/gdal/configure.ac
+index 5d0e7ab8be..afef88fdbd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,6 +33,7 @@ define([AC_CACHE_SAVE], )
+ 
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(GDALmake.opt.in)
++AC_SUBST(PACKAGE, gdal)
+ AC_CONFIG_MACRO_DIR(m4)
+ AC_CONFIG_HEADERS([port/cpl_config.h:port/cpl_config.h.in])
+ AH_BOTTOM([#include "cpl_config_extras.h"])
+@@ -5167,25 +5168,6 @@ export BINTRUE
+ 
+ AC_SUBST(BINTRUE,$BINTRUE)
+ 
+-dnl ---------------------------------------------------------------------------
+-dnl If datadir is set to @prefix@/share, the modify it to be
+-dnl @prefix@/share/gdal.  I wish we could default this.
+-dnl ---------------------------------------------------------------------------
+-if test "$datadir" = '${prefix}/share' ; then
+-  datadir='${prefix}/share/gdal'
+-fi
+-
+-if test "$datadir" = '${datarootdir}' \
+-     -a "$datarootdir" = '${prefix}/share' ; then
+-  datarootdir='${prefix}/share/gdal'
+-fi
+-
+-dnl ---------------------------------------------------------------------------
+-dnl By default mandir is $datarootdir/man which would be
+-dnl /usr/local/share/gdal/man but we want man pages in /usr/local/man.
+-dnl ---------------------------------------------------------------------------
+-mandir='${prefix}/man'
+-
+ dnl ---------------------------------------------------------------------------
+ dnl Capture GDAL_PREFIX for the cpl_config.h include file.
+ dnl ---------------------------------------------------------------------------
diff --git a/sci-libs/gdal/gdal-2.4.3.ebuild b/sci-libs/gdal/gdal-2.4.3.ebuild
index 0f880af5e68e..b5307ac8396f 100644
--- a/sci-libs/gdal/gdal-2.4.3.ebuild
+++ b/sci-libs/gdal/gdal-2.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 
 SLOT="0/2.3"
 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 lzma mdb mysql netcdf odbc ogdi opencl oracle pdf perl png postgres python spatialite sqlite threads webp xls zstd"
 
 REQUIRED_USE="
diff --git a/sci-libs/gdal/gdal-2.4.1-r2.ebuild b/sci-libs/gdal/gdal-3.0.4.ebuild
index ef434fe5b011..eea42e457437 100644
--- a/sci-libs/gdal/gdal-2.4.1-r2.ebuild
+++ b/sci-libs/gdal/gdal-3.0.4.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 GENTOO_DEPEND_ON_PERL="no"
 PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
-inherit autotools perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
+inherit autotools bash-completion-r1 perl-module distutils-r1 flag-o-matic java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="Translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="https://gdal.org/"
@@ -24,26 +24,32 @@ REQUIRED_USE="
 "
 
 BDEPEND="
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.7:* )
+	java? (
+		dev-java/ant-core
+		dev-lang/swig:0
+		>=virtual/jdk-1.7:*
+	)
 	perl? ( dev-lang/swig:0 )
 	python? (
 		dev-lang/swig:0
 		dev-python/setuptools[${PYTHON_USEDEP}]
-	)"
-
+	)
+"
 DEPEND="
 	dev-libs/expat
 	dev-libs/json-c:=
 	dev-libs/libpcre
-	dev-libs/libxml2:=
-	media-libs/tiff:0=
-	sci-libs/libgeotiff:=
-	sys-libs/zlib:=[minizip(+)]
+	dev-libs/libxml2:2
+	media-libs/tiff
+	>=sci-libs/libgeotiff-1.5.1-r1:=
+	>=sci-libs/proj-6.0.0:=
+	sys-libs/zlib[minizip(+)]
 	armadillo? ( sci-libs/armadillo:=[lapack] )
 	curl? ( net-misc/curl )
 	fits? ( sci-libs/cfitsio:= )
-	geos? ( >=sci-libs/geos-2.2.1 )
+	geos? ( >=sci-libs/geos-3.8.0 )
 	gif? ( media-libs/giflib:= )
 	gml? ( >=dev-libs/xerces-c-3.1 )
 	hdf5? ( >=sci-libs/hdf5-1.6.4:=[szip] )
@@ -72,40 +78,21 @@ DEPEND="
 	sqlite? ( dev-db/sqlite:3 )
 	webp? ( media-libs/libwebp:= )
 	xls? ( dev-libs/freexl )
-	zstd? ( app-arch/zstd:= )"
-
+	zstd? ( app-arch/zstd:= )
+"
 RDEPEND="${DEPEND}
-	java? ( >=virtual/jre-1.7:* )"
+	java? ( >=virtual/jre-1.7:* )
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.3-soname.patch"
-	"${FILESDIR}/${PN}-2.2.3-bashcomp-path.patch" # bug 641866
 	"${FILESDIR}/${PN}-2.3.0-curl.patch" # bug 659840
-	"${FILESDIR}/${P}-poppler-0.75.patch"
-	"${FILESDIR}/${P}-poppler-0.76.patch"
-	"${FILESDIR}/${P}-swig-4.patch" # bug 689110
-	"${FILESDIR}/${P}-poppler-0.82.patch"
-	"${FILESDIR}"/${P}-poppler-0.83-{1,2}.patch # bug 703790
+	"${FILESDIR}/${PN}-3.0.2-complete.patch"
+	"${FILESDIR}/${PN}-3.0.2-datadir.patch"
 )
 
 src_prepare() {
-	# fix datadir and docdir placement
-	sed -e "s:@datadir@:@datadir@/gdal:" \
-		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-		-i "${S}"/GDALmake.opt.in || die
-
-	# the second sed expression should fix bug 371075
-	sed -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
-		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
-		-i "${S}"/swig/python/GNUmakefile || die
-
-	# Fix spatialite/sqlite include issue
-	sed -e 's:spatialite/sqlite3.h:sqlite3.h:g' \
-		-i ogr/ogrsf_frmts/sqlite/ogr_sqlite.h || die
-
-	# Fix freexl configure check
-	sed -e 's:FREEXL_LIBS=missing):FREEXL_LIBS=missing,-lm):g' \
-		-i configure.ac || die
+	default
 
 	sed -e "s: /usr/: \"${EPREFIX}\"/usr/:g" \
 		-i configure.ac || die
@@ -113,22 +100,14 @@ src_prepare() {
 	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)
+	# SWIG: Use of the include path to find the input file is deprecated and will not work with ccache.
 	sed -e "s: gdal_array.i: ../include/gdal_array.i:" \
-		-e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
 		-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
 }
 
 src_configure() {
-	# bug 619148
-	append-cxxflags -std=c++14
-
 	local myconf=(
 		# charls - not packaged in Gentoo ebuild repository
 		# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
@@ -138,20 +117,24 @@ src_configure() {
 		# podofo - we use poppler instead they are exclusive for each other
 		# tiff is a hard dep
 		--includedir="${EPREFIX}"/usr/include/${PN}
-		--disable-pdf-plugin
+		--disable-lto
 		--disable-static
+		--disable-driver-bsb
+		--disable-driver-mrf
+		--disable-pdf-plugin
 		--enable-shared
-		--with-expat
+		--enable-driver-grib
+		--with-bash-completion="$(get_bashcompdir)"
+		--with-cpp14
 		--with-cryptopp=no
+		--with-expat
 		--with-geotiff
-		--with-grib
+		--with-gnm
 		--with-hide-internal-symbols
 		--with-libjson-c="${EPREFIX}"/usr/
 		--with-libtiff
 		--with-libtool
 		--with-libz="${EPREFIX}"/usr/
-		--with-gnm
-		--without-bsb
 		--without-charls
 		--without-dods-root
 		--without-ecw
@@ -173,18 +156,18 @@ src_configure() {
 		--without-mrsid
 		--without-mrsid_lidar
 		--without-msg
-		--without-mrf
 		--without-rasdaman
 		--without-rasterlite2
 		--without-pcraster
 		--without-pdfium
+		--without-perl
 		--without-podofo
+		--without-python
 		--without-qhull
 		--without-sde
 		--without-sfcgal
 		--without-sosi
 		--without-teigha
-		--disable-lto
 		$(use_enable debug)
 		$(use_with armadillo)
 		$(use_with aux-xml pam)
@@ -194,7 +177,7 @@ src_configure() {
 		$(use_with gif)
 		$(use_with gml xerces)
 		$(use_with hdf5)
-		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library yreleased developer by gdal
+		$(use_with jpeg pcidsk) # pcidsk is internal, because there is no such library released developer by gdal
 		$(use_with jpeg)
 		$(use_with jpeg2k openjpeg)
 		$(use_with lzma liblzma)
@@ -205,10 +188,8 @@ src_configure() {
 		$(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 python)
 		$(use_with spatialite)
 		$(use_with sqlite sqlite3 "${EPREFIX}"/usr)
 		$(use_with threads)
@@ -258,7 +239,13 @@ src_compile() {
 	# gdal-config needed before generating Python bindings
 	default
 
-	if use perl ; then
+	if use java; then
+		pushd "${S}"/swig/java > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+
+	if use perl; then
 		pushd "${S}"/swig/perl > /dev/null || die
 		perl-module_src_configure
 		perl-module_src_compile
@@ -277,27 +264,21 @@ src_compile() {
 }
 
 src_install() {
-	if use perl ; then
+	local DOCS=( NEWS )
+	use doc && local HTML_DOCS=( html/. )
+
+	default
+
+	use java && java-pkg_dojar "${S}"/swig/java/gdal.jar
+
+	if use perl; then
 		pushd "${S}"/swig/perl > /dev/null || die
 		myinst=( DESTDIR="${D}" )
 		perl-module_src_install
 		popd > /dev/null || die
-		sed -e 's:BINDINGS        =       \(.*\) perl:BINDINGS        =       \1:g' \
-			-i GDALmake.opt || die
+		perl_delete_localpod
 	fi
 
-	use perl && perl_delete_localpod
-
-	local DOCS=( Doxyfile HOWTO-RELEASE NEWS )
-	use doc && HTML_DOCS=( html/. )
-
-	default
-
-	python_install() {
-		distutils-r1_python_install
-		python_doscript scripts/*.py
-	}
-
 	if use python; then
 		# Don't clash with gdal's docs
 		unset DOCS HTML_DOCS
@@ -306,10 +287,10 @@ src_install() {
 		distutils-r1_src_install
 		popd > /dev/null || die
 
-		newdoc swig/python/README.txt README-python.txt
+		newdoc swig/python/README.rst README-python.rst
 
 		insinto /usr/share/${PN}/samples
-		doins -r swig/python/samples/
+		doins -r swig/python/samples/.
 	fi
 
 	doman "${S}"/man/man*/*