cmake, libjpeg-turbo: upgraded packages to upstream
Upgraded dev-util/cmake to version 3.18.5 for all
Upgraded media-libs/libjpeg-turbo to version 2.1.0-r2 for all
BUG=b:192088237
TEST=emerge-volteer libjpeg_turbo
Change-Id: I951a7a535c4b9061c95e0687589a3652c36ac5fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2992185
Tested-by: Ricky Liang <jcliang@chromium.org>
Reviewed-by: Shik Chen <shik@chromium.org>
Commit-Queue: Ricky Liang <jcliang@chromium.org>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 09fab65..1d26d13 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1 +1 @@
-DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
+DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
similarity index 68%
rename from dev-util/cmake/cmake-3.14.3.ebuild
rename to dev-util/cmake/cmake-3.18.5.ebuild
index 48beb8d..29afdf8 100644
--- a/dev-util/cmake/cmake-3.14.3.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -1,40 +1,42 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 3.19, see commit 491dddfb; bug #596460
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+ toolchain-funcs virtualx xdg-utils
MY_P="${P/_/-}"
DESCRIPTION="Cross platform Make"
HOMEPAGE="https://cmake.org/"
-SRC_URI="https://cmake.org/files/v3.14/${MY_P}.tar.gz"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
KEYWORDS="*"
-IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
RDEPEND="
+ >=app-arch/libarchive-3.3.3:=
app-crypt/rhash
- >=app-arch/libarchive-3.0.0:=
>=dev-libs/expat-2.0.1
+ >=dev-libs/jsoncpp-1.9.2-r2:0=
>=dev-libs/libuv-1.10.0:=
>=net-misc/curl-7.21.5[ssl]
sys-libs/zlib
virtual/pkgconfig
- emacs? ( virtual/emacs )
+ emacs? ( >=app-editors/emacs-23.1:* )
ncurses? ( sys-libs/ncurses:0= )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -42,6 +44,7 @@
dev-python/requests
dev-python/sphinx
)
+ test? ( app-arch/libarchive[zstd] )
"
S="${WORKDIR}/${MY_P}"
@@ -50,35 +53,27 @@
PATCHES=(
# prefix
- "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+ "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
# Next patch requires new work from prefix people
#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
# handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
# respect python eclasses
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+ "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
# upstream fixes (can usually be removed with a version bump)
)
cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
- if [[ $? -eq 0 ]] ; then
- par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # disable running of cmake in boostrap command
+ # disable running of cmake in bootstrap command
sed -i \
-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
bootstrap || die "sed failed"
@@ -89,19 +84,17 @@
Source/kwsys/CMakeLists.txt || die
fi
- tc-export CC CXX LD
-
# bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
+ tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
--prefix="${T}/cmakestrap/" \
- ${par_arg} \
+ --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
|| die "Bootstrap failed"
}
cmake_src_test() {
# fix OutDir and SelectLibraryConfigurations tests
# these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
+ sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
|| die
@@ -111,27 +104,30 @@
[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
# Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
+ # BootstrapTest: we actually bootstrap it every time so why test it.
# BundleUtilities: bundle creation broken
# CMakeOnly.AllFindModules: pthread issues
- # CTest.updatecvs: which fails to commit as root
+ # CTest.updatecvs: fails to commit as root
# Fortran: requires fortran
# RunCMake.CompilerLauncher: also requires fortran
# RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
# debugedit binary is not in the expected location
- # TestUpload, which requires network access
+ # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+ # it can't find a deb package that owns libc
+ # RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+ # TestUpload: requires network access
"${BUILD_DIR}"/bin/ctest \
-j "$(makeopts_jobs)" \
--test-load "$(makeopts_loadavg)" \
${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
+ -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
|| die "Tests failed"
popd > /dev/null
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
# disable Xcode hooks, bug #652134
if [[ ${CHOST} == *-darwin* ]] ; then
@@ -145,7 +141,7 @@
-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+ if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
cmake_src_bootstrap
fi
@@ -157,8 +153,6 @@
local mycmakeargs=(
-DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
-DCMAKE_DOC_DIR=/share/doc/${PF}
-DCMAKE_MAN_DIR=/share/man
-DCMAKE_DATA_DIR=/share/${PN}
@@ -167,19 +161,13 @@
-DBUILD_CursesDialog="$(usex ncurses)"
-DBUILD_TESTING=$(usex test)
)
+ use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
- if use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
+ cmake_src_compile
use emacs && elisp-compile Auxiliary/cmake-mode.el
}
@@ -188,7 +176,7 @@
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
if use emacs; then
elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
@@ -205,20 +193,22 @@
doins "${FILESDIR}/${PN}.vim"
dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_preinst() {
- use qt5 && xdg_pkg_preinst
}
pkg_postinst() {
use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postinst
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
}
pkg_postrm() {
use emacs && elisp-site-regen
- use qt5 && xdg_pkg_postrm
+ if use qt5; then
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
}
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-FindBLAS.patch b/dev-util/cmake/files/cmake-3.14.0_rc1-FindBLAS.patch
deleted file mode 100644
index 3a308f5..0000000
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-FindBLAS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 12b2c3ad6a5c5c7f67afe87fec3f81761de0b909 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 10 Feb 2019 22:54:51 +0100
-Subject: [PATCH] Prefer pkgconfig in FindBLAS
-
----
- Modules/FindBLAS.cmake | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
-index 0aa4f5035b..7b67c95f1f 100644
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -7,6 +7,10 @@ FindBLAS
-
- Find BLAS library
-
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed fortran library that implements the
- BLAS linear-algebra interface (see http://www.netlib.org/blas/). The
- list of libraries searched for is taken from the autoconf macro file,
-@@ -85,6 +89,9 @@ This module defines the following variables:
- find_package(BLAS)
- #]=======================================================================]
-
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
---
-2.20.1
-
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index d03b175..9a6054e 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -17,7 +17,8 @@
Updated by Benda Xu (cmake-3.13.4)
Updated by Lars Wendler (cmake-3.14.0_rc1)
Updated by Lars Wendler (cmake-3.14.0_rc2)
-Updated by Lars Wendler (cmake-3.14.0_rc3
+Updated by Lars Wendler (cmake-3.14.0_rc3)
+Updated by Jacob Floyd (cmake-3.19.2)
---
Modules/Platform/Darwin.cmake | 12 +++++++----
Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
@@ -39,16 +40,17 @@
endif()
# Older OS X linkers do not report their framework search path
-@@ -140,6 +140,8 @@ endif()
+@@ -140,6 +140,9 @@ endif()
# set up the default search directories for frameworks
set(CMAKE_SYSTEM_FRAMEWORK_PATH
++ @GENTOO_PORTAGE_EPREFIX@MacOSX.sdk/System/Library/Frameworks
+ @GENTOO_PORTAGE_EPREFIX@Frameworks
+ @GENTOO_PORTAGE_EPREFIX@usr/lib
~/Library/Frameworks
)
if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -186,13 +188,15 @@ if(CMAKE_OSX_SYSROOT)
+@@ -186,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
endif()
endif()
diff --git a/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
new file mode 100644
index 0000000..5aac1be
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
@@ -0,0 +1,41 @@
+From ce929588adf61ee24bb6850f4b9a58cc7ea224c7 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 19 Nov 2019 12:28:53 +0100
+Subject: [PATCH] Don't use .so for modules on darwin/macos. Use .bundle
+ instead.
+
+Patch by Heiko Przybyl
+
+Forward-ported from 2.8.10 to 3.4.0-rc1
+Forward-ported from 3.4.0-rc1 to 3.16.0-rc4
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ Modules/Platform/Darwin.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index 1482d76ae6..6a432963b6 100644
+--- a/Modules/Platform/Darwin.cmake
++++ b/Modules/Platform/Darwin.cmake
+@@ -43,7 +43,7 @@ endif()
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ set(CMAKE_SHARED_MODULE_PREFIX "lib")
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ set(CMAKE_MODULE_EXISTS 1)
+ set(CMAKE_DL_LIBS "")
+
+@@ -67,7 +67,7 @@ foreach(lang C CXX OBJC OBJCXX)
+ endforeach()
+
+ set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
+
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
+--
+2.24.0
+
diff --git a/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch b/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch
new file mode 100644
index 0000000..6c91987
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.17.0_rc1-FindBLAS.patch
@@ -0,0 +1,37 @@
+From f4009d1efccf571d229e89fab846b0d5873e7a5b Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Thu, 13 Feb 2020 13:12:45 +0100
+Subject: [PATCH] Prefer pkgconfig in FindBLAS
+
+---
+ Modules/FindBLAS.cmake | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
+index 9b6d09c2f9..c2af42468c 100644
+--- a/Modules/FindBLAS.cmake
++++ b/Modules/FindBLAS.cmake
+@@ -7,6 +7,10 @@ FindBLAS
+
+ Find Basic Linear Algebra Subprograms (BLAS) library
+
++Version modified for Gentoo Linux.
++If a valid PkgConfig configuration is found, this overrides and cancels
++all further checks.
++
+ This module finds an installed Fortran library that implements the
+ BLAS linear-algebra interface (see http://www.netlib.org/blas/).
+
+@@ -107,6 +111,9 @@ if(NOT (CMAKE_C_COMPILER_LOADED OR CMAKE_CXX_COMPILER_LOADED OR CMAKE_Fortran_CO
+ endif()
+ endif()
+
++# first, try PkgConfig
++set(BLA_PREFER_PKGCONFIG On)
++
+ if(CMAKE_Fortran_COMPILER_LOADED)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+ else()
+--
+2.25.0
+
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch
similarity index 72%
rename from dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
rename to dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch
index ebd83f3..29eefcb 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
+++ b/dev-util/cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch
@@ -1,29 +1,29 @@
-From 6d4d97b328f48862923bb55c1c0976b1d532dcc3 Mon Sep 17 00:00:00 2001
+From 7459f27dd4bb9b60067ac49ee2c6be93d20c2c1e Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 10 Feb 2019 23:01:53 +0100
+Date: Thu, 13 Feb 2020 13:16:16 +0100
Subject: [PATCH] Prefer pkgconfig in FindLAPACK
---
- Modules/FindLAPACK.cmake | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
+ Modules/FindLAPACK.cmake | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
-index d6646eaacf..ef5f324670 100644
+index c9629769f0..de852d562c 100644
--- a/Modules/FindLAPACK.cmake
+++ b/Modules/FindLAPACK.cmake
@@ -7,6 +7,10 @@ FindLAPACK
- Find LAPACK library
+ Find Linear Algebra PACKage (LAPACK) library
+Version modified for Gentoo Linux.
+If a valid PkgConfig configuration is found, this overrides and cancels
+all further checks.
+
- This module finds an installed fortran library that implements the
+ This module finds an installed Fortran library that implements the
LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
-@@ -181,6 +185,21 @@ endif()
-
+@@ -186,6 +190,22 @@ macro(CHECK_LAPACK_LIBRARIES LIBRARIES _prefix _name _flags _list _threadlibs _a
+ #message("DEBUG: ${LIBRARIES} = ${${LIBRARIES}}")
endmacro()
+# first, try PkgConfig
@@ -41,15 +41,16 @@
+ mark_as_advanced(LAPACK_LIBRARIES)
+else(PC_LAPACK_FOUND)
+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
-
++
set(LAPACK_LINKER_FLAGS)
set(LAPACK_LIBRARIES)
-@@ -428,3 +447,5 @@ endif()
+ set(LAPACK95_LIBRARIES)
+@@ -494,3 +514,5 @@ endif()
cmake_pop_check_state()
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+
+endif(PC_LAPACK_FOUND)
--
-2.20.1
+2.25.0
diff --git a/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
new file mode 100644
index 0000000..07d89ee
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/691544
+
+Patch-by: Felix W. <felix.wischke@gmail.com>
+
+Forward-ported from 3.16.5 to 3.18.0
+
+--- cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
++++ cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
+@@ -36,6 +36,8 @@
+ string(REGEX REPLACE "[^\n]*icpc: command line warning #10121: overriding [^\n]*" "" check_output "${check_output}")
+ # Filter out ld warnings.
+ string(REGEX REPLACE "[^\n]*ld: warning: [^\n]*" "" check_output "${check_output}")
++ # Filter out distcc.
++ string(REGEX REPLACE "[^\n]*distcc\\[[0-9]+\\][^\n]*[Ww]arning:[^\n]*" "" check_output "${check_output}")
+ # If using the feature causes warnings, treat it as broken/unavailable.
+ if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]")
+ set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)
diff --git a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch b/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
deleted file mode 100644
index 2808ed7..0000000
--- a/dev-util/cmake/files/cmake-3.4.0_rc1-darwin-bundle.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Don't use .so for modules on darwin/macos. Use .bundle instead.
-Patch by Heiko Przybyl
-
-Forward-ported from 2.8.10 to 3.4.0-rc1
-
---- cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
-+++ cmake-3.4.0-rc1/Modules/Platform/Darwin.cmake
-@@ -26,7 +26,7 @@
- set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
- set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
- set(CMAKE_SHARED_MODULE_PREFIX "lib")
--set(CMAKE_SHARED_MODULE_SUFFIX ".so")
-+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
- set(CMAKE_MODULE_EXISTS 1)
- set(CMAKE_DL_LIBS "")
-
-@@ -53,7 +53,7 @@
- set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
- set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
- set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
--set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
-+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
-
- # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
- # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index e237249..633caf1 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -6,10 +6,9 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="server">Enable cmake-server support.</flag>
<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
</use>
<upstream>
- <remote-id type="cpe">cpe:/a:cmake_project:cmake </remote-id>
+ <remote-id type="cpe">cpe:/a:cmake_project:cmake</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 2820623..4f042f6 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,2 +1,2 @@
-DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
+DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
deleted file mode 100644
index 1f5c5ca..0000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib java-pkg-opt-2 libtool toolchain-funcs
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
-
-LICENSE="BSD IJG"
-SLOT="0"
-[[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="*"
-IUSE="java static-libs"
-
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
-COMMON_DEPEND="!media-libs/jpeg:0
- !media-libs/jpeg:62"
-RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
- amd64? ( ${ASM_DEPEND} )
- x86? ( ${ASM_DEPEND} )
- amd64-fbsd? ( ${ASM_DEPEND} )
- x86-fbsd? ( ${ASM_DEPEND} )
- amd64-linux? ( ${ASM_DEPEND} )
- x86-linux? ( ${ASM_DEPEND} )
- x64-macos? ( ${ASM_DEPEND} )
- x64-cygwin? ( ${ASM_DEPEND} )
- java? ( >=virtual/jdk-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
- default
-
- cmake-utils_src_prepare
- java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
- if multilib_is_native_abi && use java ; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_STATIC="$(usex static-libs)"
- -DWITH_JAVA="$(multilib_native_usex java)"
- -DWITH_MEM_SRCDST=ON
- )
- [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
-
- if multilib_is_native_abi ; then
- pushd "${WORKDIR}/debian/extra" &>/dev/null || die
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
- popd &>/dev/null || die
- fi
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- if multilib_is_native_abi ; then
- pushd "${WORKDIR}/debian/extra" &>/dev/null || die
- emake \
- DESTDIR="${D}" prefix="${EPREFIX}"/usr \
- INSTALL="install -m755" INSTALLDIR="install -d -m755" \
- install
-
- popd || die
- if use java ; then
- rm -rf "${ED%/}"/usr/classes || die
- java-pkg_dojar java/turbojpeg.jar
- fi
- fi
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
-
- insinto /usr/share/doc/${PF}/html
- doins -r "${S}"/doc/html/*
- newdoc "${WORKDIR}"/debian/changelog changelog.debian
- if use java; then
- insinto /usr/share/doc/${PF}/html/java
- doins -r "${S}"/java/doc/*
- newdoc "${S}"/java/README README.java
- fi
-}
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
new file mode 100644
index 0000000..cc900dd
--- /dev/null
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib java-pkg-opt-2
+
+DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
+HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
+
+LICENSE="BSD IJG ZLIB"
+SLOT="0/0.2"
+if [[ "$(ver_cut 3)" -lt 90 ]] ; then
+ KEYWORDS="*"
+fi
+IUSE="cpu_flags_arm_neon java static-libs"
+
+ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
+
+COMMON_DEPEND="!media-libs/jpeg:0
+ !media-libs/jpeg:62"
+
+BDEPEND=">=dev-util/cmake-3.16.5
+ amd64? ( ${ASM_DEPEND} )
+ x86? ( ${ASM_DEPEND} )
+ amd64-fbsd? ( ${ASM_DEPEND} )
+ x86-fbsd? ( ${ASM_DEPEND} )
+ amd64-linux? ( ${ASM_DEPEND} )
+ x86-linux? ( ${ASM_DEPEND} )
+ x64-macos? ( ${ASM_DEPEND} )
+ x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.8:* )"
+
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+
+src_prepare() {
+ local FILE
+ ln -snf ../debian/extra/*.c . || die
+
+ for FILE in ../debian/extra/*.c; do
+ FILE=${FILE##*/}
+ cat >> CMakeLists.txt <<EOF || die
+add_executable(${FILE%.c} ${FILE})
+install(TARGETS ${FILE%.c})
+EOF
+ done
+
+ for FILE in ../debian/extra/exifautotran; do
+ cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
+EOF
+ done
+
+ for FILE in ../debian/extra/*.[0-9]*; do
+ cat >> CMakeLists.txt <<EOF || die
+install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
+EOF
+ done
+
+ cmake_src_prepare
+ java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+ if multilib_is_native_abi && use java ; then
+ export JAVACFLAGS="$(java-pkg_javac-args)"
+ export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+ fi
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DENABLE_STATIC="$(usex static-libs)"
+ -DWITH_JAVA="$(multilib_native_usex java)"
+ -DWITH_MEM_SRCDST=ON
+ )
+
+ # Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
+ if use arm; then
+ mycmakeargs+=(
+ -DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
+ )
+ fi
+
+ # mostly for Prefix, ensure that we use our yasm if installed and
+ # not pick up host-provided nasm
+ if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
+ mycmakeargs+=(
+ -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
+ )
+ fi
+
+ cmake_src_configure
+}
+
+multilib_src_install() {
+ cmake_src_install
+
+ if multilib_is_native_abi && use java ; then
+ rm -rf "${ED}"/usr/classes || die
+ java-pkg_dojar java/turbojpeg.jar
+ fi
+}
+
+multilib_src_install_all() {
+ find "${ED}" -type f -name '*.la' -delete || die
+
+ local -a DOCS=( README.md ChangeLog.md )
+ einstalldocs
+
+ newdoc "${WORKDIR}"/debian/changelog changelog.debian
+
+ docinto html
+ dodoc -r "${S}"/doc/html/.
+
+ if use java; then
+ docinto html/java
+ dodoc -r "${S}"/java/doc/.
+ newdoc "${S}"/java/README README.java
+ fi
+}
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index 8f62c78..617cdf8 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -2,10 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
+ <email>codec@gentoo.org</email>
+ <name>Gentoo Codec Project</name>
</maintainer>
+ <slots>
+ <subslots>Reflect ABI of libturbojpeg.so.</subslots>
+ </slots>
<upstream>
+ <remote-id type="github">libjpeg-turbo/libjpeg-turbo</remote-id>
<remote-id type="sourceforge">libjpeg-turbo</remote-id>
<remote-id type="cpe">cpe:/a:libjpeg-turbo:libjpeg-turbo</remote-id>
</upstream>
diff --git a/metadata/md5-cache/dev-util/cmake-3.14.3 b/metadata/md5-cache/dev-util/cmake-3.14.3
deleted file mode 100644
index 9393678..0000000
--- a/metadata/md5-cache/dev-util/cmake-3.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info sys-devel/make
-DESCRIPTION=Cross platform Make
-EAPI=6
-HOMEPAGE=https://cmake.org/
-IUSE=doc emacs system-jsoncpp ncurses qt5 test test
-KEYWORDS=*
-LICENSE=CMake
-RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-SLOT=0
-SRC_URI=https://cmake.org/files/v3.14/cmake-3.14.3.tar.gz
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb cmake-utils 91d6ef31dc426240577497cacbf2508c desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 3322f14f031ddc95feccd9089c9adc59 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing c3cf317581e5bd068a4b851f03dd8cba ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx e9162f65645513120b4e12863a5fa972 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=06b2304ef318c245d348c98d6ffd2078
diff --git a/metadata/md5-cache/dev-util/cmake-3.18.5 b/metadata/md5-cache/dev-util/cmake-3.18.5
new file mode 100644
index 0000000..72e49bd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cmake-3.18.5
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) test? ( !prefix? ( x11-base/xorg-server ) x11-apps/xhost )
+DESCRIPTION=Cross platform Make
+EAPI=7
+HOMEPAGE=https://cmake.org/
+IUSE=doc emacs ncurses qt5 test test
+KEYWORDS=*
+LICENSE=CMake
+RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=dev-libs/jsoncpp-1.9.2-r2:0= >=dev-libs/libuv-1.10.0:= >=net-misc/curl-7.21.5[ssl] sys-libs/zlib virtual/pkgconfig emacs? ( >=app-editors/emacs-23.1:* ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://cmake.org/files/v3.18/cmake-3.18.5.tar.gz
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb cmake b22e256fd899c7e0c747e8834eff121a elisp-common 3322f14f031ddc95feccd9089c9adc59 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing c3cf317581e5bd068a4b851f03dd8cba ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e9162f65645513120b4e12863a5fa972 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=baae53c1a7cd0d5cbbfe792fa8c2c1cf
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
deleted file mode 100644
index c7610b7..0000000
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-2.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) java? ( >=virtual/jdk-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
-EAPI=7
-HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
-IUSE=java static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 elibc_FreeBSD java
-KEYWORDS=*
-LICENSE=BSD IJG
-RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.0.3.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=cmake-multilib b396704c8c04bb210b7b45dff5c67fea cmake-utils 91d6ef31dc426240577497cacbf2508c eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 82402a1c36ab4bf38f3313a543f9e827 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing c3cf317581e5bd068a4b851f03dd8cba ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf95b6b8de79323305812ee1a778553f
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2 b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
new file mode 100644
index 0000000..68e5ad7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-2.1.0-r2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/cmake-3.16.5 amd64? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-fbsd? ( || ( dev-lang/nasm dev-lang/yasm ) ) amd64-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x86-linux? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-macos? ( || ( dev-lang/nasm dev-lang/yasm ) ) x64-cygwin? ( || ( dev-lang/nasm dev-lang/yasm ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jdk-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=MMX, SSE, and SSE2 SIMD accelerated JPEG library
+EAPI=7
+HOMEPAGE=https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/
+IUSE=cpu_flags_arm_neon java static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 elibc_FreeBSD java
+KEYWORDS=*
+LICENSE=BSD IJG ZLIB
+RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 java? ( >=virtual/jre-1.8:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/0.2
+SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-2.1.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
+_eclasses_=cmake b22e256fd899c7e0c747e8834eff121a cmake-multilib b396704c8c04bb210b7b45dff5c67fea eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic 5d5921a298e95441da2f85be419894c0 java-pkg-opt-2 be255db325e3af8fbf3506cf63998341 java-utils-2 82402a1c36ab4bf38f3313a543f9e827 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing c3cf317581e5bd068a4b851f03dd8cba ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=51e3a7a0fd230c40a7c32cfba9c0e771
