Remove support for sci-libs/libecwj2, which is going away. Bug 526840

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

6 files changed, 18 insertions, 20 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index e458ce565262..2ce82c0cfd45 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.156 2014/12/28 16:52:40 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.157 2014/12/31 14:08:12 dilfridge Exp $
+
+  31 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org> gdal-1.9.2.ebuild,
+  gdal-1.10.0-r1.ebuild, gdal-1.10.1.ebuild, gdal-1.11.1-r1.ebuild,
+  metadata.xml:
+  Remove support for sci-libs/libecwj2, which is going away. Bug 526840
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> gdal-1.9.2.ebuild,
   gdal-1.10.0-r1.ebuild, gdal-1.10.1.ebuild, gdal-1.11.1-r1.ebuild:
diff --git a/sci-libs/gdal/gdal-1.10.0-r1.ebuild b/sci-libs/gdal/gdal-1.10.0-r1.ebuild
index a426ab7ac827..78d93727f98d 100644
--- a/sci-libs/gdal/gdal-1.10.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.10.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.0-r1.ebuild,v 1.6 2014/12/28 16:52:40 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.0-r1.ebuild,v 1.7 2014/12/31 14:08:12 dilfridge Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
 
 RDEPEND="
 	dev-libs/expat
@@ -26,7 +26,6 @@ RDEPEND="
 	|| ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] )
 	armadillo? ( sci-libs/armadillo[lapack] )
 	curl? ( net-misc/curl )
-	ecwj2k? ( sci-libs/libecwj2 )
 	fits? ( sci-libs/cfitsio )
 	geos?   ( >=sci-libs/geos-2.2.1 )
 	gif? ( media-libs/giflib )
