commit: 3fdfdfc56addeaf8e66a836b6440711cedf2cf97 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon May 31 00:03:38 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon May 31 01:58:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdfdfc5
x11-libs/gtk+: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-libs/gtk+/Manifest | 4 - x11-libs/gtk+/gtk+-2.24.32-r1.ebuild | 308 ----------------------------------- x11-libs/gtk+/gtk+-3.24.26.ebuild | 254 ----------------------------- x11-libs/gtk+/gtk+-3.24.28.ebuild | 254 ----------------------------- 4 files changed, 820 deletions(-) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index 95dc8f878f0..c0d90bc5689 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -1,6 +1,2 @@ -DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858 -DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5 -DIST gtk+-3.24.26.tar.xz 21404732 BLAKE2B 8260b684b4d508af6b9a5060e47847254ae6bf647ae1dfa131bdbb35f2eaeb3f45ba749e9ad6e1920c05dab660d78424e38d974070928c56e91fc422a62d87db SHA512 d3023e9cd0c1f0de384266c4bd4549a7006ff475de82617de16378617a4a669645ad355cbabfe2ff43b19dddfbba7b9413ec98c14ed0f5ee3a61466b3d6eff76 -DIST gtk+-3.24.28.tar.xz 22783312 BLAKE2B b0a8dd5619feacf44880bb1ef168fce5431802c401fbb31408a4a4a9822755ca76cc309eb0f271e98cce63ad7f5cbec4d0d6c947a631843bfbe509a81836778b SHA512 65856ae06e4a863c56b3718c0cc3d0ca9f61a62a02ddef30904432300cd455851efee3fa1e5661659eaacbdfca45650ee7c8a2d4eca004ad2936c1e26c720c15 DIST gtk+-3.24.29.tar.xz 21396876 BLAKE2B 1675e54b185d813965a6279fa80a62784fc6216408710fad0b07a3300eb08301c80779e6e3a6b1109ce29bacca4e7ff4710b670a68ec0c6ffa68e44cfb07ccc5 SHA512 00f71024686c2d11d5c0cdd683365c35fe4d28b5eaad4937e79690777500788818faa5bd0c483e54ba8ce734aa6411388a39e398dc638cfcf0ec0e542aae6c2b diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild deleted file mode 100644 index 314ce203961..00000000000 --- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME2_EAUTORECONF="yes" - -inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/"; -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz"; - -LICENSE="LGPL-2+" -SLOT="2" -IUSE="aqua cups examples +introspection test vim-syntax xinerama" -REQUIRED_USE=" - xinerama? ( !aqua ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1 -RESTRICT="test" - -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}] - x11-misc/shared-mime-info - - cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) - !aqua? ( - >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - !aqua? ( x11-base/xorg-proto ) - test? ( - media-fonts/font-cursor-misc - media-fonts/font-misc-misc - x11-themes/hicolor-icon-theme - ) -" - -# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0 -# Add blocker against old gtk-builder-convert to be sure we maintain both -# in sync. -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-2 - >=x11-themes/adwaita-icon-theme-3.14 - x11-themes/gnome-themes-standard - !<dev-util/gtk-builder-convert-${PV} -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - gnome-base/librsvg[${MULTILIB_USEDEP}] - x11-themes/gtk-engines-adwaita - vim-syntax? ( app-vim/gtk-syntax ) -" -# docbook-4.1.2 and xsl required for man pages -# docbook-4.3 required for gtk-doc -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xml-dtd:4.3 - app-text/docbook-xsl-stylesheets - dev-libs/gobject-introspection-common - 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 ) -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default, -edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following: -[Filechooser Settings] -StartupMode=cwd" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-2.0$(get_exeext) -) - -PATCHES=( - # Fix tests running when building out of sources, bug #510596, upstream bug #730319 - "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch - # Rely on split gtk-update-icon-cache package, bug #528810 - "${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf - # Upstream gtk-2-24 branch up to 2018-09-08 state, bug #650536 safety - "${WORKDIR}"/patches/ # requires eautoreconf -) - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -set_gtk2_confdir() { - # An arch specific config directory is used on multilib systems - GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}" -} - -src_prepare() { - # Various glib marshaller churn could break build against a different glib version, force regeneration - rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \ - perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die - - # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150 - strip_builddir SUBDIRS tutorial docs/Makefile.{am,in} - strip_builddir SUBDIRS faq docs/Makefile.{am,in} - - # -O3 and company cause random crashes in applications, bug #133469 - replace-flags -O3 -O2 - strip-flags - - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS tests Makefile.{am,in} - strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in} - else - # Non-working test in gentoo's env - sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \ - -i gtk/tests/testing.c || die "sed 1 failed" - - # Cannot work because glib is too clever to find real user's home - # gentoo bug #285687, upstream bug #639832 - # XXX: /!\ Pay extra attention to second sed when bumping /!\ - sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \ - || die "failed to disable recentmanager test (1)" - sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \ - || die "failed to disable recentmanager test (2)" - sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \ - || die "failed to disable recentmanager test (3)" - - # https://bugzilla.gnome.org/show_bug.cgi?id=617473 - sed -i -e 's:pltcheck.sh:$(NULL):g' \ - gtk/Makefile.am || die - - # UI tests require immodules already installed; bug #413185 - if ! has_version 'x11-libs/gtk+:2'; then - ewarn "Disabling UI tests because this is the first install of" - ewarn "gtk+:2 on this machine. Please re-run the tests after ${P}" - ewarn "has been installed." - sed '/g_test_add_func.*ui-tests/ d' \ - -i gtk/tests/testing.c || die "sed 2 failed" - fi - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.{am,in} - fi - - gnome2_src_prepare -} - -multilib_src_configure() { - [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc - - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \ - $(usex aqua "" --with-xinput) \ - $(use_enable cups cups auto) \ - $(multilib_native_use_enable introspection) \ - $(use_enable xinerama) \ - --disable-papi \ - --enable-man \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in gdk gtk libgail-util; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - virtx emake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - # see bug #133241 - # Also set more default variables in sync with gtk3 and other distributions - insinto /usr/share/gtk-2.0 - newins - gtkrc <<- 'EOF' - gtk-fallback-icon-theme = "gnome" - gtk-theme-name = "Adwaita" - gtk-icon-theme-name = "Adwaita" - gtk-cursor-theme-name = "Adwaita" - EOF - - einstalldocs - - # dev-util/gtk-builder-convert split off into a separate package, #402905 - rm "${ED}"/usr/bin/gtk-builder-convert || die - rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die - - readme.gentoo_create_doc -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make immodules.cache belongs to gtk+ alone - local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - - if [[ -e "${EROOT}${cache}" ]]; then - cp "${EROOT}${cache}" "${ED}${cache}" || die - else - touch "${ED}${cache}" || die - fi - } - multilib_parallel_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_query_immodules_gtk2 \ - || die "Update immodules cache failed (for ${ABI})" - } - multilib_parallel_foreach_abi multilib_pkg_postinst - - set_gtk2_confdir - - if [ -e "${EROOT}/etc/gtk-2.0/gtk.immodules" ]; then - elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST" - elog "aware location. Removing deprecated file." - rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules" - fi - - if [ -e "${EROOT}${GTK2_CONFDIR}/gtk.immodules" ]; then - elog "File /etc/gtk-2.0/gtk.immodules has been moved to" - elog "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - elog "Removing deprecated file." - rm -f "${EROOT}${GTK2_CONFDIR}/gtk.immodules" - fi - - # pixbufs are now handled by x11-libs/gdk-pixbuf - if [ -e "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then - elog "File ${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" - elog "Removing deprecated file." - rm -f "${EROOT}${GTK2_CONFDIR}/gdk-pixbuf.loaders" - fi - - # two checks needed since we dropped multilib conditional - if [ -e "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then - elog "File ${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf" - elog "Removing deprecated file." - rm -f "${EROOT}/etc/gtk-2.0/gdk-pixbuf.loaders" - fi - - if [ -e "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* ]; then - elog "You need to rebuild ebuilds that installed into" "${EROOT}"/usr/lib/gtk-2.0/2.[^1]* - elog "to do that you can use qfile from portage-utils:" - elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)" - fi - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your gtkrc." - fi - - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - } - multilib_foreach_abi multilib_pkg_postrm - fi -} diff --git a/x11-libs/gtk+/gtk+-3.24.26.ebuild b/x11-libs/gtk+/gtk+-3.24.26.ebuild deleted file mode 100644 index 38265afc5a0..00000000000 --- a/x11-libs/gtk+/gtk+-3.24.26.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 multilib multilib-minimal virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 -RESTRICT="test" - -# FIXME: introspection data is built against system installation of gtk+:3, -# bug #???? -COMMON_DEPEND=" - >=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}] - >=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}] - x11-misc/shared-mime-info - - cloudprint? ( - >=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}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.17 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] - media-libs/mesa[X(+),${MULTILIB_USEDEP}] - x11-libs/libX11[${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} - test? ( - media-fonts/font-cursor-misc - media-fonts/font-misc-misc - ) - X? ( x11-base/xorg-proto ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !<gnome-base/gail-1000 - !<x11-libs/vte-0.31.0:2.90 -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - gnome-base/librsvg[${MULTILIB_USEDEP}] - >=x11-themes/adwaita-icon-theme-3.14 - vim-syntax? ( app-vim/gtk-syntax ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xsl-stylesheets - dev-libs/gobject-introspection-common - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - wayland? ( dev-util/wayland-scanner ) - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - gtk-doc? ( - app-text/docbook-xml-dtd:4.3 - >=dev-util/gtk-doc-1.20 - ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-3.0$(get_exeext) -) - -PATCHES=( - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch - - # Fix broken autotools logic - "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch -) - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -src_prepare() { - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} - - # the tests dir needs to be build now because since commit - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.{am,in} - strip_builddir SRC_SUBDIRS examples Makefile.{am,in} - fi - - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=( - $(use_enable aqua quartz-backend) - $(use_enable broadway broadway-backend) - $(use_enable cloudprint) - $(use_enable colord) - $(use_enable cups cups auto) - $(multilib_native_use_enable gtk-doc) - $(multilib_native_use_enable introspection) - $(use_enable sysprof profiler) - $(use_enable wayland wayland-backend) - $(use_enable X x11-backend) - $(use_enable X xcomposite) - $(use_enable X xdamage) - $(use_enable X xfixes) - $(use_enable X xkb) - $(use_enable X xrandr) - $(use_enable xinerama) - # cloudprovider is not packaged in Gentoo yet - --disable-cloudproviders - --disable-papi - --enable-man - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - # TODO: Is this still the case? - --libdir="${EPREFIX}"/usr/$(get_libdir) - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" - ) - - if use wayland; then - myconf+=( - # Include wayland immodule into gtk itself, to avoid problems like - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a - # user overridden GTK_IM_MODULE envvar - --with-included-immodules=wayland - ) - fi; - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in gdk gtk libgail-util; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - # Skip README.{in,commits,win32} that would get installed by default - DOCS=( AUTHORS ChangeLog NEWS README ) - einstalldocs -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make immodules.cache belongs to gtk+ alone - local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}${cache}" "${ED}${cache}" || die - else - touch "${ED}${cache}" || die - fi - } - multilib_parallel_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_query_immodules_gtk3 \ - || die "Update immodules cache failed (for ${ABI})" - } - multilib_parallel_foreach_abi multilib_pkg_postinst - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your settings.ini file." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - } - multilib_foreach_abi multilib_pkg_postrm - fi -} diff --git a/x11-libs/gtk+/gtk+-3.24.28.ebuild b/x11-libs/gtk+/gtk+-3.24.28.ebuild deleted file mode 100644 index 54b60dc29ad..00000000000 --- a/x11-libs/gtk+/gtk+-3.24.28.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME2_EAUTORECONF="yes" - -inherit gnome2 multilib multilib-minimal virtualx - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# Upstream wants us to do their job: -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 -RESTRICT="test" - -# FIXME: introspection data is built against system installation of gtk+:3, -# bug #???? -COMMON_DEPEND=" - >=dev-libs/atk-2.32.0[introspection?,${MULTILIB_USEDEP}] - >=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}] - x11-misc/shared-mime-info - - cloudprint? ( - >=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}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.17 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] - media-libs/mesa[X(+),${MULTILIB_USEDEP}] - x11-libs/libX11[${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} - test? ( - media-fonts/font-cursor-misc - media-fonts/font-misc-misc - ) - X? ( x11-base/xorg-proto ) -" -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !<x11-libs/vte-0.31.0:2.90 -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - gnome-base/librsvg[${MULTILIB_USEDEP}] - >=x11-themes/adwaita-icon-theme-3.14 - vim-syntax? ( app-vim/gtk-syntax ) -" -BDEPEND=" - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xsl-stylesheets - dev-libs/gobject-introspection-common - dev-libs/libxslt - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - wayland? ( dev-util/wayland-scanner ) - >=sys-devel/gettext-0.19.7 - virtual/pkgconfig - x11-libs/gdk-pixbuf:2 - gtk-doc? ( - app-text/docbook-xml-dtd:4.3 - >=dev-util/gtk-doc-1.20 - ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-3.0$(get_exeext) -) - -PATCHES=( - # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache - "${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch - - # Fix broken autotools logic - "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch -) - -strip_builddir() { - local rule=$1 - shift - local directory=$1 - shift - sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ - || die "Could not strip director ${directory} from build." -} - -src_prepare() { - if ! use test ; then - # don't waste time building tests - strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} - - # the tests dir needs to be build now because since commit - # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there - # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} - fi - - if ! use examples; then - # don't waste time building demos - strip_builddir SRC_SUBDIRS demos Makefile.{am,in} - strip_builddir SRC_SUBDIRS examples Makefile.{am,in} - fi - - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=( - $(use_enable aqua quartz-backend) - $(use_enable broadway broadway-backend) - $(use_enable cloudprint) - $(use_enable colord) - $(use_enable cups cups auto) - $(multilib_native_use_enable gtk-doc) - $(multilib_native_use_enable introspection) - $(use_enable sysprof profiler) - $(use_enable wayland wayland-backend) - $(use_enable X x11-backend) - $(use_enable X xcomposite) - $(use_enable X xdamage) - $(use_enable X xfixes) - $(use_enable X xkb) - $(use_enable X xrandr) - $(use_enable xinerama) - # cloudprovider is not packaged in Gentoo yet - --disable-cloudproviders - --disable-papi - --enable-man - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - # TODO: Is this still the case? - --libdir="${EPREFIX}"/usr/$(get_libdir) - CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" - ) - - if use wayland; then - myconf+=( - # Include wayland immodule into gtk itself, to avoid problems like - # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a - # user overridden GTK_IM_MODULE envvar - --with-included-immodules=wayland - ) - fi; - - ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in gdk gtk libgail-util; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - # Skip README.{in,commits,win32} that would get installed by default - DOCS=( AUTHORS ChangeLog NEWS README ) - einstalldocs -} - -pkg_preinst() { - gnome2_pkg_preinst - - multilib_pkg_preinst() { - # Make immodules.cache belongs to gtk+ alone - local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}${cache}" "${ED}${cache}" || die - else - touch "${ED}${cache}" || die - fi - } - multilib_parallel_foreach_abi multilib_pkg_preinst -} - -pkg_postinst() { - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_query_immodules_gtk3 \ - || die "Update immodules cache failed (for ${ABI})" - } - multilib_parallel_foreach_abi multilib_pkg_postinst - - if ! has_version "app-text/evince"; then - elog "Please install app-text/evince for print preview functionality." - elog "Alternatively, check \"gtk-print-preview-command\" documentation and" - elog "add it to your settings.ini file." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" - } - multilib_foreach_abi multilib_pkg_postrm - fi -}
