gentoo resync : 25.08.2020

6 files changed, 41 insertions, 139 deletions

diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 12d0c9437d81..878bc6434ea9 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -6,10 +6,10 @@ AUX libjpeg-turbo-2.0.4-CVE-2020-13790.patch 1543 BLAKE2B f8a420aed675c7c5adc1d1
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
 DIST libjpeg-turbo-2.0.3.tar.gz 2161279 BLAKE2B c0def6d6d402eb2070f4861741f9579e5c360e8bc9a64924c7d53c3c65cc8d4577c01e2cf6acf8ddbe7bddc96540f605ddb47d1651a7400738638fb06928824b SHA512 ca7d4dcc5b34e23831ac450b65b8f92894d35e4afba0c52ac9e0c7dc6b41d4fa2bad66eb79198245032ec02b0b2e88cef39b8c696de17b6a869e3093a6b70e36
 DIST libjpeg-turbo-2.0.4.tar.gz 2161812 BLAKE2B 9be870a5bafaae279646941b848b69fdf7c95ec08a686b01674f473ef33fe5923a04ba8a2d57df84384530308ca46fc3880a404c0eff769129417a553faed3bb SHA512 708c2e7418d9ed5abca313e2ff5a08f8176d79cad2127573cda6036583c201973db4cfb0eafc0fc8f57ecc7b000d2b4af95980de54de5a0aed45969e993a5bf9
+DIST libjpeg-turbo-2.0.5.tar.gz 2162983 BLAKE2B d9204e06f075173a420931457c3738aba57a820719fb878765114b169ebb8212df18165a5f86f22126dd7eb8f8aab03caa2ba7f55e87d19196dba094e4a959fa SHA512 5bf9ecf069b43783ff24365febf36dda69ccb92d6397efec6069b2b4f359bfd7b87934a6ce4311873220fccc73acabdacef5ce0604b79209eb1912e8ba478555
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-EBUILD libjpeg-turbo-1.5.3-r2.ebuild 2975 BLAKE2B 8adcb465f8dc025163ede13aba9c8c16ad5ba76151181d8800a549c4f3faf2f1ab259fefcca77e13b4384dbaf2f174285f7ee4a76f35b2da2e84ce0b956d189d SHA512 696184c66d92d48a66fffff01d4cd3bf0a4e723896ed659a0d4acd029c768ab23957f6dce4e0b39e576441e4c89e57b89141f8465fc202075a7a11e241cbe63c
-EBUILD libjpeg-turbo-1.5.3-r3.ebuild 2972 BLAKE2B 4154ddd9f709b22356760b786cfe3a3296699e3a7291feb415f830f16ca71963d32307654e69c52c32c054852f29191c126fb757328f017a60e0e4c1dd8bf1c1 SHA512 e4fdfdc8a6f520caf42e692e4610617bbbb132fe20d5cb1af982e2e6166b7a1d52030b2c5802062e9c972a7aeef56f5a88a4543baae6843a0103b15cb7554c51
-EBUILD libjpeg-turbo-2.0.3.ebuild 2596 BLAKE2B f474623d5a37027f79a697bd13d12a14ea05ff4c302ec4cb90a82ee4703775b8290994634caa1d688a06170386f79190f4c030d4539d493b87b6c56925b5c189 SHA512 2b4b663c921eac0f088d4881352a65d81eb7a7dd398dfb17cedd062eb957177c41723a2006da1426e1eb4983bc1358e9b0e449d85fb0fe95beec1c526a41d3e6
-EBUILD libjpeg-turbo-2.0.4-r1.ebuild 2819 BLAKE2B 49ee8d67bb5d39a471fb75980ef91df148aad386518563cd45e0bd8b3099eb131d7d6e19a2c42a9a0b79a9fedb3ea335c1a964a8b16fed0d743a6d57993dbce4 SHA512 ebe40fbbcab1f1edfc73a28bcf9cbdca1c6041c5c63fb9c904496b764105c0546f8da68d9160fbc6b88c81a218f2fb7e2cc475372ed59eb79065c766881cf46b
-EBUILD libjpeg-turbo-2.0.4.ebuild 2764 BLAKE2B 9c43210e19cec992e9966f71aae6249155877d333bdf822716acaf3d2e5893f973f69e8f92b55e3a9a057d270043b62b8a836b2b69196226378d7eb826343fee SHA512 92d67d8c8e27251ebc3806e8769a0912d2f043ba5858c054a0911a90c60546cc3db498af391334711ce47a7a3ce275117cb26352c0a65c05c81b7a622a9d00f4
+EBUILD libjpeg-turbo-1.5.3-r3.ebuild 2964 BLAKE2B 679e11de696a4ce59df452d37f0df0dad315fc1061b7a67f2897e7f0a5f31a0805d2a5fa1827a1f2cd9754aa3b21089e00237b3ddaac09f5f49c074e1cf52317 SHA512 906db6b0eb7c7798b7d40b49b5630a5321e139deda494acc84dc97cd7456e001a142eff48228d2877eb79e48bd3c7789c5dfc44a64e6bdd93e06aadd4d0c7cea
+EBUILD libjpeg-turbo-2.0.3.ebuild 2589 BLAKE2B 0207ab472f818dbdec8c2ab0f5d5309a6cac15996121ab1f89492d6c0f8fa6f9525386491eedc4a39708ac70bfc5b26f35c7ef8a24e4e9090f6ab74bb07b5481 SHA512 1565a66ad1e879a4013aac977f06126219d472550ffe9d76819e4a3dd5f8fb2c9e03524ae8d0cacabd470e5ce7eddcc700143c22dbcf59248a8ae0f808961dae
+EBUILD libjpeg-turbo-2.0.4-r1.ebuild 3016 BLAKE2B f1632139dc72108f4a56e439f6e10fa77c97f2eda9d439b36025feb57fc4076a5bdedf3e1635b33415d247594ae38ef071b7e899fc7a25a0cc2ec53e995b0364 SHA512 438bbc05fff22024fb00c89f3e017c77f570fdaf213501907472cebe0d8ebed033c5aa29b0cd11a3f540ab92be61a4570a3b51207cecebc8ac948808d239fda9
+EBUILD libjpeg-turbo-2.0.5-r1.ebuild 3002 BLAKE2B a2844d7af232ccf71907117f0ff1cc082d267968dc4c46c69d918cfaff1ec6c933306a29095a623005ffe3370f7027ae04c14a896160e0aad4919f38632a5b75 SHA512 ca16b5bce27b11991ddff324cdda2fcd6f6c2d250b323b51ea9fce7fe98832938a6cff9981acc3a325eea9ad16c61cb94b49a4da35837dae23e68851bc60e183
 MISC metadata.xml 328 BLAKE2B 1a865bcdd6aafcc48199e509b1149bf2b6410b189ad24d58613830e8c95943d71eafb0cc35a567d8d1f7afc3eafc40e7c08e6b40a8afad5a52f7bff4ace1db1e SHA512 410df3851c2c9bc731dcd6774dcb571a50676a834f6429ed05bd8c9a0df3c77d266f73486d12fe04bf482bb39757facd9fd8d349c28ba843fc5f1624aa7f9573
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
deleted file mode 100644
index a04b8db98f05..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools libtool ltprune java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
-
-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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-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 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
-	"${FILESDIR}"/${P}-divzero_fix.patch #658624
-	"${FILESDIR}"/${P}-cve-2018-11813.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-	if multilib_is_native_abi; then
-		myconf+=( $(use_with java) )
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-	else
-		myconf+=( --without-java )
-	fi
-	[[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239
-
-	# Force /bin/bash until upstream generates a new version. #533902
-	CONFIG_SHELL="${EPREFIX}"/bin/bash \
-	ECONF_SOURCE=${S} \
-	econf \
-		$(use_enable static-libs static) \
-		--with-mem-srcdst \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-	use java && _java_makeopts="-j1"
-	emake ${_java_makeopts}
-
-	if multilib_is_native_abi; then
-		pushd ../debian/extra >/dev/null
-		emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
-		popd >/dev/null
-	fi
-}
-
-multilib_src_test() {
-	emake test
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF} \
-		install
-
-	if multilib_is_native_abi; then
-		pushd "${WORKDIR}"/debian/extra >/dev/null
-		emake \
-			DESTDIR="${D}" prefix="${EPREFIX}"/usr \
-			INSTALL="install -m755" INSTALLDIR="install -d -m755" \
-			install
-		popd >/dev/null
-
-		if use java; then
-			rm -rf "${ED}"/usr/classes
-			java-pkg_dojar java/turbojpeg.jar
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-
-	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-1.5.3-r3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
index 0d028b01df98..0c6e95570f9f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
@@ -10,9 +10,9 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
index ef89ab4a9d29..3ae6b4ab2192 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
@@ -11,10 +11,10 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
index c48f5acfac1c..45da50975b47 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
@@ -11,10 +11,10 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="java static-libs"
 
 ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -81,7 +81,16 @@ multilib_src_configure() {
 		-DWITH_JAVA="$(multilib_native_usex java)"
 		-DWITH_MEM_SRCDST=ON
 	)
+
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+
+	if use ppc ; then
+		# Workaround recommended by upstream:
+		# https://bugs.gentoo.org/715406#c9
+		# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
+		mycmakeargs+=( -DFLOATTEST="64bit" )
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild
index 32928b1d770d..da5546a77efa 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild
@@ -11,18 +11,18 @@ HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-tu
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
-LICENSE="BSD IJG"
+LICENSE="BSD IJG ZLIB"
 SLOT="0"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 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}
