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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B77F9139085 for ; Sun, 22 Jan 2017 15:38:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0105F234151; Sun, 22 Jan 2017 15:38:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDE29234151 for ; Sun, 22 Jan 2017 15:38:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7780934165F for ; Sun, 22 Jan 2017 15:38:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19EB32C9B for ; Sun, 22 Jan 2017 15:38:53 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1485099512.fd7524a9b5584c1fa2d8fa0ed209c217bc0dffc7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeimage/Manifest media-libs/freeimage/freeimage-3.15.4.ebuild X-VCS-Directories: media-libs/freeimage/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: fd7524a9b5584c1fa2d8fa0ed209c217bc0dffc7 X-VCS-Branch: master Date: Sun, 22 Jan 2017 15:38:53 +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-Archives-Salt: 49ef6dce-04d5-4fde-a505-7abd323483f0 X-Archives-Hash: bd300412efcb55d6cf610d19e47dc503 commit: fd7524a9b5584c1fa2d8fa0ed209c217bc0dffc7 Author: David Seifert gentoo org> AuthorDate: Sun Jan 22 15:38:32 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 22 15:38:32 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd7524a9 media-libs/freeimage: Remove old Gentoo-bug: 559006, 596350 Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-libs/freeimage/Manifest | 1 - media-libs/freeimage/freeimage-3.15.4.ebuild | 104 --------------------------- 2 files changed, 105 deletions(-) diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest index f29f982..4ca56fd 100644 --- a/media-libs/freeimage/Manifest +++ b/media-libs/freeimage/Manifest @@ -1,3 +1,2 @@ DIST FreeImage3154.pdf 1007480 SHA256 455b0ba7cf571f3fc3027681a70abf3c2321d0a4fd7956c5ba58bd7ccb7b5373 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28 WHIRLPOOL a1e8b575d198b61e74db9eb31e9472460158e86989ed822c156cae3f625f6ea0d156e4b7ddffc8b7a1d16a601be39b4cf0e20558d36bb4dd73195fea4faa43e7 DIST FreeImage3154.zip 5513923 SHA256 eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829 SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc WHIRLPOOL 2747bb7a35d8de24a1a876616626a9e840495f06da836ce15135aafaa21bc1d8d9cece17f7512424b66edfcc521ed096ea85da5ea5b5b90b4c032bf080356b4d -DIST freeimage-3.15.4-libjpeg-turbo.patch.gz 5386 SHA256 e33374db55d1de1f12357138c1a2dac750957c36da9ed6052c1a6084312737a6 SHA512 8b1be0d1b63c5e0dc4f6c841f569929d7a91738c29d86bb3c3f15dd7a5a198bdc5fc6612668ac6ed263674caae1e07520eae003a5adf7395e0539f2820d888f6 WHIRLPOOL 75b8f3486ae9ebf34e7467068b0d93d1a9cc4539e27c6cbb29b617d41459333b0dc263f4003a8d81628922c1fb562452dfa39829eef721898809d40ede9498a9 diff --git a/media-libs/freeimage/freeimage-3.15.4.ebuild b/media-libs/freeimage/freeimage-3.15.4.ebuild deleted file mode 100644 index 3ec8469..00000000 --- a/media-libs/freeimage/freeimage-3.15.4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit toolchain-funcs eutils multilib - -MY_PN=FreeImage -MY_PV=${PV//.} -MY_P=${MY_PN}${MY_PV} - -DESCRIPTION="Image library supporting many formats" -HOMEPAGE="http://freeimage.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip - mirror://sourceforge/${PN}/${MY_P}.pdf - https://dev.gentoo.org/~gienah/2big4tree/media-libs/freeimage/${PN}-3.15.4-libjpeg-turbo.patch.gz" - -LICENSE="|| ( GPL-2 FIPL-1.0 )" -SLOT="0" -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" -IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff" - -# 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:0 ) - mng? ( media-libs/libmng ) - openexr? ( media-libs/openexr ) - png? ( media-libs/libpng:0 ) - raw? ( media-libs/libraw ) - tiff? ( - media-libs/ilmbase - media-libs/tiff:0 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - app-arch/unzip" - -S=${WORKDIR}/${MY_PN} - -src_prepare() { - cd Source - if has_version ">=media-libs/libjpeg-turbo-1.2.1"; then - # Patch from Christian Heimes's fork (thanks) https://bitbucket.org/tiran/freeimageturbo - epatch "${DISTDIR}"/${PN}-3.15.4-libjpeg-turbo.patch.gz - cp LibJPEG/{jpegcomp.h,jpegint.h} . || die - fi - 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 || die - cd .. - 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' \ - Makefile.srcs fipMakefile.srcs || die - sed -i \ - -e "/LibJPEG/d" \ - -e "/LibPNG/d" \ - -e "/LibTIFF/d" \ - -e "/Source\/ZLib/d" \ - -e "/LibOpenJPEG/d" \ - -e "/OpenEXR/d" \ - -e "/LibRawLite/d" \ - -e "/LibMNG/d" \ - Makefile.srcs fipMakefile.srcs || die - epatch "${FILESDIR}"/${PN}-3.15.4-{unbundling,raw}.patch -} - -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) \ - $(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) - dodoc Whatsnew.txt "${DISTDIR}"/${MY_P}.pdf -}