gentoo resync : 04.07.2020

3 files changed, 221 insertions, 3 deletions

diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 31bc603860ea..e6c75520cef4 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,5 @@
+AUX ilmbase-2.3.0-fix-bashisms.patch 8531 BLAKE2B e21eb0c1d2ec002867048923f94f6521d9f247854febbc35eb1ba8720491a9f46fff899d68719b3b542524cccf21adae6267703801faa65542c2b93c7d588d40 SHA512 972285da78ad70c9efa6b1477621fc3f73270711a5ffa40cd1d11762f83e846716782124eb9a38adf1b99f6edc5858a66648e7ab8c54946f15b7b93aa19f8f7b
 AUX ilmbase-2.3.0-testBox.patch 2826 BLAKE2B ddafd231e641cd518ca864e6aa27f88b24b81f1bed29fe05fe79accc033484479e891482529ead24ddc2b1b931d808eb20a6b960f7281da83357b637c3d937ca SHA512 81eb09823fed3841742ef8b85b262d9d6fbce97ae87fdc5e902c4d85c7f8c7a01b7be08acac23fee5c5cfdb8815f410b200f2af4039ade0cedd31866312015db
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-EBUILD ilmbase-2.3.0.ebuild 999 BLAKE2B 229bd39fe805117717cba562b0261d1b5e4d235ed2f6b77bb34ee395c25cce9cf73481e467e945444e3e6297dd0e009e09e74778dcd7ce22ad248481da7dea7d SHA512 9b026e21e2554d5ae0d7d4de73bac8c993737c5ebfd2c0d7efa92873cea37015f2decf195323d1dce927766850e262878f4833bfc695fd4793fd45ce45e73332
+EBUILD ilmbase-2.3.0.ebuild 1046 BLAKE2B bc325b9ab9c6d00ba9602f376ddad08034e09124362fd2a2e24ff7aa9ebc3d826d2fd32408f36983696c8a2305def61667d928b9637229aa18ae65b1bc9bf19b SHA512 2b55b35fd05331d8847946b2253ef7467a1b8f1de06dc4966c1a8da02be05f7eb6e91ff6a651f0d28af74955793bd18ec692fd384b5869e7f752f55eede39290
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
new file mode 100644
index 000000000000..214285293910
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
@@ -0,0 +1,214 @@
+--- a/configure
++++ b/configure
+@@ -15253,7 +15253,7 @@ else
+ fi
+ 
+ 
+-if test "${cxxstd}" == 17 ; then
++if test "${cxxstd}" = 17 ; then
+       ax_cxx_compile_alternatives="17 1z"    ax_cxx_compile_cxx17_required=true
+   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not
+ 
+ 	CXXFLAGS="$CXXFLAGS -std=c++17"
+ else
+-  if test "${cxxstd}" == 14 ; then
++  if test "${cxxstd}" = 14 ; then
+         ax_cxx_compile_alternatives="14 1y"    ax_cxx_compile_cxx14_required=true
+   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde
+ 
+   	CXXFLAGS="$CXXFLAGS -std=c++14"
+   else
+-    if test "${cxxstd}" == 11 ; then
++    if test "${cxxstd}" = 11 ; then
+         ax_cxx_compile_alternatives="11 0x"    ax_cxx_compile_cxx11_required=true
+   ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde
+ 
+       CXXFLAGS="$CXXFLAGS -std=c++11"
+     else
+-      if test "${cxxstd}" == 03 ; then
++      if test "${cxxstd}" = 03 ; then
+         $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h
+ 
+         CXXFLAGS="$CXXFLAGS -std=c++03"
+@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5
+ $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;}
+ 
+-        if test "$HAVE_CXX14" == 1 ; then
++        if test "$HAVE_CXX14" = 1 ; then
+   	      CXXFLAGS="$CXXFLAGS -std=c++14"
+           cxxstd = 14
+         else
+-          if test "$HAVE_CXX11" == 1 ; then
++          if test "$HAVE_CXX11" = 1 ; then
+   	        CXXFLAGS="$CXXFLAGS -std=c++11"
+             cxxstd = 11
+           fi
+@@ -22768,7 +22768,7 @@ LIB_SUFFIX=""
+ lib_suffix_valid="no"
+ 
+ lib_namespace=""
+-if test "x${library_namespace_versioning}" == xyes ; then
++if test "x${library_namespace_versioning}" = xyes ; then
+     cat >>confdefs.h <<_ACEOF
+ #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
+ _ACEOF
+@@ -22787,7 +22787,7 @@ _ACEOF
+     lib_namespace="${ILMBASE_VERSION_API}"
+     LIB_SUFFIX="${ILMBASE_VERSION_API}"
+     lib_suffix_valid="yes"
+-elif test "x${library_namespace_versioning}" == xno ; then
++elif test "x${library_namespace_versioning}" = xno ; then
+     cat >>confdefs.h <<_ACEOF
+ #define IMATH_INTERNAL_NAMESPACE Imath
+ _ACEOF
+@@ -22823,7 +22823,7 @@ _ACEOF
+ fi
+ 
+ 
+-if test "x${lib_suffix_valid}" == xyes ; then
++if test "x${lib_suffix_valid}" = xyes ; then
+ LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
+ 
+  if true; then
+@@ -22858,7 +22858,7 @@ else
+ fi
+ 
+ 
+-if test "x${custom_public_namespace}" == xyes ; then
++if test "x${custom_public_namespace}" = xyes ; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5
+ $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;}
+     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
+@@ -22870,7 +22870,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
+ 
+     public_namespace=""
+     custom_public_namespace=no
+-elif test "x${custom_public_namespace}" == xno ; then
++elif test "x${custom_public_namespace}" = xno ; then
+     $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
+ 
+     $as_echo "#define IEX_NAMESPACE Iex" >>confdefs.h
+@@ -22912,12 +22912,11 @@ fi
+ 
+ 
+   if test "${osx_arch}" != default ; then
+-          osx_arch_flags="-arch ${osx_arch// / -arch }"
++     osx_arch_flags=$(printf ' -arch %s' ${osx_arch})
+      CXXFLAGS="$CXXFLAGS $osx_arch_flags"
+ 
+           if test "$enable_dependency_tracking" != no ; then
+-        osx_arch_array=( ${osx_arch} )
+-        if test ${#osx_arch_array[@]} -gt 1 ; then
++	if echo "$osx_arch" | grep >/dev/null " " ; then
+           as_fn_error $? "building multiple OS X architectures requires --disable-dependency-tracking.
+ Please re-run configure with these options:
+   --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,19 +45,19 @@ AC_ARG_ENABLE(cxxstd,
+                              [enable ISO c++ standard 11/14 [[default=auto]]]),
+               [cxxstd="${enableval}"], [cxxstd=14])
+ 
+-if test "${cxxstd}" == 17 ; then
++if test "${cxxstd}" = 17 ; then
+     AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
+ 	CXXFLAGS="$CXXFLAGS -std=c++17"
+ else
+-  if test "${cxxstd}" == 14 ; then
++  if test "${cxxstd}" = 14 ; then
+       AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
+   	CXXFLAGS="$CXXFLAGS -std=c++14"
+   else
+-    if test "${cxxstd}" == 11 ; then
++    if test "${cxxstd}" = 11 ; then
+       AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+       CXXFLAGS="$CXXFLAGS -std=c++11"
+     else
+-      if test "${cxxstd}" == 03 ; then
++      if test "${cxxstd}" = 03 ; then
+         AC_DEFINE(ILMBASE_FORCE_CXX03)
+         CXXFLAGS="$CXXFLAGS -std=c++03"
+       else
+@@ -65,11 +65,11 @@ else
+         AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
+         AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
+         AX_CXX_COMPILE_STDCXX([17], [noext], [optional])
+-        if test "$HAVE_CXX14" == 1 ; then
++        if test "$HAVE_CXX14" = 1 ; then
+   	      CXXFLAGS="$CXXFLAGS -std=c++14"
+           cxxstd = 14
+         else
+-          if test "$HAVE_CXX11" == 1 ; then
++          if test "$HAVE_CXX11" = 1 ; then
+   	        CXXFLAGS="$CXXFLAGS -std=c++11"
+             cxxstd = 11
+           fi
+@@ -212,7 +212,7 @@ lib_suffix_valid="no"
+ dnl Internal library namespace
+ dnl 
+ lib_namespace=""
+-if test "x${library_namespace_versioning}" == xyes ; then
++if test "x${library_namespace_versioning}" = xyes ; then
+     AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE,     Imath_${ILMBASE_VERSION_API})
+     AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE,       Iex_${ILMBASE_VERSION_API})
+     AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread_${ILMBASE_VERSION_API})
+@@ -221,7 +221,7 @@ if test "x${library_namespace_versioning
+     lib_namespace="${ILMBASE_VERSION_API}"
+     LIB_SUFFIX="${ILMBASE_VERSION_API}"
+     lib_suffix_valid="yes"
+-elif test "x${library_namespace_versioning}" == xno ; then
++elif test "x${library_namespace_versioning}" = xno ; then
+     AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE,     Imath)
+     AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE,       Iex)
+     AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread)
+@@ -238,7 +238,7 @@ else
+ fi
+ AC_SUBST(LIB_SUFFIX)
+ 
+-if test "x${lib_suffix_valid}" == xyes ; then
++if test "x${lib_suffix_valid}" = xyes ; then
+ AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}")
+ AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true)
+ else
+@@ -257,7 +257,7 @@ AC_ARG_ENABLE(customusernamespace,
+         [custom_public_namespace="${enableval}"], 
+         [custom_public_namespace=no])
+ 
+-if test "x${custom_public_namespace}" == xyes ; then
++if test "x${custom_public_namespace}" = xyes ; then
+     AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to default])
+     AC_DEFINE(IMATH_NAMESPACE,     Imath)
+     AC_DEFINE(IEX_NAMESPACE,       Iex)
+@@ -265,7 +265,7 @@ if test "x${custom_public_namespace}" ==
+ 
+     public_namespace=""
+     custom_public_namespace=no
+-elif test "x${custom_public_namespace}" == xno ; then
++elif test "x${custom_public_namespace}" = xno ; then
+     AC_DEFINE(IMATH_NAMESPACE,     Imath)
+     AC_DEFINE(IEX_NAMESPACE,       Iex)
+     AC_DEFINE(ILMTHREAD_NAMESPACE, IlmThread)
+@@ -296,14 +296,12 @@ case "$host" in
+ 	      [osx_arch="${enableval}"], [osx_arch=default])
+ 
+   if test "${osx_arch}" != default ; then
+-     dnl Replace "a b c" with "-arch a -arch b -arch c". Should probably use an all-whitespace regexp rather than a single character for the search string.
+-     osx_arch_flags="-arch ${osx_arch// / -arch }"
++     osx_arch_flags=$(printf ' -arch %s' ${osx_arch})
+      CXXFLAGS="$CXXFLAGS $osx_arch_flags"
+ 
+      dnl If multiple archs specified, make sure that --disable-dependency-tracking was also specified
+      if test "$enable_dependency_tracking" != no ; then
+-        osx_arch_array=( ${osx_arch} )
+-        if test ${#osx_arch_array[@]} -gt 1 ; then
++	if echo "$osx_arch" | grep >/dev/null " " ; then
+           AC_MSG_ERROR([building multiple OS X architectures requires --disable-dependency-tracking.
+ Please re-run configure with these options:
+   --enable-osx-arch="${osx_arch}" --disable-dependency-tracking
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
index 8e86f6eadb1b..e994e236f280 100644
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.3.0.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=6
@@ -15,7 +15,10 @@ IUSE="static-libs"
 
 DEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.3.0-testBox.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0-testBox.patch
+	"${FILESDIR}"/${PN}-2.3.0-fix-bashisms.patch
+)
 
 DOCS=( AUTHORS ChangeLog NEWS README.md )
 MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )