From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 83D2C13835A for ; Sun, 4 Oct 2020 17:39:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5B75E0896; Sun, 4 Oct 2020 17:39:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80AFDE0896 for ; Sun, 4 Oct 2020 17:39:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 482E0340B0B for ; Sun, 4 Oct 2020 17:39:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0D0E373 for ; Sun, 4 Oct 2020 17:39:22 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1601833155.3090e82542e7c97c9555f9968bc02664d99774a0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libjpeg-turbo/Manifest media-libs/libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild X-VCS-Directories: media-libs/libjpeg-turbo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3090e82542e7c97c9555f9968bc02664d99774a0 X-VCS-Branch: master Date: Sun, 4 Oct 2020 17:39:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b5aa693e-af9d-448a-8513-a47978b2c6a7 X-Archives-Hash: 019354574601d91bb3e597b56593645f commit: 3090e82542e7c97c9555f9968bc02664d99774a0 Author: Sam James gentoo org> AuthorDate: Sun Oct 4 17:38:42 2020 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 4 17:39:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3090e825 media-libs/libjpeg-turbo: security cleanup Bug: https://bugs.gentoo.org/727010 Bug: https://bugs.gentoo.org/727910 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> media-libs/libjpeg-turbo/Manifest | 1 - .../libjpeg-turbo/libjpeg-turbo-2.0.3.ebuild | 100 --------------------- 2 files changed, 101 deletions(-) diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index b8a65152bed..7b869b81a33 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,5 +1,4 @@ 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 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 3ae6b4ab219..00000000000 --- 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 -}