From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1428901-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 30132158095
for <garchives@archives.gentoo.org>; Fri, 19 Aug 2022 08:14:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CC6E3E086D;
Fri, 19 Aug 2022 08:14:15 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9D0A0E086F
for <gentoo-commits@lists.gentoo.org>; Fri, 19 Aug 2022 08:14:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B4A113413D8
for <gentoo-commits@lists.gentoo.org>; Fri, 19 Aug 2022 08:14:14 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 49DC6584
for <gentoo-commits@lists.gentoo.org>; Fri, 19 Aug 2022 08:14:12 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1660896817.e2cf7cd3950fa9d1ebeaf1b855d155d2b9b06b29.asturm@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.1.1-r2.ebuild
X-VCS-Directories: media-libs/libjpeg-turbo/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: e2cf7cd3950fa9d1ebeaf1b855d155d2b9b06b29
X-VCS-Branch: master
Date: Fri, 19 Aug 2022 08:14:12 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: e0d8367d-2e6a-4eb0-9350-7c319af2cc53
X-Archives-Hash: 7d16c4809eeeb0bfdba5b3a0faab9627
commit: e2cf7cd3950fa9d1ebeaf1b855d155d2b9b06b29
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 21:25:24 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 08:13:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2cf7cd3
media-libs/libjpeg-turbo: drop 2.1.1-r2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/libjpeg-turbo/Manifest | 1 -
.../libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild | 131 ---------------------
2 files changed, 132 deletions(-)
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index c773e13fbd0f..16b2b74196f6 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -1,4 +1,3 @@
-DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673
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 libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
deleted file mode 100644
index 01c7c9afcbea..000000000000
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 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
-
-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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-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-util/cmake-3.16.5
- amd64? ( ${ASM_DEPEND} )
- x86? ( ${ASM_DEPEND} )
- amd64-linux? ( ${ASM_DEPEND} )
- x86-linux? ( ${ASM_DEPEND} )
- x64-macos? ( ${ASM_DEPEND} )
- x64-cygwin? ( ${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 )
-
-PATCHES=(
- # Upstream patch
- "${FILESDIR}"/${P}-arm64-relro.patch
-)
-
-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
-
- for FILE in ../debian/extra/exifautotran; do
- cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
-EOF
- done
-
- for FILE in ../debian/extra/*.[0-9]*; do
- cat >> CMakeLists.txt <<EOF || die
-install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
-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; then
- mycmakeargs+=(
- -DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
- )
- 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
-
- 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
-}