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 06835158020 for ; Sun, 25 Dec 2022 21:50:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C971E087A; Sun, 25 Dec 2022 21:50:22 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 4D7ACE087A for ; Sun, 25 Dec 2022 21:50:22 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E45E340C08 for ; Sun, 25 Dec 2022 21:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47C186F2 for ; Sun, 25 Dec 2022 21:50:19 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1672004981.ae451481404fffd2efe7cee69f13d511c22dfab4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libpng-compat/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild media-libs/libpng-compat/libpng-compat-1.2.59.ebuild media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild media-libs/libpng-compat/libpng-compat-1.5.30.ebuild X-VCS-Directories: media-libs/libpng-compat/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ae451481404fffd2efe7cee69f13d511c22dfab4 X-VCS-Branch: master Date: Sun, 25 Dec 2022 21:50:19 +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: 3c93948b-5cba-41dc-8d9a-87b6cf0338b2 X-Archives-Hash: 25e2c2a4c9608d154cffdf63aa7d78b1 commit: ae451481404fffd2efe7cee69f13d511c22dfab4 Author: Sam James gentoo org> AuthorDate: Sun Dec 25 21:49:41 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 25 21:49:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae451481 media-libs/libpng-compat: EAPI 8 Signed-off-by: Sam James gentoo.org> ....2.59.ebuild => libpng-compat-1.2.59-r1.ebuild} | 25 ++++++++++++---------- ....5.30.ebuild => libpng-compat-1.5.30-r1.ebuild} | 16 ++++++++------ 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild b/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild similarity index 58% rename from media-libs/libpng-compat/libpng-compat-1.2.59.ebuild rename to media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild index 4fa1efb0d889..f3cad8bf0993 100644 --- a/media-libs/libpng-compat/libpng-compat-1.2.59.ebuild +++ b/media-libs/libpng-compat/libpng-compat-1.2.59-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -# this ebuild is only for the libpng12.so.0 SONAME for ABI compat +# This ebuild is only for the libpng12.so.0 SONAME for ABI compat inherit libtool multilib-minimal @@ -11,27 +11,30 @@ MY_P=libpng-${PV} DESCRIPTION="Portable Network Graphics library" HOMEPAGE="http://www.libpng.org/" SRC_URI="mirror://sourceforge/libpng/${MY_P}.tar.xz" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}"/${MY_P} LICENSE="libpng" SLOT="1.2" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="" -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - !=media-libs/libpng-1.2*" -DEPEND="${RDEPEND} - app-arch/xz-utils" +RDEPEND=" + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] + !=media-libs/libpng-1.2* +" +DEPEND="${RDEPEND}" -DOCS="" +# Don't install any docs here because we're literally just installing the +# old library for compatibility. Use libpng for the full contents. +DOCS=() src_prepare() { default + elibtoolize } multilib_src_configure() { - ECONF_SOURCE=${S} econf --disable-static + ECONF_SOURCE="${S}" econf } multilib_src_compile() { diff --git a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild b/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild similarity index 83% rename from media-libs/libpng-compat/libpng-compat-1.5.30.ebuild rename to media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild index a906a0b68259..ba986eb8c9c0 100644 --- a/media-libs/libpng-compat/libpng-compat-1.5.30.ebuild +++ b/media-libs/libpng-compat/libpng-compat-1.5.30-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# this ebuild is only for the libpng15.so.15 SONAME for ABI compat +# This ebuild is only for the libpng15.so.15 SONAME for ABI compat inherit libtool multilib-minimal @@ -18,10 +18,11 @@ SLOT="1.5" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="cpu_flags_arm_neon" -RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] - !=media-libs/libpng-1.5*" +RDEPEND=" + sys-libs/zlib:=[${MULTILIB_USEDEP}] + !=media-libs/libpng-1.5* +" DEPEND="${RDEPEND}" -BDEPEND="app-arch/xz-utils" # Don't install any docs here because we're literally just installing the # old library for compatibility. Use libpng for the full contents. @@ -34,14 +35,15 @@ pkg_setup() { src_prepare() { default + elibtoolize } multilib_src_configure() { local myeconfargs=( - --disable-static $(use_enable cpu_flags_arm_neon arm-neon check) ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" }