From 718cefa5e500d2ad28490624a6de038a70afe121 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Tue, 5 Nov 2019 20:32:59 +0100 Subject: [PATCH] media-libs/libpng: Compat slots moved to libpng-compat MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/697820 Signed-off-by: Michał Górny Closes: https://github.com/gentoo/gentoo/pull/13558 Signed-off-by: Michał Górny --- media-libs/libpng/Manifest | 3 -- media-libs/libpng/libpng-1.2.59.ebuild | 41 ------------------ media-libs/libpng/libpng-1.5.30.ebuild | 58 -------------------------- 3 files changed, 102 deletions(-) delete mode 100644 media-libs/libpng/libpng-1.2.59.ebuild delete mode 100644 media-libs/libpng/libpng-1.5.30.ebuild diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest index a2a4982b3ad7..cff7dcacd338 100644 --- a/media-libs/libpng/Manifest +++ b/media-libs/libpng/Manifest @@ -1,5 +1,2 @@ -DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e -DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236 -DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d DIST libpng-1.6.37-apng.patch.gz 10334 BLAKE2B 98660f2c13a78c93f937adf2859447cb0e6fa014b2ef6f0571c910593d94cc0a50137d271dbded0b571a3bc0ce4e9f765be48130ee4ae89884fb7292a1b0cf6e SHA512 a9365257a33d67d7e7284494a37747bb1f3ab89f42a1730f2745c604538f59861828dc91d9bc1d08a5b79ab2f4eef1bb9e438dda1774b3548a1c56be77f8435f DIST libpng-1.6.37.tar.xz 1012272 BLAKE2B 48e8f48a88e0db6fcbc0c0f1a4d5bda6e6c8b03255bacdc60e353256ae41ccc01b5b2a7e0e7b0dea236c53a3b9d1dd89d4bb19445afbebc37bf0f92691452424 SHA512 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074 diff --git a/media-libs/libpng/libpng-1.2.59.ebuild b/media-libs/libpng/libpng-1.2.59.ebuild deleted file mode 100644 index d2562b0303b2..000000000000 --- a/media-libs/libpng/libpng-1.2.59.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# this ebuild is only for the libpng12.so.0 SONAME for ABI compat - -inherit libtool multilib-minimal - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="libpng" -SLOT="1.2" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - !=media-libs/libpng-1.2*:0" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -DOCS="" - -src_prepare() { - default - elibtoolize -} - -multilib_src_configure() { - ECONF_SOURCE=${S} econf --disable-static -} - -multilib_src_compile() { - emake libpng12.la -} - -multilib_src_install() { - newlib.so .libs/libpng12.so.0.* libpng12.so.0 -} diff --git a/media-libs/libpng/libpng-1.5.30.ebuild b/media-libs/libpng/libpng-1.5.30.ebuild deleted file mode 100644 index 2963c5a06bab..000000000000 --- a/media-libs/libpng/libpng-1.5.30.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# this ebuild is only for the libpng15.so.15 SONAME for ABI compat - -inherit eutils libtool multilib-minimal - -DESCRIPTION="Portable Network Graphics library" -HOMEPAGE="http://www.libpng.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz - apng? ( https://dev.gentoo.org/~polynomial-c/${P}-apng.patch.gz )" - -LICENSE="libpng" -SLOT="1.5" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="apng neon" - -RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] - !=media-libs/libpng-1.5*:0" -DEPEND="${RDEPEND} - app-arch/xz-utils" - -DOCS="" - -pkg_setup() { - local _preserved_lib=${EROOT}/usr/$(get_libdir)/libpng15.so.15 - [[ -e ${_preserved_lib} ]] && rm -f "${_preserved_lib}" -} - -src_prepare() { - default - if use apng; then - # fix windows path in patch file. Please check for each release if this can be removed again. - sed 's@scripts\\symbols.def@scripts/symbols.def@' \ - -i "${WORKDIR}"/${PN}-*-apng.patch || die - eapply "${WORKDIR}"/${PN}-*-apng.patch - # Don't execute symbols check with apng patch wrt #378111 - sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die - fi - elibtoolize -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ - --disable-static \ - --enable-arm-neon=$(usex neon) -} - -multilib_src_compile() { - emake libpng15.la -} - -multilib_src_install() { - newlib.so .libs/libpng15.so.15.* libpng15.so.15 -} -- 2.26.2