commit:     e6cae65bc3c951457c999e70ef45c3c88cf0961b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 21:28:11 2016 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 21:30:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cae65b

x11-libs/gtk+: cleanup old revisions

Package-Manager: portage-2.3.0

 x11-libs/gtk+/Manifest               |   2 -
 x11-libs/gtk+/gtk+-2.24.28-r1.ebuild |   2 +-
 x11-libs/gtk+/gtk+-2.24.29.ebuild    | 297 -----------------------------------
 x11-libs/gtk+/gtk+-3.16.7.ebuild     |   2 +-
 x11-libs/gtk+/gtk+-3.18.7.ebuild     | 234 ---------------------------
 5 files changed, 2 insertions(+), 535 deletions(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index e6e3088..0f361fd 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,11 +1,9 @@
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 
517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 
aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86
 WHIRLPOOL 
2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
 DIST gtk+-1.2.10.tar.gz 2868322 SHA256 
3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 
6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f
 WHIRLPOOL 
906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
 DIST gtk+-2.24.28.tar.xz 13354884 SHA256 
b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 
86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760
 WHIRLPOOL 
b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
-DIST gtk+-2.24.29.tar.xz 13143648 SHA256 
0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8 SHA512 
3cdc868b74831c35b9181edfe29fc7743118b5db6b4e742cc684cf5b7d8e87686f53c4460ee14dee635c25cfd1fd7aefb5cc472d022f0f77d83b6d3a881eff26
 WHIRLPOOL 
9a7bf26647ac9f10dea2d1f7a50fe36ba9d88c74784b6863e0e6572ab165a716774c84c1e067c61920e9a8bb08068bc765099d65d975b3778fee2abd8f80af37
 DIST gtk+-2.24.30.tar.xz 12800276 SHA256 
0d15cec3b6d55c60eac205b1f3ba81a1ed4eadd9d0f8e7c508bc7065d0c4ca50 SHA512 
13373e4809b48acefdbf09f18f0f18b562f05b3ce2e3169c5aa80722a262405b3b4a220ecee54c59ef03ef89be9850dc659f6da9251abaf7c577599b7a4319b1
 WHIRLPOOL 
4038ccc5d6a17796acdf22b9240257299770b755e84a9396cf660f80f973f9fc75f0ae3a51b83dff2dc42102d6141e57bdd4e3fb8f9b11cae9ecd72e139746a3
 DIST gtk+-2.24.31.tar.xz 12805344 SHA256 
68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 SHA512 
75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
 WHIRLPOOL 
6f59d444b28910b0f4cd7d0d0bf04f8e442acd945205679c19e5adf7ca3f8e7406d4095e9ff9ca597882eb937a7551e19af63b6597e7b57c0babe5b061f9110e
 DIST gtk+-3.16.7.tar.xz 18294656 SHA256 
19689d14de54d182fad538153dbff6d41f53841f940aa871585fdea0306c7fba SHA512 
8f74b3a4093ecf776466d3988806fdae081d10d5e74c66770b52f624076afe92d58efb68ace47fd0dbc5a170a577fc9a8d1b4768794aa4249433c95198db00c8
 WHIRLPOOL 
f8b4d9fa6b7b3ed9702f76d28d729b745217e072898239517d320f0635e87691ca874a136607566cf53d73aead53833c5ecf484fc7aea74f3c26a1f14cc5a9b4
-DIST gtk+-3.18.7.tar.xz 16815772 SHA256 
a76e1cb0ac45ce5c2734f6778f2731a5c6a23d1ff6bd4db357774f014ee68820 SHA512 
7cb6f699d4c2d78d15f52d4bf02871ad87106550515232c8f1045e01a3b737e64ffdfe73eaedcba077862a5c81a8cae983789c3d8882aee9502850ddc644fe7f
 WHIRLPOOL 
635030ec177abd4cb1dbf5007c9eeed5bcceefb1730da3ca33ed2f730e602303ec236b8e6fb3e0a3322824a1e8bca951c267fc9239eff89c42fa59c5591da2e9
 DIST gtk+-3.18.9.tar.xz 16800896 SHA256 
783d7f8b00f9b4224cc94d7da885a67598e711c2d6d79c9c873c6b203e83acbd SHA512 
348ff28fe2674ac50653cdd6909f028dee823bbaac786b21163f1896cac7b2ea1dbdc4ab54453402ac5b715317e42d6fe677fd0247364397a13bcb8757ab720c
 WHIRLPOOL 
f9e03ab29c15a130894524a0b270448990e756285e4af8e88de82c19cbece325e2532a06e091bff1e699374fc20c6b692ce7387576697378624989f55c0fa635
 DIST gtk+-3.20.8.tar.xz 17199148 SHA256 
9841bd9b4d23c045c474b10fdde9da958af904b63783701e796391d55d4396f3 SHA512 
9f5d29dc0ec06ce28f8b45da2e39e1d4e50cdd6b98bd0355b62c62a76aa868b596e113d68d99875b3ac18dc07d08d3fa4d6f8d3b69b61fdb3de0b244f5bb0cb5
 WHIRLPOOL 
9e7b5ccdd8a7dc6a2f455675075bf2dbaa4523926a57a61716ca71509d47c86e11e55c3a12a1e2dcd999fddbec7a87d8c03d4c4720b2af1a99ec19237597e7d1
 DIST gtk+-3.20.9.tar.xz 17174872 SHA256 
83a609ba2f3424b5509e73967c49c67833af466d6f91081b24ee5c64fce6ac17 SHA512 
5848403959f76633511009231c80a814cfe24a7ba07c9429704f432191e51b54d3e6621ce5b578f79999f21993920af3a45c8d03dad6ba03af5f9a342b32626e
 WHIRLPOOL 
7964b82dabf72b5d45a34565874ba02e0dda09b0f358f640ca0c602c3c7aa4618432829d047794f5f202424c34c837bbdc31ccb3c5457768e252f048afd30107

diff --git a/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild 
b/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild
index dc43850..2051e1b 100644
--- a/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="ia64 sparc"
 
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 COMMON_DEPEND="

diff --git a/x11-libs/gtk+/gtk+-2.24.29.ebuild 
b/x11-libs/gtk+/gtk+-2.24.29.ebuild
deleted file mode 100644
index 07f36bb..00000000
--- a/x11-libs/gtk+/gtk+-2.24.29.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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
-"
-# 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
-               # 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
-
-       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() {
-       Xemake 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
-       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_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.16.7.ebuild b/x11-libs/gtk+/gtk+-3.16.7.ebuild
index 3b97f90..d1e16c4 100644
--- a/x11-libs/gtk+/gtk+-3.16.7.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.7.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
        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"
+KEYWORDS="ia64 sparc"
 
 # 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)

diff --git a/x11-libs/gtk+/gtk+-3.18.7.ebuild b/x11-libs/gtk+/gtk+-3.18.7.ebuild
deleted file mode 100644
index fc6f7e5..00000000
--- a/x11-libs/gtk+/gtk+-3.18.7.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~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 ~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.15[introspection?,${MULTILIB_USEDEP}]
-       >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
-       media-libs/fontconfig[${MULTILIB_USEDEP}]
-       >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
-       >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-       >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-       >=x11-libs/pango-1.37.3[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.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.38.2
-       >=dev-util/gtk-doc-am-1.20
-       >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-       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
-#  https://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 )
-"
-# 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() {
-       # -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}
-
-               # 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
-
-       # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-       epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
-
-       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 \
-               --disable-mir-backend \
-               --enable-man \
-               --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() {
-       "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-       unset DISPLAY #527682
-       GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
-}
-
-multilib_src_install() {
-       gnome2_src_install
-}
-
-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_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
-}

Reply via email to