commit:     97e13b984a1c86cbe9e2f397a1f3e2149e3b4ad3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 01:17:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 01:17:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e13b98

media-libs/libjpeg-turbo: drop 2.1.3, 2.1.4

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libjpeg-turbo/Manifest                  |   2 -
 .../libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild       | 124 --------------------
 .../libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild       | 127 ---------------------
 3 files changed, 253 deletions(-)

diff --git a/media-libs/libjpeg-turbo/Manifest 
b/media-libs/libjpeg-turbo/Manifest
index 56cfc915c8f2..d79b65572490 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,5 +1,3 @@
-DIST libjpeg-turbo-2.1.3.tar.gz 2260756 BLAKE2B 
87ef47105e66b2ee918e95962ac59963b6adea5b49ab0db692810aee0a13a215a0ef7fe0b549ecd5151274549e12d09eb0b42439bf0a4bc1ad2c4e62dcceb77c
 SHA512 
975c9835de7d70c6c8c5a1959adfa18f7f956bc9946fde8f1b40c1d853245c38a3118ac06b93841ec3e90be6945c38d687d062b371496c2ee9b5638d7f60418d
-DIST libjpeg-turbo-2.1.4.tar.gz 2261822 BLAKE2B 
80ffd77d58a37eae0bdc1868d994f34ea52c13e2624c720b1d0b6ec4d6d14b16911163ccd4009c8d6eda214f31e1fff78bb7eb4739ae6589d0fd8c7008c0e972
 SHA512 
511f065767c022da06b6c36299686fa44f83441646f7e33b766c6cfab03f91b0e6bfa456962184071dadaed4057ba9a29cba685383f3eb86a4370a1a53731a70
 DIST libjpeg-turbo-2.1.5.1.tar.gz 2264936 BLAKE2B 
9583a0a91e45347d651de6bf5192a23bfe4e64cef67cdbb18f5b578b424fc46fc114e5649e93a467906cf047948e43a11b6d17b48c47f879c51cff1a4ef356ff
 SHA512 
86a7248d064043b26b09755633ef4872a2a6133c9e677a9fe4be6645b2e0fde102cf01e09119967b3b6b85f4cb93f3f7c49ec4973944d5eff99b5b90ce8b0be6
 DIST libjpeg-turbo-3.0.0.tar.gz 2799663 BLAKE2B 
9a4b74aad81c2999ab7f3cd7d8695e1132edda141f4cc8a57e671f42cad4ac16b66b0f19cf4b874b61a82c008287ad88cd81d85547c195ed30456e29cb505285
 SHA512 
2307a2e240faf5b3119cdc5cf6a0255813d74591d4a4201fd2374940683cb9de90cb5926367e633f3624b27edd292209c7cd3c38d64522716e83fc81361289b4
 DIST libjpeg-turbo-3.0.1.tar.gz 2800900 BLAKE2B 
9d2c784edd6493c4d9e2379fc4a8f0844e440d7afe774b231f611034d481dcf1be35979fb7d731a5a8f99000780f1343b7934a59df22c1dcaef295b6294ea494
 SHA512 
26a2c821a023579e82a7c2a00582747f5f24089aa0820ba304f1ff71c6894b7a6bd0468acc5ff90e2655e0a1c23a5a35a779df51f5cfa3e9eba527c709fab55b

diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
deleted file mode 100644
index e708ac1f5770..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-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-build/cmake-3.16.5
-       amd64? ( ${ASM_DEPEND} )
-       x86? ( ${ASM_DEPEND} )
-       amd64-linux? ( ${ASM_DEPEND} )
-       x86-linux? ( ${ASM_DEPEND} )
-       x64-macos? ( ${ASM_DEPEND} )"
-
-DEPEND="${COMMON_DEPEND}
-       java? ( >=virtual/jdk-1.8:*[-headless-awt] )"
-
-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
-
-       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 || use arm64; then
-               mycmakeargs+=(
-                       -DWITH_SIMD=$(usex cpu_flags_arm_neon)
-                       -DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
-               )
-       fi
-
-       # We should tell the test suite which floating-point flavor we are
-       # expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597
-       # For now, mark loong as fp-contract.
-       if use loong; then
-               mycmakeargs+=(
-                       -DFLOATTEST=fp-contract
-               )
-       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
-       dobin "${WORKDIR}"/debian/extra/exifautotran
-       doman "${WORKDIR}"/debian/extra/*.[0-9]*
-
-       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/libjpeg-turbo-2.1.4.ebuild 
b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild
deleted file mode 100644
index 4242ea996790..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.4.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-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
-"
-DEPEND="
-       ${COMMON_DEPEND}
-       java? ( >=virtual/jdk-1.8:*[-headless-awt] )
-"
-RDEPEND="
-       ${COMMON_DEPEND}
-       java? ( >=virtual/jre-1.8:* )
-"
-BDEPEND="
-       amd64? ( ${ASM_DEPEND} )
-       x86? ( ${ASM_DEPEND} )
-       amd64-linux? ( ${ASM_DEPEND} )
-       x86-linux? ( ${ASM_DEPEND} )
-       x64-macos? ( ${ASM_DEPEND} )
-"
-
-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
-
-       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, bug 
#792810
-       if use arm || use arm64; then
-               mycmakeargs+=(
-                       -DWITH_SIMD=$(usex cpu_flags_arm_neon)
-                       -DNEON_INTRINSICS=$(usex cpu_flags_arm_neon)
-               )
-       fi
-
-       # We should tell the test suite which floating-point flavor we are
-       # expecting: https://github.com/libjpeg-turbo/libjpeg-turbo/issues/597
-       # For now, mark loong as fp-contract.
-       if use loong; then
-               mycmakeargs+=(
-                       -DFLOATTEST=fp-contract
-               )
-       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
-       dobin "${WORKDIR}"/debian/extra/exifautotran
-       doman "${WORKDIR}"/debian/extra/*.[0-9]*
-
-       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
-}

Reply via email to