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.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 A725A158093 for ; Sun, 3 Jul 2022 05:33:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ED28FE0C04; Sun, 3 Jul 2022 05:33:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9A312E0C04 for ; Sun, 3 Jul 2022 05:33:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 63B06341D94 for ; Sun, 3 Jul 2022 05:33:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB82850C for ; Sun, 3 Jul 2022 05:33:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1656824974.b9a80a6b3bd48789b4edde44a8fc98009cdb6acd.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeimage/freeimage-3.18.0-r3.ebuild media-libs/freeimage/freeimage-3.18.0-r7.ebuild X-VCS-Directories: media-libs/freeimage/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: b9a80a6b3bd48789b4edde44a8fc98009cdb6acd X-VCS-Branch: master Date: Sun, 3 Jul 2022 05:33:15 +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: 042fe48f-8169-4db8-a79b-46a2d7bf2a48 X-Archives-Hash: aa2b7edc62c59599dca292f2d2478495 commit: b9a80a6b3bd48789b4edde44a8fc98009cdb6acd Author: Ionen Wolkens gentoo org> AuthorDate: Sun Jul 3 05:09:31 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sun Jul 3 05:09:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9a80a6b media-libs/freeimage: drop 3.18.0-r3, 3.18.0-r7 Cleanup now not to block upcoming gentoo.org> media-libs/freeimage/freeimage-3.18.0-r3.ebuild | 121 ----------------------- media-libs/freeimage/freeimage-3.18.0-r7.ebuild | 124 ------------------------ 2 files changed, 245 deletions(-) diff --git a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild b/media-libs/freeimage/freeimage-3.18.0-r3.ebuild deleted file mode 100644 index e0aea4f7eb1b..000000000000 --- a/media-libs/freeimage/freeimage-3.18.0-r3.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edos2unix toolchain-funcs - -MY_PN=FreeImage -MY_PV=${PV//.} -MY_P=${MY_PN}${MY_PV} - -DESCRIPTION="Image library supporting many formats" -HOMEPAGE="https://freeimage.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip - mirror://sourceforge/${PN}/${MY_P}.pdf - https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch" - -LICENSE="|| ( GPL-2 FIPL-1.0 )" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp" - -# The tiff/ilmbase isn't a typo. The TIFF plugin cheats and -# uses code from it to handle 16bit<->float conversions. -RDEPEND=" - sys-libs/zlib - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - mng? ( media-libs/libmng:= ) - openexr? ( media-libs/openexr:0= ) - png? ( media-libs/libpng:0= ) - raw? ( media-libs/libraw:= ) - tiff? ( - media-libs/ilmbase:= - media-libs/tiff:0 - ) - webp? ( media-libs/libwebp:= )" -DEPEND="${RDEPEND}" -BDEPEND=" - app-arch/unzip - virtual/pkgconfig" - -S=${WORKDIR}/${MY_PN} - -DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt ) -PATCHES=( - "${DISTDIR}"/${PN}-3.18.0-unbundling.patch - "${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch - "${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch - "${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch - "${FILESDIR}"/${PN}-3.18.0-raw.patch - "${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch - "${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch - "${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch -) - -src_prepare() { - pushd Source >/dev/null || die - cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die - cp LibTIFF4/{tiffiop,tif_dir}.h . || die - rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die - popd >/dev/null || die - - edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp - sed -i \ - -e "s:/./:/:g" \ - -e "s: ./: :g" \ - -e 's: Source: \\\n\tSource:g' \ - -e 's: Wrapper: \\\n\tWrapper:g' \ - -e 's: Examples: \\\n\tExamples:g' \ - -e 's: TestAPI: \\\n\tTestAPI:g' \ - -e 's: -ISource: \\\n\t-ISource:g' \ - -e 's: -IWrapper: \\\n\t-IWrapper:g' \ - -e 's:INCLS:\nINCLS:g' \ - Makefile.srcs fipMakefile.srcs || die - sed -i \ - -e "/LibJPEG/d" \ - -e "/LibJXR/d" \ - -e "/LibPNG/d" \ - -e "/LibTIFF/d" \ - -e "/Source\/ZLib/d" \ - -e "/LibOpenJPEG/d" \ - -e "/OpenEXR/d" \ - -e "/LibRawLite/d" \ - -e "/LibMNG/d" \ - -e "/LibWebP/d" \ - -e "/LibJXR/d" \ - Makefile.srcs fipMakefile.srcs || die - - default -} - -foreach_make() { - local m - for m in Makefile.{gnu,fip} ; do - emake -f ${m} \ - USE_EXR=$(usex openexr) \ - USE_JPEG=$(usex jpeg) \ - USE_JPEG2K=$(usex jpeg2k) \ - USE_MNG=$(usex mng) \ - USE_PNG=$(usex png) \ - USE_TIFF=$(usex tiff) \ - USE_RAW=$(usex raw) \ - USE_WEBP=$(usex webp) \ - $(usex static-libs '' STATICLIB=) \ - "$@" - done -} - -src_compile() { - tc-export AR PKG_CONFIG - foreach_make \ - CXX="$(tc-getCXX) -fPIC" \ - CC="$(tc-getCC) -fPIC" \ - ${MY_PN} -} - -src_install() { - foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir) - einstalldocs -} diff --git a/media-libs/freeimage/freeimage-3.18.0-r7.ebuild b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild deleted file mode 100644 index 7f916489e378..000000000000 --- a/media-libs/freeimage/freeimage-3.18.0-r7.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit edos2unix toolchain-funcs - -MY_PN=FreeImage -MY_PV=${PV//.} -MY_P=${MY_PN}${MY_PV} - -DESCRIPTION="Image library supporting many formats" -HOMEPAGE="https://freeimage.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip - mirror://sourceforge/${PN}/${MY_P}.pdf - https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch" - -LICENSE="|| ( GPL-2 FIPL-1.0 )" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux" -IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp" - -# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and -# uses code from it to handle 16bit<->float conversions. -RDEPEND=" - sys-libs/zlib - jpeg? ( media-libs/libjpeg-turbo:= ) - jpeg2k? ( media-libs/openjpeg:2= ) - mng? ( media-libs/libmng:= ) - openexr? ( media-libs/openexr:= ) - png? ( media-libs/libpng:0= ) - raw? ( media-libs/libraw:= ) - tiff? ( - >=dev-libs/imath-3.1.4-r2:= - >=media-libs/openexr-3:0= - /dev/null || die - cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die - cp LibTIFF4/{tiffiop,tif_dir}.h . || die - rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die - popd >/dev/null || die - - edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp - sed -i \ - -e "s:/./:/:g" \ - -e "s: ./: :g" \ - -e 's: Source: \\\n\tSource:g' \ - -e 's: Wrapper: \\\n\tWrapper:g' \ - -e 's: Examples: \\\n\tExamples:g' \ - -e 's: TestAPI: \\\n\tTestAPI:g' \ - -e 's: -ISource: \\\n\t-ISource:g' \ - -e 's: -IWrapper: \\\n\t-IWrapper:g' \ - -e 's:INCLS:\nINCLS:g' \ - Makefile.srcs fipMakefile.srcs || die - sed -i \ - -e "/LibJPEG/d" \ - -e "/LibJXR/d" \ - -e "/LibPNG/d" \ - -e "/LibTIFF/d" \ - -e "/Source\/ZLib/d" \ - -e "/LibOpenJPEG/d" \ - -e "/OpenEXR/d" \ - -e "/LibRawLite/d" \ - -e "/LibMNG/d" \ - -e "/LibWebP/d" \ - -e "/LibJXR/d" \ - Makefile.srcs fipMakefile.srcs || die - - default -} - -foreach_make() { - local m - for m in Makefile.{gnu,fip} ; do - emake -f ${m} \ - USE_EXR=$(usex openexr) \ - USE_JPEG=$(usex jpeg) \ - USE_JPEG2K=$(usex jpeg2k) \ - USE_MNG=$(usex mng) \ - USE_PNG=$(usex png) \ - USE_TIFF=$(usex tiff) \ - USE_RAW=$(usex raw) \ - USE_WEBP=$(usex webp) \ - $(usex static-libs '' STATICLIB=) \ - "$@" - done -} - -src_compile() { - tc-export AR PKG_CONFIG - foreach_make \ - CXX="$(tc-getCXX) -fPIC" \ - CC="$(tc-getCC) -fPIC" \ - ${MY_PN} -} - -src_install() { - foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir) - einstalldocs -}