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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DCEE215808B for ; Mon, 30 Sep 2024 00:25:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F26CEE2A4D; Mon, 30 Sep 2024 00:25:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 D0869E2A4D for ; Mon, 30 Sep 2024 00:25:48 +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 D823C343057 for ; Mon, 30 Sep 2024 00:25:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 213BBC36 for ; Mon, 30 Sep 2024 00:25:45 +0000 (UTC) From: "Eli Schwartz" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Eli Schwartz" Message-ID: <1727655898.383279c3b3c2673e87f1b87bd4f84f534b955d78.eschwartz@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/libppd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/libppd/libppd-2.1_beta1-r1.ebuild net-print/libppd/libppd-2.1_beta1.ebuild X-VCS-Directories: net-print/libppd/ X-VCS-Committer: eschwartz X-VCS-Committer-Name: Eli Schwartz X-VCS-Revision: 383279c3b3c2673e87f1b87bd4f84f534b955d78 X-VCS-Branch: master Date: Mon, 30 Sep 2024 00:25:45 +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: 83c885f7-bad3-4a76-a295-d1aa8a4b26cc X-Archives-Hash: b432f0f5ac4e8203b93512da5455d7b4 commit: 383279c3b3c2673e87f1b87bd4f84f534b955d78 Author: Eli Schwartz gentoo org> AuthorDate: Mon Sep 30 00:18:13 2024 +0000 Commit: Eli Schwartz gentoo org> CommitDate: Mon Sep 30 00:24:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383279c3 net-print/libppd: Reapply "make sure elibtoolize is applied" This reapplies commit 9b9b76458658558db32f55c4a608e8bc6ce97751. In commit 7be0a28087f6666aeba8065c639ddc7ea2316fa6, we temporarily moved from elibtoolize to eautoreconf due to applying a patch to Makefile.am, and later in commit 7eba3af91f1fd96ebb7491890479e7aef6c649ac we imported a new release that had that patch applied and instead of reverting to the elibtoolize, the entire src_prepare was dropped altogether. The original reason for making sure elibtoolize is applied, remains valid, so restore that. Signed-off-by: Eli Schwartz gentoo.org> net-print/libppd/libppd-2.1_beta1-r1.ebuild | 7 +++++++ net-print/libppd/libppd-2.1_beta1.ebuild | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/net-print/libppd/libppd-2.1_beta1-r1.ebuild b/net-print/libppd/libppd-2.1_beta1-r1.ebuild index c70af2d7b9da..29d10e2d9447 100644 --- a/net-print/libppd/libppd-2.1_beta1-r1.ebuild +++ b/net-print/libppd/libppd-2.1_beta1-r1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit libtool + DESCRIPTION="Legacy library for PPD files, split out of cups-filters" HOMEPAGE="https://github.com/OpenPrinting/libppd" SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV/_beta/b}/${P/_beta/b}.tar.xz" @@ -35,6 +37,11 @@ PATCHES=( "${FILESDIR}"/${P}-CVE-2024-47175.patch ) +src_prepare() { + default + elibtoolize +} + src_configure() { local myeconfargs=( --localstatedir="${EPREFIX}"/var diff --git a/net-print/libppd/libppd-2.1_beta1.ebuild b/net-print/libppd/libppd-2.1_beta1.ebuild index facbdf57cdc0..577c98a38e63 100644 --- a/net-print/libppd/libppd-2.1_beta1.ebuild +++ b/net-print/libppd/libppd-2.1_beta1.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit libtool + DESCRIPTION="Legacy library for PPD files, split out of cups-filters" HOMEPAGE="https://github.com/OpenPrinting/libppd" SRC_URI="https://github.com/OpenPrinting/libppd/releases/download/${PV/_beta/b}/${P/_beta/b}.tar.xz" @@ -31,6 +33,11 @@ BDEPEND=" virtual/pkgconfig " +src_prepare() { + default + elibtoolize +} + src_configure() { local myeconfargs=( --localstatedir="${EPREFIX}"/var