commit:     c2c8a65fb6252b1c1b974d6a9bdd46a1309d8dd7
Author:     sin-ack <sin-ack <AT> protonmail <DOT> com>
AuthorDate: Sun Dec 29 09:02:09 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 03:54:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c8a65f

x11-libs/libX11: RDEPEND on x11-base/xorg-proto

Without this, source packages fail to build against libX11 when
installed as a binpkg due to missing transitive dependencies.

Closes: https://bugs.gentoo.org/903707
Closes: https://bugs.gentoo.org/947059
Closes: https://bugs.gentoo.org/947999
Closes: https://github.com/gentoo/gentoo/pull/39886
Signed-off-by: sin-ack <sin-ack <AT> protonmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 .../libX11/{libX11-1.8.10.ebuild => libX11-1.8.10-r1.ebuild}     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/x11-libs/libX11/libX11-1.8.10.ebuild 
b/x11-libs/libX11/libX11-1.8.10-r1.ebuild
similarity index 70%
rename from x11-libs/libX11/libX11-1.8.10.ebuild
rename to x11-libs/libX11/libX11-1.8.10-r1.ebuild
index 35d1e55b1484..ccd2a3bec8b1 100644
--- a/x11-libs/libX11/libX11-1.8.10.ebuild
+++ b/x11-libs/libX11/libX11-1.8.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,12 +14,17 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390
 IUSE="test"
 RESTRICT="!test? ( test )"
 
+# HACK: libX11 produces .pc files that depend on xproto.pc. When libX11
+#       is installed as a binpkg, DEPEND packages are not pulled in,
+#       but to build source packages against libX11, xorg-proto is
+#       needed. Until a "build-against-depend" option is available in
+#       ebuilds, we RDEPEND on xproto. See bug #903707 and others.
 RDEPEND="
        >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
        x11-misc/compose-tables
+       x11-base/xorg-proto
 "
 DEPEND="${RDEPEND}
-       x11-base/xorg-proto
        x11-libs/xtrans
 "
 BDEPEND="test? ( dev-lang/perl )"

Reply via email to