From b9e2b7aece96aba716754ee42dba2aca9731adca Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 May 2020 00:16:56 +0100 Subject: x11-libs/gtk+ : change default icon theme --- x11-libs/gtk+/files/gtkrc-2.0 | 2 +- x11-libs/gtk+/files/settings.ini | 2 +- x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild | 298 -------------------------------- x11-libs/gtk+/gtk+-2.24.32-r314.ebuild | 298 ++++++++++++++++++++++++++++++++ x11-libs/gtk+/gtk+-3.24.5-r1337.ebuild | 234 ------------------------- x11-libs/gtk+/gtk+-3.24.5-r314.ebuild | 234 +++++++++++++++++++++++++ 6 files changed, 534 insertions(+), 534 deletions(-) delete mode 100644 x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild create mode 100644 x11-libs/gtk+/gtk+-2.24.32-r314.ebuild delete mode 100644 x11-libs/gtk+/gtk+-3.24.5-r1337.ebuild create mode 100644 x11-libs/gtk+/gtk+-3.24.5-r314.ebuild (limited to 'x11-libs') diff --git a/x11-libs/gtk+/files/gtkrc-2.0 b/x11-libs/gtk+/files/gtkrc-2.0 index b2206dec..8a901076 100644 --- a/x11-libs/gtk+/files/gtkrc-2.0 +++ b/x11-libs/gtk+/files/gtkrc-2.0 @@ -1,5 +1,5 @@ gtk-theme-name="Redcore-daylight" -gtk-icon-theme-name="material-design-light" +gtk-icon-theme-name="Numix-Circle-Light" gtk-font-name="Roboto 9" gtk-cursor-theme-name="Hacked-Red" gtk-cursor-theme-size=0 diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini index 5a2df792..f3ca1890 100644 --- a/x11-libs/gtk+/files/settings.ini +++ b/x11-libs/gtk+/files/settings.ini @@ -1,6 +1,6 @@ [Settings] gtk-theme-name=Redcore-daylight -gtk-icon-theme-name=material-design-light +gtk-icon-theme-name=Numix-Circle-Light gtk-font-name=Roboto 9 gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_ICONS diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild deleted file mode 100644 index dd921c55..00000000 --- a/x11-libs/gtk+/gtk+-2.24.32-r1337.ebuild +++ /dev/null @@ -1,298 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit eutils 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="amd64" - -# 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}] - >=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/libXrender-0.9.8[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] - >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) - ) -" -# docbook-4.1.2 and xsl required for man pages -# docbook-4.3 required for gtk-doc -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - app-text/docbook-xml-dtd:4.3 - dev-libs/libxslt - dev-libs/gobject-introspection-common - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - !aqua? ( x11-base/xorg-proto ) - test? ( - x11-themes/hicolor-icon-theme - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" - -# 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 -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - x11-themes/gtk-engines-adwaita - gnome-base/librsvg[${MULTILIB_USEDEP}] - vim-syntax? ( app-vim/gtk-syntax ) -" - -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() { - insinto /usr/share/gtk-2.0 - newins "${FILESDIR}"/gtkrc-2.0 gtkrc - - 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+-2.24.32-r314.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild new file mode 100644 index 00000000..dd921c55 --- /dev/null +++ b/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild @@ -0,0 +1,298 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit eutils 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="amd64" + +# 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}] + >=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/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}] + xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) + ) +" +# docbook-4.1.2 and xsl required for man pages +# docbook-4.3 required for gtk-doc +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.1.2 + app-text/docbook-xml-dtd:4.3 + dev-libs/libxslt + dev-libs/gobject-introspection-common + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.20 + >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}] + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + !aqua? ( x11-base/xorg-proto ) + test? ( + x11-themes/hicolor-icon-theme + media-fonts/font-misc-misc + media-fonts/font-cursor-misc ) +" + +# 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 +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + x11-themes/gtk-engines-adwaita + gnome-base/librsvg[${MULTILIB_USEDEP}] + vim-syntax? ( app-vim/gtk-syntax ) +" + +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() { + insinto /usr/share/gtk-2.0 + newins "${FILESDIR}"/gtkrc-2.0 gtkrc + + 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.5-r1337.ebuild b/x11-libs/gtk+/gtk+-3.24.5-r1337.ebuild deleted file mode 100644 index bd9020ce..00000000 --- a/x11-libs/gtk+/gtk+-3.24.5-r1337.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit flag-o-matic gnome2 multilib virtualx multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="https://www.gtk.org/" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-20190206.tar.xz" - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="amd64" - -# 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.15[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.53.4:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=media-libs/libepoxy-1.4[X(+)?,${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}] ) - colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) - cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.39:= ) - wayland? ( - >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.12 - media-libs/mesa[wayland,${MULTILIB_USEDEP}] - >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] - ) - X? ( - >=app-accessibility/at-spi2-atk-2.5.3[${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/libXdamage[${MULTILIB_USEDEP}] - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${COMMON_DEPEND} - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.1.2 - dev-libs/libxslt - dev-libs/gobject-introspection-common - >=dev-util/gdbus-codegen-2.48 - dev-util/glib-utils - >=dev-util/gtk-doc-am-1.20 - gtk-doc? ( >=dev-util/gtk-doc-1.20 ) - >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( x11-base/xorg-proto ) - test? ( - media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) -" -# 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 - !