+
+BDEPEND=">=dev-util/cmake-3.16.5
 	amd64? ( ${ASM_DEPEND} )
 	x86? ( ${ASM_DEPEND} )
 	amd64-fbsd? ( ${ASM_DEPEND} )
@@ -30,9 +30,14 @@ DEPEND="${COMMON_DEPEND}
 	amd64-linux? ( ${ASM_DEPEND} )
 	x86-linux? ( ${ASM_DEPEND} )
 	x64-macos? ( ${ASM_DEPEND} )
-	x64-cygwin? ( ${ASM_DEPEND} )
+	x64-cygwin? ( ${ASM_DEPEND} )"
+
+DEPEND="${COMMON_DEPEND}
 	java? ( >=virtual/jdk-1.5 )"
 
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
+
 MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 
 src_prepare() {
@@ -59,7 +64,7 @@ install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_
 EOF
 	done
 
-	default
+	#default
 
 	cmake_src_prepare
 	java-pkg-opt-2_src_prepare
@@ -77,7 +82,16 @@ multilib_src_configure() {
 		-DWITH_JAVA="$(multilib_native_usex java)"
 		-DWITH_MEM_SRCDST=ON
 	)
+
 	[[ ${ABI} == "x32" ]] && mycmakeargs+=( -DREQUIRE_SIMD=OFF ) #420239
+
+	if use ppc ; then
+		# Workaround recommended by upstream:
+		# https://bugs.gentoo.org/715406#c9
+		# https://github.com/libjpeg-turbo/libjpeg-turbo/issues/428
+		mycmakeargs+=( -DFLOATTEST="64bit" )
+	fi
+
 	cmake_src_configure
 }