commit: 994f82722e2549e336593c82bbc8b7a5e39c27c7 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Wed Dec 23 14:27:34 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed Dec 23 19:22:30 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994f8272
x11-libs/gtk+: update NLS dependencies for EAPI 7 GTK+ can link against libintl, so that needs to be in RDEPEND and DEPEND. It calls gettext programs, so that needs to be in BDEPEND. Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18781 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/gtk+/gtk+-2.24.32-r1.ebuild | 3 ++- x11-libs/gtk+/gtk+-3.24.24-r1.ebuild | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild index 41109721223..ae8c9dd88fb 100644 --- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild @@ -27,6 +27,7 @@ COMMON_DEPEND=" >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}] >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}] >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}] @@ -49,7 +50,6 @@ COMMON_DEPEND=" ) " DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] !aqua? ( x11-base/xorg-proto ) test? ( media-fonts/font-cursor-misc @@ -83,6 +83,7 @@ BDEPEND=" dev-libs/libxslt dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 + >=sys-devel/gettext-0.18.3 virtual/pkgconfig examples? ( x11-libs/gdk-pixbuf ) " diff --git a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild index 161a79cacb8..a88f574e364 100644 --- a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild @@ -30,16 +30,17 @@ COMMON_DEPEND=" >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-0.9:= >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] + virtual/libintl[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] - >=media-libs/harfbuzz-0.9:= x11-misc/shared-mime-info cloudprint? ( - >=net-libs/rest-0.7[${MULTILIB_USEDEP}] >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] + >=net-libs/rest-0.7[${MULTILIB_USEDEP}] ) colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) @@ -55,21 +56,20 @@ COMMON_DEPEND=" >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] media-libs/mesa[X(+),${MULTILIB_USEDEP}] x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] x11-libs/libXdamage[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) " DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] test? ( - media-fonts/font-misc-misc media-fonts/font-cursor-misc + media-fonts/font-misc-misc ) X? ( x11-base/xorg-proto ) " @@ -94,6 +94,7 @@ BDEPEND=" >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=dev-util/gtk-doc-am-1.20 + >=sys-devel/gettext-0.19.7 virtual/pkgconfig gtk-doc? ( app-text/docbook-xml-dtd:4.3
