public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/pngcrush/
Date: Mon,  8 Mar 2021 10:44:57 +0000 (UTC)	[thread overview]
Message-ID: <1615200288.754fd8465bd589b63a735a00efa67084241788be.marecki@gentoo> (raw)

commit:     754fd8465bd589b63a735a00efa67084241788be
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  8 10:36:30 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Mar  8 10:44:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754fd846

media-gfx/pngcrush: always use system libs

pngcrush comes with bundled libpng-1.6.32 and zlib-1.2.11. The former is
outdated and contains several known security vulnerabilities, the latter
causes build failures on some architectures which standalone sys-libs/zlib
does support. And why do we need bundled libraries for something like this
anyway, especially given it uses two different source tarballs?

Closes: https://bugs.gentoo.org/774417
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/pngcrush/Manifest               |  1 -
 media-gfx/pngcrush/metadata.xml           |  3 ---
 media-gfx/pngcrush/pngcrush-1.8.13.ebuild | 16 +++++-----------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest
index bee32073a42..45e92cecad0 100644
--- a/media-gfx/pngcrush/Manifest
+++ b/media-gfx/pngcrush/Manifest
@@ -1,2 +1 @@
 DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e
-DIST pngcrush-1.8.13.tar.xz 404564 BLAKE2B 6e3e9556b40f5616a488cd4d0fbbe788b31d965b748222383741e9dc0c8fe7c12880b2d2a39ef35aa41adbab1fa9f49e7272dadfbe74cc712a7b810a9787d9af SHA512 5fdb7913ec8c90af63d68477f4031c9008dac0d7f4bfd7bd47e971d218e3ef8b0e1a8bf6ba0f5d2cc4c2682c9297efb4f738b11538ad306eee5d01277ce3f628

diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index 5081ca62df6..fd6dd7f9aac 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/metadata.xml
@@ -13,7 +13,4 @@
 		<bugs-to>https://sourceforge.net/p/pmt/bugs/</bugs-to>
 		<remote-id type="sourceforge">pmt</remote-id>
 	</upstream>
-	<use>
-		<flag name="system-libs">Use libpng and libz provided by system</flag>
-	</use>
 </pkgmetadata>

diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
index a84cc5c727f..ba4efcf233b 100644
--- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
+++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild
@@ -2,29 +2,23 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="Portable Network Graphics (PNG) optimizing utility"
 HOMEPAGE="https://pmt.sourceforge.io/pngcrush/"
-SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz )
-	!system-libs? ( mirror://sourceforge/pmt/${P}.tar.xz )"
+SRC_URI="mirror://sourceforge/pmt/${P}-nolib.tar.xz"
 
 LICENSE="pngcrush"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+system-libs"
 
-RDEPEND="
-	system-libs? (
-		media-libs/libpng:0=
-		sys-libs/zlib:=
-	)"
+RDEPEND="media-libs/libpng:0=
+	sys-libs/zlib:="
 DEPEND="${RDEPEND}
 	app-arch/xz-utils"
 
-pkg_setup() {
-	use system-libs && S+="-nolib"
-}
+S="${WORKDIR}"/${P}-nolib
 
 src_compile() {
 	emake \


             reply	other threads:[~2021-03-08 10:45 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-08 10:44 Marek Szuba [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-11  1:53 [gentoo-commits] repo/gentoo:master commit in: media-gfx/pngcrush/ WANG Xuerui
2021-12-08 10:14 Yixun Lan
2021-07-26  6:24 Sam James
2021-07-25 23:11 Marek Szuba
2021-04-23 13:46 Sam James
2021-03-09 21:31 John Helmert III
2021-03-06 21:38 Sergei Trofimovich
2021-03-06 21:38 Sergei Trofimovich
2021-03-06 21:34 Sergei Trofimovich
2021-03-06 21:34 Sergei Trofimovich
2021-01-06 14:07 Fabian Groffen
2020-06-17 18:48 Marek Szuba
2018-08-19 22:52 Patrice Clement
2018-08-19 22:52 Patrice Clement
2018-06-29 22:11 Tim Harder
2018-06-29 22:11 Tim Harder
2017-08-30  9:39 Lars Wendler
2017-08-01  7:56 Lars Wendler
2017-04-03  8:34 Tim Harder
2017-04-03  8:34 Tim Harder
2017-01-16 10:06 Lars Wendler
2016-12-06  4:53 Tim Harder
2016-12-06  4:53 Tim Harder
2016-10-29 10:53 Lars Wendler
2016-10-29 10:53 Lars Wendler
2016-10-23 22:09 Lars Wendler
2016-10-17  9:05 Lars Wendler
2016-10-17  9:05 Lars Wendler
2016-09-30 16:09 Tim Harder
2016-09-24  2:01 Tim Harder
2016-09-24  2:01 Tim Harder
2016-09-24  2:01 Tim Harder
2016-08-24  3:06 Tim Harder
2016-08-19  3:26 Tim Harder
2016-08-07  2:13 Tim Harder
2016-08-07  2:13 Tim Harder
2016-08-07  2:13 Tim Harder
2016-02-01  5:05 Tim Harder
2016-01-11  4:03 Tim Harder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1615200288.754fd8465bd589b63a735a00efa67084241788be.marecki@gentoo \
    --to=marecki@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox