commit: 65018f50b9ad0a19cbfdc7f069117f86d0c684ed Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> AuthorDate: Mon May 25 04:13:56 2015 +0000 Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> CommitDate: Mon May 25 04:13:56 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=65018f50
dev-util/gtk-update-icon-cache: moved to gx86 Package-Manager: portage-2.2.20 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D .../gtk-update-icon-cache-2.24.27.ebuild | 29 -- .../gtk-update-icon-cache-3.14.13.ebuild | 29 -- dev-util/gtk-update-icon-cache/metadata.xml | 13 - .../gtk+/files/gtk+-2.24.24-out-of-source.patch | 33 --- .../files/gtk+-2.24.27-update-icon-cache.patch | 64 ----- x11-libs/gtk+/gtk+-2.24.28-r1.ebuild | 292 --------------------- x11-libs/gtk+/gtk+-3.14.13-r1.ebuild | 244 ----------------- 7 files changed, 704 deletions(-) diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild deleted file mode 100644 index 55b1797..0000000 --- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="GTK update icon cache" -HOMEPAGE="http://www.gtk.org/"; -SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"; - -LICENSE="LGPL-2+" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.28:2 - >=x11-libs/gdk-pixbuf-2.21:2 - !<x11-libs/gtk+-2.24.28-r1:2 - !<x11-libs/gtk+-3.14.13-r1:3 -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.50.1 - virtual/pkgconfig -" diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.14.13.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.14.13.ebuild deleted file mode 100644 index dae5873..0000000 --- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.14.13.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="GTK update icon cache" -HOMEPAGE="http://www.gtk.org/"; -SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"; - -LICENSE="LGPL-2+" -SLOT="0" -IUSE="" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.41.2:2 - >=x11-libs/gdk-pixbuf-2.30:2 - !<x11-libs/gtk+-2.24.28-r1:2 - !<x11-libs/gtk+-3.14.13-r1:3 -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.50.1 - virtual/pkgconfig -" diff --git a/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml deleted file mode 100644 index dd9bec3..0000000 --- a/dev-util/gtk-update-icon-cache/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <herd>gnome</herd> - <longdescription lang="en"> - gtk-update-icon-cache is a tool from GTK+ to update icons and themes - caches. - - It is split from the GTK+ sources by the Gentoo Gnome team to help - GTK+ 2 and 3 to co-exist better by extracting the single conflicting - tool. - </longdescription> -</pkgmetadata> diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch deleted file mode 100644 index 451233c..0000000 --- a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org> -Date: Sun, 18 May 2014 10:50:05 +0200 -Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir. - -The $gtk_all_c_sources variable contains both supplied and generated -sources. The former reside in $srcdir, the latter in the build directory -(cwd). - -In order to handle both kinds properly, first try to find each source -file in cwd, and then fallback to $srcdir. This makes it possible to use -out-of-source builds, and guarantees that fresh-built source files will -be used rather than pre-generated copies included in the distribution -tarball. ---- - gtk/aliasfilescheck.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh -index 31b49d4..3636a82 100755 ---- a/gtk/aliasfilescheck.sh -+++ b/gtk/aliasfilescheck.sh -@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then - fi - - grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files --{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files -+{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files - - diff expected-files actual-files && rm -f expected-files actual-files --- -1.9.3 - diff --git a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch deleted file mode 100644 index f88e02e..0000000 --- a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <e...@gentoo.org> -Date: Sat, 9 May 2015 23:30:58 +0200 -Subject: [PATCH] Always use external gtk-update-icon-cache - ---- - configure.ac | 8 +++----- - gtk/Makefile.am | 13 ++----------- - 2 files changed, 5 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2671a3d..fa46004 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling - - AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) - --if test $cross_compiling = yes; then -- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) -- if test x$GTK_UPDATE_ICON_CACHE = xno; then -- REBUILD_PNGS=# -- fi -+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) -+if test x$GTK_UPDATE_ICON_CACHE = xno; then -+ REBUILD_PNGS=# - fi - - AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) -diff --git a/gtk/Makefile.am b/gtk/Makefile.am -index 248220d..42e4c23 100644 ---- a/gtk/Makefile.am -+++ b/gtk/Makefile.am -@@ -1039,8 +1039,7 @@ endif - # Installed tools - # - bin_PROGRAMS = \ -- gtk-query-immodules-2.0 \ -- gtk-update-icon-cache -+ gtk-query-immodules-2.0 - - bin_SCRIPTS = gtk-builder-convert - -@@ -1390,16 +1389,8 @@ stamp-icons: $(STOCK_ICONS) - ) done \ - && touch stamp-icons - --if CROSS_COMPILING --gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) --else --gtk_update_icon_cache_program = \ -- ./gtk-update-icon-cache --endif -- - gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \ - --include-image-data \ - --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ - mv gtkbuiltincache.h.tmp gtkbuiltincache.h --- -2.3.6 - diff --git a/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild deleted file mode 100644 index 4276c25..0000000 --- a/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild +++ /dev/null @@ -1,292 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/"; - -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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -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:=[X] - >=x11-libs/gdk-pixbuf-2.30.7:2[X] - >=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.4.2[${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}] ) - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/gobject-introspection-common - >=dev-util/gtk-doc-am-1.20 - sys-devel/gettext - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - !aqua? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}] - >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}] - xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] ) - ) - 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 - !<gnome-base/gail-1000 - !<dev-util/gtk-builder-convert-${PV} - !<x11-libs/vte-0.28.2-r201:0 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20140508 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - ) -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - 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 -) - -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() { - # Fix tests running when building out of sources, bug #510596, upstream bug #730319 - epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch - - # Rely on split gtk-update-icon-cache package, bug #528810 - epatch "${FILESDIR}"/${PN}-2.24.27-update-icon-cache.patch - - # marshalers code was pre-generated with glib-2.31, upstream bug #662109 - rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \ - perf/marshalers.c || 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 - # 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 - - epatch_user - - eautoreconf - 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 \ - 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() { - unset DBUS_SESSION_BUS_ADDRESS - Xemake check -} - -multilib_src_install() { - gnome2_src_install - - # add -framework Carbon to the .pc files, bug #??? - if use aqua ; then - for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do - sed -e "s:Libs\: :Libs\: -framework Carbon :" \ - -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" - done - fi -} - -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 = "gnome"' >> "${T}/gtkrc" - echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc" - - insinto /usr/share/gtk-2.0 - doins "${T}"/gtkrc - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* - - # dev-util/gtk-builder-convert split off into a separate package, #402905 - rm "${ED}"usr/bin/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_VERSIONS} ]]; 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.14.13-r1.ebuild b/x11-libs/gtk+/gtk+-3.14.13-r1.ebuild deleted file mode 100644 index b8a1722..0000000 --- a/x11-libs/gtk+/gtk+-3.14.13-r1.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal - -DESCRIPTION="Gimp ToolKit +" -HOMEPAGE="http://www.gtk.org/"; - -LICENSE="LGPL-2+" -SLOT="3" -IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama" -REQUIRED_USE=" - || ( aqua wayland X ) - xinerama? ( X ) -" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -# FIXME: introspection data is built against system installation of gtk+:3 -# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf) -COMMON_DEPEND=" - >=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}] - >=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}] - media-libs/fontconfig[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] - >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}] - >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}] - 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.5.91[${MULTILIB_USEDEP}] - 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/libXrender[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.3[${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.38.2 - >=dev-util/gtk-doc-am-1.20 - sys-devel/gettext - virtual/pkgconfig[${MULTILIB_USEDEP}] - X? ( - x11-proto/xextproto[${MULTILIB_USEDEP}] - x11-proto/xproto[${MULTILIB_USEDEP}] - x11-proto/inputproto[${MULTILIB_USEDEP}] - x11-proto/damageproto[${MULTILIB_USEDEP}] - xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] ) - ) - 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 -# >=xorg-server-1.11.4 needed for -# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html -RDEPEND="${COMMON_DEPEND} - >=dev-util/gtk-update-icon-cache-3 - !<gnome-base/gail-1000 - !<x11-libs/vte-0.31.0:2.90 - >=x11-themes/adwaita-icon-theme-3.14 - X? ( !<x11-base/xorg-server-1.11.4 ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - ) -" -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 -PDEPEND=" - gnome-base/librsvg[${MULTILIB_USEDEP}] - vim-syntax? ( app-vim/gtk-syntax ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gtk-query-immodules-3.0 -) - -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() { - # https://bugzilla.gnome.org/show_bug.cgi?id=738835 - epatch "${FILESDIR}"/${PN}-non-bash-support.patch - - # -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 testsuite Makefile.{am,in} - 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 - - epatch_user - - eautoreconf - gnome2_src_prepare -} - -multilib_src_configure() { - # need libdir here to avoid a double slash in a path that libtool doesn't - # grok so well during install (// between $EPREFIX and usr ...) - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - $(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 introspection) \ - $(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) \ - --disable-papi \ - --enable-man \ - --enable-gtk2-dependency \ - --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - 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() { - # FIXME: this should be handled at eclass level - "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die - - unset DBUS_SESSION_BUS_ADDRESS - unset DISPLAY #527682 - GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check -} - -multilib_src_install() { - gnome2_src_install - - # add -framework Carbon to the .pc files, bug #??? - if use aqua ; then - for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do - sed -e "s:Libs\: :Libs\: -framework Carbon :" \ - -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed" - done - fi -} - -multilib_src_install_all() { - insinto /etc/gtk-3.0 - doins "${FILESDIR}"/settings.ini - - dodoc AUTHORS ChangeLog* HACKING NEWS* README* -} - -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_VERSIONS} ]]; 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 -}
