diff options
Diffstat (limited to 'x11-libs/gtk+')
-rw-r--r-- | x11-libs/gtk+/Manifest | 4 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-2.24.32-r1.ebuild | 106 | ||||
-rw-r--r-- | x11-libs/gtk+/gtk+-3.24.24-r1.ebuild | 19 |
3 files changed, 66 insertions, 63 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index b9d4bb6c0277..104156f708df 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -9,9 +9,9 @@ DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169 DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556 DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2 DIST gtk+-3.24.24.tar.xz 21341240 BLAKE2B a48024c008061b7e9c6ce8fe787e6c2f734923f5f17f818d2284afa6ea9ac080a55d358afcd0b73f3a124d57959c7a07a90c479b784fc881a3c9a0b9e354454f SHA512 f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520 -EBUILD gtk+-2.24.32-r1.ebuild 9957 BLAKE2B 9f5b89755fa452b5b2ca075093f703b1ca0e904de6848a24644a5662bbfe0edd1dad0d1a4732e268d7878a2702b4432a39ed22f33b6c45f44e4fffd0e7dc648f SHA512 e8f2dc31fa4ba63128bad6f2b7130a872344d86562d38675011661baff8cf16c56efe375933b5ef67d33555dca2ea963b54d66827a179132cd56532b77974a89 +EBUILD gtk+-2.24.32-r1.ebuild 9845 BLAKE2B e51de287f4974827d39b0b99e71dd1bd69143534d1b9bc14113cdbef1dd3ee61b77b5360ce7f2aa945dbe3f4a448ec660cff78cf6423628a6552b159341933c3 SHA512 a71b554a0a50dcbbbf1f9fcb8711ec5b066f5ad0b68fa9fc6c8bcac6fbbb660b3eb9f0b482d4ba3a10b0d18516c780900b82a98bc2c65504f1e3097d26c532ea EBUILD gtk+-3.24.20.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046 EBUILD gtk+-3.24.22.ebuild 7267 BLAKE2B 14118fd199adbe0538854f9052864eadd94c10d42a5ec467c5820ea267d22994b95e0d15317a4549b84d597a9931866fba0777e5fb8f0664aeff15f85975a684 SHA512 032b54fd90d4dfa92fcb970b6a1c11e1767c9723d142b0476aa22362885c1fc32d1cc8cf89d1562dc48cd34539d885656e5b7bda13fe1a89aabf8b93ec77c046 -EBUILD gtk+-3.24.24-r1.ebuild 7302 BLAKE2B 7fe5f0bd1cb74fa26ecb1b8aeb84971833d367714352f292b60ceb1588dcd01e706e37f8788f94b08ae0209dabb3ff5502f75a03c1c0634a7240b0d87a9ac5f5 SHA512 9eab7d3c6b96c51ef8adb89f507b6b5566f9a2d547fe948caacb4cbf8df675eb897f2784dbaf4e16a5b6963a510c4c5dbf07f5a4c2c75baf6b96a778a4046a07 +EBUILD gtk+-3.24.24-r1.ebuild 7319 BLAKE2B 40d85e1185cc7287b97cb07fffb63c111015eefd00375911af68afcdd9b1834bcb1e7df57e57454e354f5b68d7d3fbd3c45252d419a8093c12a76f0da143e5bc SHA512 74b581810c693598b5071f798ee9e39dbee0cc5cb55b166243ff1c90cf64d73142abc0e278b0d7c7769abf6a2579b1c5205e27767ab1ec774fa8faf5dca9942f EBUILD gtk+-3.24.24.ebuild 7431 BLAKE2B 5c29d588dd5589c45a61d51539a1cf330a097de809a7c88d80e03839fdedb4af718370c4dec0f04f75df0a7a3b5912b6b4cd4e3b8723859d1551c103064aff3f SHA512 48cb47dc86243bc1c4481be0ec6bec0ae4a3702968068819e0d8586cbc605d2e03aca8bf446d372c5c52914c61f7a2c49bb692b175989ac55c3a58e30c08ed53 MISC metadata.xml 947 BLAKE2B 9024c57cf454b89700ce48a267162ce4672c1cd486f3b6218bfb2334154a1abdbe7c446cbe5c96e5d3abeed887891579c56ad26675e3ee833c5c3691fc4fc7ed SHA512 60065a6e79ea076dbe4b06e6ddcf222c9498ba755e7d5a214ac5401c4a9c7b61d170989c64771de69898524b0cc040aa036592a3cbeeb452e1dc5406b93e09fb diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild index d409d7878f89..ae8c9dd88fb4 100644 --- a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild +++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild @@ -1,11 +1,10 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -GNOME2_LA_PUNT="yes" +EAPI=7 GNOME2_EAUTORECONF="yes" -inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx +inherit flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx DESCRIPTION="Gimp ToolKit +" HOMEPAGE="https://www.gtk.org/" @@ -28,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}] @@ -37,35 +37,25 @@ COMMON_DEPEND=" 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/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}] ) ) " -# 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 !aqua? ( x11-base/xorg-proto ) test? ( - x11-themes/hicolor-icon-theme + media-fonts/font-cursor-misc media-fonts/font-misc-misc - media-fonts/font-cursor-misc ) + x11-themes/hicolor-icon-theme + ) " # gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0 @@ -73,18 +63,30 @@ DEPEND="${COMMON_DEPEND} # in sync. RDEPEND="${COMMON_DEPEND} >=dev-util/gtk-update-icon-cache-2 - !<gnome-base/gail-1000 - !<dev-util/gtk-builder-convert-${PV} - !<x11-libs/vte-0.28.2-r201:0 >=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=" - x11-themes/gtk-engines-adwaita 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, @@ -208,19 +210,19 @@ multilib_src_install() { multilib_src_install_all() { # see bug #133241 # Also set more default variables in sync with gtk3 and other distributions - echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc" - echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc" - echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc" - echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc" - insinto /usr/share/gtk-2.0 - doins "${T}"/gtkrc + 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 + rm "${ED}"/usr/bin/gtk-builder-convert || die + rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die readme.gentoo_create_doc } @@ -230,12 +232,12 @@ 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" + local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die + if [[ -e "${EROOT}${cache}" ]]; then + cp "${EROOT}${cache}" "${ED}${cache}" || die else - touch "${ED}"/${cache} || die + touch "${ED}${cache}" || die fi } multilib_parallel_foreach_abi multilib_pkg_preinst @@ -252,35 +254,35 @@ pkg_postinst() { set_gtk2_confdir - if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then + 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 + rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules" fi - if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then + 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 "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache" elog "Removing deprecated file." - rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules + 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" + 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 + 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" + 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 + 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]* + 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 @@ -299,7 +301,7 @@ 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 + 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.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild index 161a79cacb81..a88f574e3640 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 |