@@ -190,7 +189,7 @@ src_configure() {
 		$(use_with gif) \
 		$(use_with hdf5) \
 		$(use_with jpeg2k jasper) \
-		$(use_with ecwj2k ecw) \
+		--without-ecw \
 		$(use_with gml xerces) \
 		$(use_with odbc) \
 		$(use_with opencl) \
diff --git a/sci-libs/gdal/gdal-1.10.1.ebuild b/sci-libs/gdal/gdal-1.10.1.ebuild
index b9d28f6d5807..51af0f1bcecb 100644
--- a/sci-libs/gdal/gdal-1.10.1.ebuild
+++ b/sci-libs/gdal/gdal-1.10.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.12 2014/12/28 16:52:40 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.10.1.ebuild,v 1.13 2014/12/31 14:08:12 dilfridge Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
+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 ruby spatialite sqlite threads xls"
 
 RDEPEND="
 	dev-libs/expat
@@ -30,7 +30,6 @@ RDEPEND="
 	sys-libs/zlib[minizip(+)]
 	armadillo? ( sci-libs/armadillo[lapack] )
 	curl? ( net-misc/curl )
-	ecwj2k? ( sci-libs/libecwj2 )
 	fits? ( sci-libs/cfitsio )
 	geos?   ( >=sci-libs/geos-2.2.1 )
 	gif? ( media-libs/giflib )
@@ -71,7 +70,6 @@ AT_M4DIR="${S}/m4"
 MAKEOPTS+=" -j1"
 
 REQUIRED_USE="
-	ecwj2k? ( threads )
 	spatialite? ( sqlite )
 	mdb? ( java )
 "
@@ -201,7 +199,7 @@ gdal_src_configure() {
 		$(use_with armadillo) \
 		$(use_with aux_xml pam) \
 		$(use_with curl) \
-		$(use_with ecwj2k ecw) \
+		--without-ecw \
 		$(use_with fits cfitsio) \
 		$(use_with geos) \
 		$(use_with gif) \
diff --git a/sci-libs/gdal/gdal-1.11.1-r1.ebuild b/sci-libs/gdal/gdal-1.11.1-r1.ebuild
index 48a8b6acf963..8618bd9e51ad 100644
--- a/sci-libs/gdal/gdal-1.11.1-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.11.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r1.ebuild,v 1.5 2014/12/28 16:52:40 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.11.1-r1.ebuild,v 1.6 2014/12/31 14:08:12 dilfridge Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ SRC_URI="http://download.osgeo.org/${PN}/${PV}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc ogdi opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
+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 ruby spatialite sqlite threads xls"
 
 RDEPEND="
 	dev-libs/expat
@@ -31,7 +31,6 @@ RDEPEND="
 	sys-libs/zlib[minizip(+)]
 	armadillo? ( sci-libs/armadillo[lapack] )
 	curl? ( net-misc/curl )
-	ecwj2k? ( sci-libs/libecwj2 )
 	fits? ( sci-libs/cfitsio )
 	geos?   ( >=sci-libs/geos-2.2.1 )
 	gif? ( media-libs/giflib )
@@ -72,7 +71,6 @@ AT_M4DIR="${S}/m4"
 MAKEOPTS+=" -j1"
 
 REQUIRED_USE="
-	ecwj2k? ( threads )
 	spatialite? ( sqlite )
 	mdb? ( java )
 "
@@ -203,7 +201,7 @@ gdal_src_configure() {
 		$(use_with armadillo) \
 		$(use_with aux_xml pam) \
 		$(use_with curl) \
-		$(use_with ecwj2k ecw) \
+		--without-ecw \
 		$(use_with fits cfitsio) \
 		$(use_with geos) \
 		$(use_with gif) \
diff --git a/sci-libs/gdal/gdal-1.9.2.ebuild b/sci-libs/gdal/gdal-1.9.2.ebuild
index 1357cd4a632a..9bbb710531b4 100644
--- a/sci-libs/gdal/gdal-1.9.2.ebuild
+++ b/sci-libs/gdal/gdal-1.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.2.ebuild,v 1.10 2014/12/28 16:52:40 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.9.2.ebuild,v 1.11 2014/12/31 14:08:12 dilfridge Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="armadillo +aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
+IUSE="armadillo +aux_xml curl debug doc fits geos gif gml hdf5 java jpeg jpeg2k mdb mysql netcdf odbc opencl pdf perl png postgres python ruby spatialite sqlite threads xls"
 
 RDEPEND="
 	dev-libs/expat
@@ -26,7 +26,6 @@ RDEPEND="
 	|| ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] )
 	armadillo? ( sci-libs/armadillo[lapack] )
 	curl? ( net-misc/curl )
-	ecwj2k? ( sci-libs/libecwj2 )
 	fits? ( sci-libs/cfitsio )
 	geos?   ( >=sci-libs/geos-2.2.1 )
 	gif? ( media-libs/giflib )
@@ -191,7 +190,7 @@ src_configure() {
 		$(use_with gif) \
 		$(use_with hdf5) \
 		$(use_with jpeg2k jasper) \
-		$(use_with ecwj2k ecw) \
+		--without-ecw \
 		$(use_with gml xerces) \
 		$(use_with odbc) \
 		$(use_with opencl) \
diff --git a/sci-libs/gdal/metadata.xml b/sci-libs/gdal/metadata.xml
index 8e988cf84477..943ca9393804 100644
--- a/sci-libs/gdal/metadata.xml
+++ b/sci-libs/gdal/metadata.xml
@@ -10,7 +10,6 @@ vector data).
   <use>
     <flag name="armadillo">Use <pkg>sci-libs/armadillo</pkg> for faster TPS transform computation</flag>
     <flag name="aux_xml">Enable Portable Auxilliary Metadata generation</flag>
-    <flag name="ecwj2k">Enable support for alternate jpeg2k library <pkg>sci-libs/libecwj2</pkg></flag>
     <flag name="fits">Enable support for NASA's <pkg>sci-libs/cfitsio</pkg> library</flag>
     <flag name="geos">Add support for geometry engine (<pkg>sci-libs/geos</pkg>)</flag>
     <flag name="gml">Enable support for <pkg>dev-libs/xerces-c</pkg> C++ API</flag>