commit:     84b430f7ae1ebc8d62757ea50444a053a0f9f8a3
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 09:07:41 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 09:07:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b430f7

media-libs/libjpeg-turbo: remove vulnerable versions for bug #585782

Package-Manager: portage-2.3.0

 media-libs/libjpeg-turbo/Manifest                  |   1 -
 .../libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild       | 117 ---------------------
 2 files changed, 118 deletions(-)

diff --git a/media-libs/libjpeg-turbo/Manifest 
b/media-libs/libjpeg-turbo/Manifest
index 9137c0d..68ea3de 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,3 +1,2 @@
-DIST libjpeg-turbo-1.4.2.tar.gz 1569306 SHA256 
521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e SHA512 
9bd27c917c29125c425469eb0fdf99b802f25095f187fb416bd7c05e4af95a32404bbb0d06b77343d35d3461029500decf3481337b2eade9e57b58dea69719ee
 WHIRLPOOL 
4a6dfefee5d50b19474a5b0a8b2e3c06a403538985b9cf369a51d3cb2a9e2a0bbb6ac314e1e85d4432a44a8a381472c4e8be1286de909f3f47407692a583a01b
 DIST libjpeg-turbo-1.5.0.tar.gz 1654276 SHA256 
9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f SHA512 
3b7249a5f5c7b1f1fa99924ac6bc9bff3bf811815ef38505af5359d1f0edb0bfb771f0fa54308743a2d9305cb19a997453fdb00d0aade3f2f17ea917a45fde22
 WHIRLPOOL 
5aee1cda739fb70fe15efd0cdb2cdecd7d99e4bea3d0b05d757420dd781749bc9c4a91ba4f5c1ad68584113323acc0d2784ac18c9daed678d4057a410a289610
 DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 
9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 
8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
 WHIRLPOOL 
bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
deleted file mode 100644
index 613b000..0000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
-HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ 
http://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 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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
-       abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5
-               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
-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} )
-       java? ( >=virtual/jdk-1.5 )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239
-
-       elibtoolize
-
-       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=/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
-}

Reply via email to