OpenEXR : bump (#2232)

* OpenEXR : bump

* Cleanup

media-libs/openexr/openexr-2.2.1.recipe

@@ -5,26 +5,25 @@ is used by ILM on all motion pictures currently in production. The first \
 movies to employ OpenEXR were Harry Potter and the Sorcerers Stone, Men in \
 Black II, Gangs of New York, and Signs. Since then, OpenEXR has become ILM's \
 main image file format."
-HOMEPAGE="http://www.openexr.com/"
-COPYRIGHT="2002-2014 Industrial Light & Magic"
+HOMEPAGE="https://www.openexr.com/"
+COPYRIGHT="2002-2017 Industrial Light & Magic"
 LICENSE="BSD (3-clause)"
-REVISION="6"
-SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-$portVersion.tar.gz"
-CHECKSUM_SHA256="36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+REVISION="1"
+SOURCE_URI="https://download.savannah.nongnu.org/releases/openexr/openexr-$portVersion.tar.gz"
+CHECKSUM_SHA256="8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd"
 
 if [ $effectiveTargetArchitecture = "x86_gcc2" ]; then
 	PATCHES="openexr-$portVersion.patchset"
 fi
 
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="23.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	openexr$secondaryArchSuffix = $portVersion
-	lib:libilmimf$secondaryArchSuffix = 22.0.0 compat >= 22
-	lib:libilmimf_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
-	lib:libilmimfutil$secondaryArchSuffix = 22.0.0 compat >= 22
-	lib:libilmimfutil_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
 	cmd:exrenvmap$secondaryArchSuffix = $portVersion
 	cmd:exrheader$secondaryArchSuffix = $portVersion
 	cmd:exrmakepreview$secondaryArchSuffix = $portVersion
@@ -32,23 +31,27 @@ PROVIDES="
 	cmd:exrmultipart$secondaryArchSuffix = $portVersion
 	cmd:exrmultiview$secondaryArchSuffix = $portVersion
 	cmd:exrstdattr$secondaryArchSuffix = $portVersion
+	lib:libilmimf$secondaryArchSuffix = $libVersionCompat
+	lib:libilmimf_2_2$secondaryArchSuffix = $libVersionCompat
+	lib:libilmimfutil$secondaryArchSuffix = $libVersionCompat
+	lib:libilmimfutil_2_2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libhalf$secondaryArchSuffix == 12.0.0
-	lib:libiex_2_2$secondaryArchSuffix == 12.0.0
-	lib:libiexmath_2_2$secondaryArchSuffix == 12.0.0
-	lib:libilmthread_2_2$secondaryArchSuffix == 12.0.0
-	lib:libimath_2_2$secondaryArchSuffix == 12.0.0
+	lib:libhalf$secondaryArchSuffix
+	lib:libiex_2_2$secondaryArchSuffix
+	lib:libiexmath_2_2$secondaryArchSuffix
+	lib:libilmthread_2_2$secondaryArchSuffix
+	lib:libimath_2_2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	openexr${secondaryArchSuffix}_devel = $portVersion
-	devel:libilmimf$secondaryArchSuffix = 22.0.0 compat >= 22
-	devel:libilmimf_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
-	devel:libilmimfutil$secondaryArchSuffix = 22.0.0 compat >= 22
-	devel:libilmimfutil_2_2$secondaryArchSuffix = 22.0.0 compat >= 22
+	devel:libilmimf$secondaryArchSuffix = $libVersionCompat
+	devel:libilmimf_2_2$secondaryArchSuffix = $libVersionCompat
+	devel:libilmimfutil$secondaryArchSuffix = $libVersionCompat
+	devel:libilmimfutil_2_2$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	openexr$secondaryArchSuffix == $portVersion base
@@ -56,23 +59,21 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	ilmbase${secondaryArchSuffix}_devel == $portVersion
-	devel:libhalf$secondaryArchSuffix == 12.0.0
-	devel:libiex$secondaryArchSuffix == 12.0.0
-	devel:libiexMath$secondaryArchSuffix == 12.0.0
-	devel:libilmthread$secondaryArchSuffix == 12.0.0
-	devel:libimath$secondaryArchSuffix == 12.0.0
+	devel:libhalf$secondaryArchSuffix
+	devel:libiex$secondaryArchSuffix
+	devel:libiexMath$secondaryArchSuffix
+	devel:libilmthread$secondaryArchSuffix
+	devel:libimath$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:make
-	cmd:find
-	cmd:which
-	cmd:autoconf
-	cmd:aclocal
 	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"