Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/
Date: Thu, 10 Jun 2021 18:58:25
Message-Id: 1623351488.5bf03b2718932a7be422b60d571aeb5401c69720.sam@gentoo
1 commit: 5bf03b2718932a7be422b60d571aeb5401c69720
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 10 18:58:08 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 10 18:58:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf03b27
7
8 media-libs/libjpeg-turbo: drop 2.0.6
9
10 Bug: https://bugs.gentoo.org/787422
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 media-libs/libjpeg-turbo/Manifest | 1 -
14 .../libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild | 118 ---------------------
15 2 files changed, 119 deletions(-)
16
17 diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
18 index d27df442fc0..ee7ab1228b8 100644
19 --- a/media-libs/libjpeg-turbo/Manifest
20 +++ b/media-libs/libjpeg-turbo/Manifest
21 @@ -1,4 +1,3 @@
22 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
23 -DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c
24 DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
25 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
26
27 diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
28 deleted file mode 100644
29 index 321276ccaa9..00000000000
30 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
31 +++ /dev/null
32 @@ -1,118 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -CMAKE_ECLASS=cmake
39 -inherit cmake-multilib java-pkg-opt-2
40 -
41 -DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
42 -HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/"
43 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
44 - mirror://gentoo/libjpeg8_8d-2.debian.tar.gz"
45 -
46 -LICENSE="BSD IJG ZLIB"
47 -SLOT="0/0.2"
48 -if [[ "$(ver_cut 3)" -lt 90 ]] ; then
49 - 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"
50 -fi
51 -IUSE="java static-libs"
52 -
53 -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
54 -
55 -COMMON_DEPEND="!media-libs/jpeg:0
56 - !media-libs/jpeg:62"
57 -
58 -BDEPEND=">=dev-util/cmake-3.16.5
59 - amd64? ( ${ASM_DEPEND} )
60 - x86? ( ${ASM_DEPEND} )
61 - amd64-fbsd? ( ${ASM_DEPEND} )
62 - x86-fbsd? ( ${ASM_DEPEND} )
63 - amd64-linux? ( ${ASM_DEPEND} )
64 - x86-linux? ( ${ASM_DEPEND} )
65 - x64-macos? ( ${ASM_DEPEND} )
66 - x64-cygwin? ( ${ASM_DEPEND} )"
67 -
68 -DEPEND="${COMMON_DEPEND}
69 - java? ( >=virtual/jdk-1.5 )"
70 -
71 -RDEPEND="${COMMON_DEPEND}
72 - java? ( >=virtual/jre-1.5 )"
73 -
74 -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
75 -
76 -src_prepare() {
77 - local FILE
78 - ln -snf ../debian/extra/*.c . || die
79 -
80 - for FILE in ../debian/extra/*.c; do
81 - FILE=${FILE##*/}
82 - cat >> CMakeLists.txt <<EOF || die
83 -add_executable(${FILE%.c} ${FILE})
84 -install(TARGETS ${FILE%.c})
85 -EOF
86 - done
87 -
88 - for FILE in ../debian/extra/exifautotran; do
89 - cat >> CMakeLists.txt <<EOF || die
90 -install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR})
91 -EOF
92 - done
93 -
94 - for FILE in ../debian/extra/*.[0-9]*; do
95 - cat >> CMakeLists.txt <<EOF || die
96 -install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.})
97 -EOF
98 - done
99 -
100 - #default
101 -
102 - cmake_src_prepare
103 - java-pkg-opt-2_src_prepare
104 -}
105 -
106 -multilib_src_configure() {
107 - if multilib_is_native_abi && use java ; then
108 - export JAVACFLAGS="$(java-pkg_javac-args)"
109 - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
110 - fi
111 -
112 - local mycmakeargs=(
113 - -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
114 - -DENABLE_STATIC="$(usex static-libs)"
115 - -DWITH_JAVA="$(multilib_native_usex java)"
116 - -DWITH_MEM_SRCDST=ON
117 - )
118 -
119 - # bug #420239, bug #723800
120 - [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DWITH_SIMD=OFF )
121 -
122 - # mostly for Prefix, ensure that we use our yasm if installed and
123 - # not pick up host-provided nasm
124 - has_version dev-lang/yasm && ! has_version dev-lang/nasm && \
125 - mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) )
126 -
127 - cmake_src_configure
128 -}
129 -
130 -multilib_src_install() {
131 - cmake_src_install
132 -
133 - if multilib_is_native_abi && use java ; then
134 - rm -rf "${ED}"/usr/classes || die
135 - java-pkg_dojar java/turbojpeg.jar
136 - fi
137 -}
138 -
139 -multilib_src_install_all() {
140 - find "${ED}" -type f -name '*.la' -delete || die
141 -
142 - docinto html
143 - dodoc -r "${S}"/doc/html/*
144 - newdoc "${WORKDIR}"/debian/changelog changelog.debian
145 - if use java; then
146 - docinto html/java
147 - dodoc -r "${S}"/java/doc/*
148 - newdoc "${S}"/java/README README.java
149 - fi
150 -}