From d7aeb464901defa191b42f2cb05d02383a66c3cd Mon Sep 17 00:00:00 2001 From: Alfred Wingate Date: Mon, 5 Jan 2026 16:32:10 +0200 Subject: [PATCH] net-print/cups: install pkg-config files for non native abis Bug: https://bugs.gentoo.org/968400 Closes: https://bugs.gentoo.org/960534 Signed-off-by: Alfred Wingate Part-of: https://github.com/gentoo/gentoo/pull/45258 Closes: https://github.com/gentoo/gentoo/pull/45258 Signed-off-by: James Le Cuirot --- .../cups/{cups-2.4.14.ebuild => cups-2.4.14-r1.ebuild} | 7 ++++++- net-print/cups/cups-9999.ebuild | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) rename net-print/cups/{cups-2.4.14.ebuild => cups-2.4.14-r1.ebuild} (98%) diff --git a/net-print/cups/cups-2.4.14.ebuild b/net-print/cups/cups-2.4.14-r1.ebuild similarity index 98% rename from net-print/cups/cups-2.4.14.ebuild rename to net-print/cups/cups-2.4.14-r1.ebuild index b9a9636417b76..d62e2a09231eb 100644 --- a/net-print/cups/cups-2.4.14.ebuild +++ b/net-print/cups/cups-2.4.14-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -230,6 +230,11 @@ multilib_src_install() { emake BUILDROOT="${D}" install else emake BUILDROOT="${D}" install-libs install-headers + + # Manually install pkgconfig file to avoid tangling with duplicate file behavior + insinto /usr/$(get_libdir)/pkgconfig + doins cups.pc + dobin cups-config fi } diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 1d52317feaf84..56c63be3d4e47 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -230,6 +230,11 @@ multilib_src_install() { emake BUILDROOT="${D}" install else emake BUILDROOT="${D}" install-libs install-headers + + # Manually install pkgconfig file to avoid tangling with duplicate file behavior + insinto /usr/$(get_libdir)/pkgconfig + doins cups.pc + dobin cups-config fi }