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 DC5F81382C5 for ; Tue, 26 Jan 2021 17:21:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 231BDE0C9F; Tue, 26 Jan 2021 17:21:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A063E0C9F for ; Tue, 26 Jan 2021 17:21:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A56FD340D23 for ; Tue, 26 Jan 2021 17:21:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29BF332B for ; Tue, 26 Jan 2021 17:21:15 +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: <1611681671.2e15facc8941344ea63c3089eb3b3d63fd636041.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gd/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/gd/gd-2.3.0.ebuild X-VCS-Directories: media-libs/gd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2e15facc8941344ea63c3089eb3b3d63fd636041 X-VCS-Branch: master Date: Tue, 26 Jan 2021 17:21: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: 93dd6a1d-b444-46ed-932d-ca6d81d05d72 X-Archives-Hash: e4a4fa0ada1f319cd5d21a2633dfec64 commit: 2e15facc8941344ea63c3089eb3b3d63fd636041 Author: Sam James gentoo org> AuthorDate: Tue Jan 26 17:20:27 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jan 26 17:21:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e15facc media-libs/gd: enable jpeg, png by default * Default change matches upstream defaults (libpng and libjpeg are on most systems anyway, and dependencies of media-libs/gd often enable one or both of these flags). * Needed for tests and mark this in REQUIRED_USE. Closes: https://bugs.gentoo.org/767313 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> media-libs/gd/gd-2.3.0.ebuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/media-libs/gd/gd-2.3.0.ebuild b/media-libs/gd/gd-2.3.0.ebuild index 04480d159c3..4824a477708 100644 --- a/media-libs/gd/gd-2.3.0.ebuild +++ b/media-libs/gd/gd-2.3.0.ebuild @@ -8,16 +8,21 @@ inherit autotools flag-o-matic multilib-minimal DESCRIPTION="Graphics library for fast image creation" HOMEPAGE="https://libgd.org/ https://www.boutell.com/gd/" SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz" +S="${WORKDIR}/lib${P}" LICENSE="gd IJG HPND BSD" SLOT="2/3" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="cpu_flags_x86_sse fontconfig jpeg png static-libs test tiff truetype webp xpm zlib" +IUSE="cpu_flags_x86_sse fontconfig +jpeg +png static-libs test tiff truetype webp xpm zlib" RESTRICT="!test? ( test )" # fontconfig has prefixed font paths, details see bug #518970 -REQUIRED_USE="prefix? ( fontconfig )" +REQUIRED_USE=" + prefix? ( fontconfig ) + test? ( png ) +" +BDEPEND="virtual/pkgconfig" RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) @@ -26,10 +31,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/lib${P}" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-2.3.0-disable-flaky-tests.patch"