diff --git a/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch b/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
new file mode 100644
index 0000000000000..4f4e80b84f9b2
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.11-swig-3.0.6.patch
@@ -0,0 +1,22 @@
+--- gdal/swig/include/python/ogr_python.i
++++ gdal/swig/include/python/ogr_python.i
+@@ -67,7 +67,7 @@
+     def __getitem__(self, value):
+         """Support dictionary, list, and slice -like access to the datasource.
+-ds[0] would return the first layer on the datasource.
+-ds['aname'] would return the layer named "aname".
+-ds[0:4] would return a list of the first four layers."""
++        ds[0] would return the first layer on the datasource.
++        ds['aname'] would return the layer named "aname".
++        ds[0:4] would return a list of the first four layers."""
+         if isinstance(value, slice):
+             output = []
+@@ -135,6 +135,6 @@
+     def __getitem__(self, value):
+         """Support list and slice -like access to the layer.
+-layer[0] would return the first feature on the layer.
+-layer[0:4] would return a list of the first four features."""
++        layer[0] would return the first feature on the layer.
++        layer[0:4] would return a list of the first four features."""
+         if isinstance(value, slice):
+             import sys
diff --git a/sci-libs/gdal/gdal-1.11.1-r3.ebuild b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
index e244d2713fc8d..8a55b2f89aaeb 100644
--- a/sci-libs/gdal/gdal-1.11.1-r3.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r3.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	xls? ( dev-libs/freexl )
 "
 
-SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
+SWIG_DEP=">=dev-lang/swig-2.0.2"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.6 )
@@ -122,6 +122,9 @@ src_prepare() {
 	# Fix swig-3.0.3 problem (bug #534168)
 	epatch "${FILESDIR}"/${PN}-1.11.1-swig-3.0.3.patch
 
+	# Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
+	epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
+
 	# bug 540132
 	epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
 
diff --git a/sci-libs/gdal/gdal-1.11.2.ebuild b/sci-libs/gdal/gdal-1.11.2.ebuild
index 3a3e22fbaab8e..985f716e6f1db 100644
--- a/sci-libs/gdal/gdal-1.11.2.ebuild
+++ b/sci-libs/gdal/gdal-1.11.2.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	xls? ( dev-libs/freexl )
 "
 
-SWIG_DEP=">=dev-lang/swig-2.0.2 <=dev-lang/swig-3.0.4"
+SWIG_DEP=">=dev-lang/swig-2.0.2"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	java? ( >=virtual/jdk-1.6 )
@@ -122,6 +122,9 @@ src_prepare() {
 	# bug 540132
 	epatch "${FILESDIR}"/${PN}-1.11.1-poppler-0.31.0-support.patch
 
+	# Fix swig-3.0.6 problem, https://trac.osgeo.org/gdal/ticket/6045
+	epatch "${FILESDIR}"/${PN}-1.11-swig-3.0.6.patch
+
 	tc-export AR RANLIB
 
 	eautoreconf