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 10A80158041 for ; Sat, 13 Apr 2024 07:33:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22EFAE2A3A; Sat, 13 Apr 2024 07:33:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 05A2BE2A3A for ; Sat, 13 Apr 2024 07:33:18 +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 1D84C343333 for ; Sat, 13 Apr 2024 07:33:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BFE716D4 for ; Sat, 13 Apr 2024 07:33:15 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1712993540.91b1318ad198df0d7117825a12fb0507346ca557.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/imlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/imlib/imlib-1.9.15-r8.ebuild X-VCS-Directories: media-libs/imlib/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 91b1318ad198df0d7117825a12fb0507346ca557 X-VCS-Branch: master Date: Sat, 13 Apr 2024 07:33: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: e58f803c-06ca-4bea-8983-ac46f4bbe8fa X-Archives-Hash: 58efd42e9fc59937c43c85df56172d1f commit: 91b1318ad198df0d7117825a12fb0507346ca557 Author: Arthur Zamarin gentoo org> AuthorDate: Sat Apr 13 07:30:04 2024 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sat Apr 13 07:32:20 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91b1318a media-libs/imlib: more refactors - use PATCHES - use ver_cut instead of custom version extract - use array for econf args - use "-delete" of find command Signed-off-by: Arthur Zamarin gentoo.org> media-libs/imlib/imlib-1.9.15-r8.ebuild | 42 +++++++++++++++++---------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/media-libs/imlib/imlib-1.9.15-r8.ebuild b/media-libs/imlib/imlib-1.9.15-r8.ebuild index d9d627be63f7..494be1fba26d 100644 --- a/media-libs/imlib/imlib-1.9.15-r8.ebuild +++ b/media-libs/imlib/imlib-1.9.15-r8.ebuild @@ -5,10 +5,9 @@ EAPI=8 inherit autotools multilib-minimal -PVP=(${PV//[-\._]/ }) DESCRIPTION="Image loading and rendering library" HOMEPAGE="https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/" -SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2 +SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.bz2 mirror://gentoo/gtk-1-for-imlib.m4.bz2" LICENSE="GPL-2" @@ -27,33 +26,36 @@ RDEPEND=" " DEPEND="${RDEPEND}" -src_prepare() { - default - +PATCHES=( # Fix aclocal underquoted definition warnings. # Conditionalize gdk functions for bug 40453. # Fix imlib-config for bug 3425. - eapply "${FILESDIR}"/${P}.patch - eapply "${FILESDIR}"/${PN}-security.patch #security #72681 - eapply "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887 - eapply "${FILESDIR}"/${P}-fix-rendering.patch #197489 - eapply "${FILESDIR}"/${P}-asneeded.patch #207638 - eapply "${FILESDIR}"/${P}-libpng15.patch #357167 - eapply "${FILESDIR}"/${P}-underlinking-test.patch #367645 - eapply "${FILESDIR}"/${P}-no-LDFLAGS-in-pc.patch - eapply "${FILESDIR}"/${P}-giflib51-{1,2}.patch #538976 + "${FILESDIR}"/${P}.patch + "${FILESDIR}"/${PN}-security.patch #security #72681 + "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887 + "${FILESDIR}"/${P}-fix-rendering.patch #197489 + "${FILESDIR}"/${P}-asneeded.patch #207638 + "${FILESDIR}"/${P}-libpng15.patch #357167 + "${FILESDIR}"/${P}-underlinking-test.patch #367645 + "${FILESDIR}"/${P}-no-LDFLAGS-in-pc.patch + "${FILESDIR}"/${P}-giflib51-{1,2}.patch #538976 +) - mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4 || die +src_prepare() { + default + mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4 || die AT_M4DIR="m4" eautoreconf } multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --sysconfdir=/etc/imlib \ - $(use_enable static-libs static) \ - --disable-gdk \ + local myeconfargs=( + --sysconfdir=/etc/imlib + $(use_enable static-libs static) + --disable-gdk --disable-gtktest + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install() { @@ -69,5 +71,5 @@ multilib_src_install_all() { # Punt unused files rm -f "${D}"/usr/lib*/pkgconfig/imlibgdk.pc || die - find "${D}" -name '*.la' -exec rm -f {} + || die + find "${D}" -name '*.la' -delete || die }