gentoo resync : 25.11.2020

6 files changed, 36 insertions, 128 deletions

diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 4ad530d96168..9105f2ea88f7 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -4,12 +4,10 @@ AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca889205
 AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
 AUX libjpeg-turbo-2.0.4-CVE-2020-13790.patch 1543 BLAKE2B f8a420aed675c7c5adc1d194bc43b7aabc1c0af7c1a362073c1e1006ef4598e92deacc1373d9645076b43f0277a777007b986e62c71bc84d9d2640308872fa46 SHA512 dbb8b6cfcc672e41af8150139a964deac3d926e7e4435e0d5125b36e7dcfdfcb3915267efeb1a7d891581b34790636ea2d1de48163d8c6ddc50e041dbd1ae140
 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 libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
-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 3000 BLAKE2B c7d09027b9f529457cb4332408c1b48ba42737ac9e2c2b8f2e33ec8621705ffe766307a994dc9d5a3285c70ab6e0a89ef5c95104dc80eb7e3d756e019f16c69f SHA512 967f62584faf83bdc1313bc82f30bf4518b6f08fdc61ee77e91bc94a9f4ce8209e80588123a6dcb41bf6b6d45d9b7936e5a1b5fc85448d932ad42264509421a4
-MISC metadata.xml 328 BLAKE2B 1a865bcdd6aafcc48199e509b1149bf2b6410b189ad24d58613830e8c95943d71eafb0cc35a567d8d1f7afc3eafc40e7c08e6b40a8afad5a52f7bff4ace1db1e SHA512 410df3851c2c9bc731dcd6774dcb571a50676a834f6429ed05bd8c9a0df3c77d266f73486d12fe04bf482bb39757facd9fd8d349c28ba843fc5f1624aa7f9573
+EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2997 BLAKE2B 07eb75644ba9322de5b9c926c25f7f14b88cec9c331be79dc94c93f4b85492335ac5b4bcad08cc1400e63c58345b7e18c47d3efd25c4b4df631f2900fc23ccbb SHA512 27a1dc6d9c3f23af59d16e63a78b45320aac8be1feca9dbff4714b183ff2bf5b615856cba2f06f9aa45bae65e069708564763710afea2c1a5f4e2f13488da077
+EBUILD libjpeg-turbo-2.0.5-r2.ebuild 3004 BLAKE2B f5ee859c4da49f85b3519625d1b9e0756c052a8e6a2616560a6ca6d4061915c91489d8c23ae7a1017e377355b5a55be386b673b793dd3c01284d3825d355b258 SHA512 6ae05da3888ede7bb888dcc6c2a7d78701e14df4942f1f63384e391b6a1108e2fea8593ead06cd676de4150beb43eda0540383e00d4086c3f8f8cf836dcfa0e0
+EBUILD libjpeg-turbo-2.0.6.ebuild 3012 BLAKE2B 98cbdcdef7465e1a6e1d0dc686a4dda0e1891f74fa4e6e9671b5e43d2a342d2b2a70a2aec5c58bc5b1b8d2ccf97286ca5d244a145d5069f739338c68ede2f924 SHA512 d634ff16ba2381d59fa121562d24c88c92f7412a57a68f1edf41126ba4b7ba2ee55d083b37cb4ead615b4460588b0eb90a9b2d98c6dc9e617f2bf6b6363cf5bd
+MISC metadata.xml 475 BLAKE2B 00e12208a526ec05edd06341a1f582af2f6cca0ecf4f2de50ff6f1f8d0472c28e6aeaf3994825b90d821144ab351c1f4716a922ac6a454748c76e6c0791b5df2 SHA512 58fadedea7b2a97f0dac0fb0db13cece27a46dfcf2aa2c2bc25ee7ab5ebdd56315d4b465df9cf1b71e4c27588f1398837b5cdb2ea9e2c3caddfb768dd3be13b6
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
index 0c6e95570f9f..7801212034da 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r3.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools libtool java-pkg-opt-2 toolchain-funcs multilib-minimal
 
@@ -11,26 +11,30 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
 LICENSE="BSD IJG ZLIB"
-SLOT="0"
+SLOT="0/0.1"
 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}
-	amd64? ( ${ASM_DEPEND} )
+
+BDEPEND="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} )
+	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 )
 
 PATCHES=(
@@ -109,13 +113,14 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -type f -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 
-	dodoc -r "${S}"/doc/html
+	docinto html
+	dodoc -r "${S}"/doc/html/*
 	newdoc "${WORKDIR}"/debian/changelog changelog.debian
 	if use java; then
-		newdoc "${S}"/java/README README.java
 		docinto html/java
 		dodoc -r "${S}"/java/doc/*
+		newdoc "${S}"/java/README README.java
 	fi
 }
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 3ae6b4ab2192..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 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 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 ZLIB"
-SLOT="0"
-[[ "$(ver_cut 3)" -ge 90 ]] || \
-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}
-	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_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_src_configure
-}
-
-multilib_src_compile() {
-	cmake_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_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
-
-	docinto html
-	dodoc -r "${S}"/doc/html/*
-	newdoc "${WORKDIR}"/debian/changelog changelog.debian
-	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/libjpeg-turbo-2.0.5-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild
index b442ddc8b825..b56919a90a9e 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
 LICENSE="BSD IJG ZLIB"
-SLOT="0"
+SLOT="0/0.2"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
 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"
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
index 45da50975b47..47751e0823a7 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.4-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
@@ -12,17 +12,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
 
 LICENSE="BSD IJG ZLIB"
-SLOT="0"
+SLOT="0/0.2"
 [[ "$(ver_cut 3)" -ge 90 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~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,14 +30,15 @@ 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 )"
 
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.5 )"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-CVE-2020-13790.patch
-)
+MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 
 src_prepare() {
 	local FILE
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index adc27b89bda1..fa375260076d 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/metadata.xml
@@ -2,7 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <!-- maintainer-needed -->
+  <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>