gdal: bump version.

move tools in $prefix/bin for x86 secondary arch.

sci-libs/gdal/gdal-3.0.2.recipe

@@ -120,16 +120,19 @@ LICENSE="MIT
 	GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://download.osgeo.org/gdal/$portVersion/gdal-$portVersion.tar.xz"
-CHECKSUM_SHA256="45b4ae25dbd87282d589eca76481c426f72132d7a599556470d5c38263b09266"
+CHECKSUM_SHA256="c3765371ce391715c8f28bd6defbc70b57aa43341f6e94605f04fe3c92468983"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
-if [ $targetArchitecture != x86_gcc2 ]; then
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandSuffix=
 	commandBinDir=$prefix/bin
 fi
 
-libVersion=26.0.1
+libVersion=26.0.2
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
@@ -182,7 +185,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	gdal${secondaryArchSuffix}_devel = $portVersion
-	cmd:gdal_config$secondaryArchSuffix
+	cmd:gdal_config
 	devel:libgdal$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
@@ -227,7 +230,9 @@ BUILD()
 	export LDFLAGS="-lnetwork"
 	expatDir=$portPackageLinksDir/lib~libexpat
 	autoreconf -fi
-	runConfigure ./configure --with-expat=$expatDir
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--with-expat=$expatDir
 	make $jobArgs
 }
 
@@ -243,6 +248,6 @@ INSTALL()
 
 	# devel package
 	packageEntries devel \
-		$binDir/gdal-config \
+		$commandBinDir/gdal-config \
 		$developDir
 }