gentoo resync : 18.12.2017

11 files changed, 98 insertions, 521 deletions

diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 5df820d6ca61..026eaa576b75 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 2fd54c647814..a94536cb95e2 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,8 +1,10 @@
 AUX 2.36.10-fix-tiff-loader.patch 2300 BLAKE2B 19724c9585802d8a30bbb67247366e43614d8926ed3cc826f37b74420cbdd93b90be011571ae2cbfc8e7b4cf7d6c7f17410819f412e3b331ead9b5e186ce50fd SHA512 e1c04c53b74cc62c63f144b3f9b1ac4246709c809d92ac29dda973ce17232c87fdde6dbceb1295b87d1dad93eb1b2dcf55038c6072bdaac021d96cef3129bd59
+AUX 2.36.11-fix-libtiff-disable.patch 879 BLAKE2B bc50115c3255892187a3e78b5f02770690776913284cb4c421c26e937f62079c0e554f0c10d9decfe66a207a21abb4c2abb720053f0e80c886c56491a0744e38 SHA512 b894e172b24cdcbd487f1d8bcee44a49ea867eb5775d6163605a64d3beffae7056c6d77acc96eee20728075b40c9d52b75e9e7024b16fd804f49720eef6f9225
 AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e7c95c59ec0b8d5f65f72c1675186b0c0cc105be5537e7b4660730dce3799227217a582a64f295afbd33a8cf52071f5fe8c4e153c0d3 SHA512 0a3e51c52f947d6231b472525b11e13fdc752b8eaa34c95ec3c76cfb0faf33ef3109c8381189261e8ebae76a4070af24e58c373bebc69bbb6b69399bf833395d
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
+DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 DIST gdk-pixbuf-2.36.9.tar.xz 5769124 BLAKE2B 7e21831659cd0bca44de4858fe37887a8a2ea494fffed5015fd35155873fe820336b762be8e8057c4f41c48dbe7c6b55e8eba9fbbee8692a9b72e7fe6b0dd24e SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261
 EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3797 BLAKE2B 0fdf831d2b2f8f3649019e73cadc44d38492f2e08403b5fba0847058d54d55094105d24d76519b5d43a39c60c52f5815f864e05540792ba20c6b7eb0f902c8e8 SHA512 8c93298741e57d623a4b0109126c654b6f670ac57895fb649c56e57c3e4d120f06b46976d35711ac03eb823aa9acc54528dc6c68cf4cab6b7340818b84eeff5c
-EBUILD gdk-pixbuf-2.36.10.ebuild 3671 BLAKE2B 02f2bed33fb3c7cafb0e986204243e11d5b30763590e472cfe83314cfc8d4305c49fae377928b673684ad49e00af5920468b58d5fc40d421a89442df02dbbc86 SHA512 8a2b3fa2f1f7dc063e7939ba745b3d10b497da1d5d13ff336e9fe487d2cc31125b428278178dd187c57302409fddfa175f5bbbd6b5f796d6abf77f34f5b3655e
+EBUILD gdk-pixbuf-2.36.11.ebuild 3893 BLAKE2B 470bfec07a8c38410284dc44907d4aa09ef02c2a57a7f900174933dec7c002eaaf3cb1da49e4ac969ac0aadc66803ce77da970974dbeb37d12ebf87dab9640fe SHA512 98af3703315a23eecb103d3fab88dfc8369ad72d5e7f5ab50d2f037307c571f23347e968565c3cc9ca18bcbeb41a82ff1f8a1823e70c1f3de8568fa542e1eda5
 EBUILD gdk-pixbuf-2.36.9.ebuild 3662 BLAKE2B 72352663cd372208aac722a3cee1ac2280d332b28168d6f181eebbca4b83acd2ac25e81e001975e9bd4ff3b0312f533dc5a4df486694d42426afb370d861184c SHA512 5622f0a3df9ba6972958d63d08ee0bd6b73c933bca2c05dd2e65a89e3f44076c5d042cec3f519523a8bb778d98a2051d6a5adaffab04238a3f6415741be67694
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch b/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch
new file mode 100644
index 000000000000..23caca99a594
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/2.36.11-fix-libtiff-disable.patch
@@ -0,0 +1,26 @@
+From 5c4edf2cc22468a8410c19cb8b236b227fca300a Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 10 Oct 2017 14:33:18 +0300
+Subject: [PATCH] build: Fix --without-libtiff not having an effect
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788770
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b45f407b5..9f5d6fbee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -676,7 +676,7 @@ if test x$gio_can_sniff = x; then
+   AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
+ fi
+ 
+-AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != x)
++AM_CONDITIONAL(HAVE_TIFF, test "x$libtiff_found" != xno)
+ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
+ AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
+ AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
+-- 
+2.15.0
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index a0c235ef3cb6..80f31f97b247 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.10.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
 
 inherit flag-o-matic gnome2 multilib multilib-minimal
 
@@ -40,10 +41,16 @@ MULTILIB_CHOST_TOOLS=(
 	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
 )
 
-src_prepare() {
+PATCHES=(
+	# Do not run lowmem test on uclibc
 	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
-	eapply "${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+	# Fix --without-libtiff having no effect (from master)
+	# https://bugzilla.gnome.org/show_bug.cgi?id=788770
+	"${FILESDIR}"/${PV}-fix-libtiff-disable.patch
+)
 
+src_prepare() {
 	# This will avoid polluting the pkg-config file with versioned libpng,
 	# which is causing problems with libpng14 -> libpng15 upgrade
 	# See upstream bug #667068
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5dd875c8d3bc..27b1d10f2544 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -5,13 +5,9 @@ AUX gtk+-3.22.2-update-icon-cache.patch 5474 BLAKE2B fe374a5f50ffc69df0d09e5b50d
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
-DIST gtk+-3.22.15.tar.xz 18662944 BLAKE2B 9a9ed9021b266411dfe14d7487d0f8dde1bf60ed7f2cfbfd2cca79b022deaf9f6ee368878e26beb7ea4c8238f3a496c4ab0da6250dec014af13b16e5b6548e85 SHA512 c99c4a52bc447a21be20546bdc7808081abde076af9603424c1de20af031ac3f9bd121709d4c18705db8ba2f66ace0aae9b32741347788a8d81afa358d67e758
 DIST gtk+-3.22.16.tar.xz 18655144 BLAKE2B 947ef2768afbd7a242834e5eb1cef218f3978543193e18a4c216bb91be30482955f887b298a9a50786b0aa24613b924933994cc8472752587140bb796898afd0 SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612
-DIST gtk+-3.22.17.tar.xz 18702864 BLAKE2B b2f45e8cab5be9fc2dd594b7ff35ab316a298448c80483a3191344f749c24bfb8ad7920b2e861e198b773c62755b01da5a5c6c2734a4bf4d673de68fcc1dc3a9 SHA512 9503baa73f6e199a1fe807bec739df2bb8bc2e586e9c316184d37e874191eb5938c962d1eb83e58841579b16cde8b85d80e058a3577c0033de12fc3fce066dfa
 DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
 EBUILD gtk+-2.24.31-r1.ebuild 10104 BLAKE2B 2d9f63b1aaea867dc1bf0267e0e4000590ae10bfc3b4e1f3539cc1d83b55e874383f621db1cb5564283c069f606ed90dcb5c8cc3c45716507bbff31924da0ba3 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e
-EBUILD gtk+-3.22.15.ebuild 6930 BLAKE2B 46582abe0fcd044f30e26e072f5c1d856a180d40c282a49c7f1dd2d8f93ae60dde1c7af1b2c28d719f7ed53b7ff52d20ebddc725bd0425d7684e09217f27e1dd SHA512 3103bbf23ab5dc56738513599c48f6f090a0aacaa33424f498e7ad5bb0b3841537a4b6a6cadd8a9d86c8fd9a88f99623cc85d8565338229ff6419f267b93b7ac
 EBUILD gtk+-3.22.16.ebuild 6781 BLAKE2B 80671c5006fda95249da52f1510ba0eb8144a61855afb6ab2d042df61c6ed4de5ef60d16c076f3dfed7e6515815b937607a7aa8b7e60b2e3bc479dcc7d1fc476 SHA512 a1960b76bb8b195cf927facdaa739fae5bec90e22c554d43d1066fb41c9efe869d9ef6fcdab97d46848869be0d46caaa03426ca7987145c56baeea3a7013f400
-EBUILD gtk+-3.22.17.ebuild 6788 BLAKE2B 4eed96a48af3e9a8e5d4192cb13e1bc32bf865857593d0328e5a5119df95715dffee39994a8a6cb72bdcafa723d82cb447e9a41c81f361771a5d8da8b8d78e0f SHA512 237f05cc646d2167ce857a85306468ee3f68c1670e048c91a6b13c5291f0291cd2fb0f00961440e4d69072519027626e3081e4954fe77fe830fadede7d3a185d
 EBUILD gtk+-3.22.19.ebuild 6781 BLAKE2B 9ab906ef83b3b11d9dc1cc039664920eca4c90ab422deb1eec0daa3451c4551ed2a69c830503140cbd77caa78efb1180de56aeb614089de936b07f94dc1ca254 SHA512 0193fa8c920e1a222ac9fe839a6f758a849d84cf23a25ddc7e7f541aa8e1fd41177f348f3f09398a317b294c3fbdc4b3b2b8e83e21721a8c699127f8550ba782
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/gtk+-3.22.15.ebuild b/x11-libs/gtk+/gtk+-3.22.15.ebuild
deleted file mode 100644
index a26e067b2e13..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.15.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-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.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[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.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.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.7
-		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/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${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$(get_exeext)
-)
-
-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
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	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
-	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} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS 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.22.17.ebuild b/x11-libs/gtk+/gtk+-3.22.17.ebuild
deleted file mode 100644
index 2034f00888c9..000000000000
--- a/x11-libs/gtk+/gtk+-3.22.17.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="https://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 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-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.15[introspection?,${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
-	media-libs/fontconfig[${MULTILIB_USEDEP}]
-	>=media-libs/libepoxy-1.0[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.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.9.91[${MULTILIB_USEDEP}]
-		>=dev-libs/wayland-protocols-1.7
-		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/gtk-doc-am-1.20
-	>=sys-devel/gettext-0.19.7[${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
-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="
-	>=x11-themes/adwaita-icon-theme-3.14
-	gnome-base/librsvg[${MULTILIB_USEDEP}]
-	vim-syntax? ( app-vim/gtk-syntax )
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
-)
-
-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
-
-	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
-
-	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
-	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} and useless ChangeLog that would get installed by default
-	DOCS=( AUTHORS 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/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index b0f214bf9a9c..b379e1544d61 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -4,8 +4,10 @@ DIST gtksourceview-2.10.5.tar.bz2 1253321 BLAKE2B 810a3eeca69bab4356b21c64129bb8
 DIST gtksourceview-3.22.2.tar.xz 1596384 BLAKE2B d638cdec2aaa510c0039d9cbda3105e0c6ca6586cbf6e542370efafcf52f01aaf59b163a44f93544dbcfa1535f3d6d2f84206e5a912d2101319b553b53b5e6d1 SHA512 1d51a975471172835cd9af64828ba93eb1b45e26fae91b1778c5963a8578404bbbdf1fe7f2c92953dff436bf2dac2d9e01a5188216d2a60a705e4635f0c91b81
 DIST gtksourceview-3.24.3.tar.xz 1625584 BLAKE2B ec040a91d8c98a28bd488a91652b3a8a17b1d3d88fe85e58fc2c68743f4136b435fcfdb64d7b072d077d29386acc33f1d29d50d98933a192b37ef8d350f793fb SHA512 354a06502d55d7b237d5cbec5a35102225ae3d7e80e53d1ba42e506fc9c75470c4548b4ab8e9e6b2813d732617a2f13b978194240556b8d810066c94ec13de44
 DIST gtksourceview-3.24.4.tar.xz 1619860 BLAKE2B 4d402bf96be9a52d88f974314e165946bcad49ab70474cf3528c8ca924a4f49c2dfdb3f8c9797a41e962f9e53be9ac040f386f17719cbd560b4b65cbe434ea71 SHA512 fef2008dccae6bca859f99b7171851b84f30e7b4cdb00500972039bf111ab5901498820c91926374a7b446491330c55f7179e8522b90279d0169371981bc90fd
+DIST gtksourceview-3.24.6.tar.xz 1623288 BLAKE2B 2332b31534f4fb7e4115e3827c3d57fe4d465eda67c977d238521fc68e0390809e1f0fc46e75adec2b966c83fe5ce0caa3cf312eba97bba76b9b7719b94ca42b SHA512 1b7621dbc1effc979fe08af8e6683ef43cc25563aab37a87abce15a0aa74bd0698bf10377a3fc2539b0cba1ad2f4bce2bb3981ef2dd4245bfe2fcba866d72f5d
 EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7641125a0e10ad542d61949eb89d4a4f46bbfba1f37e2565f938228c43bba9cf34e611eadec8c222530c113ec17766e55c6b SHA512 1d8dfed14a7bca7114fd4641949144781775cf02344e4b4fc886c82374f92a73b61a81666cd1c7ab5ff75daaff71ed368d4f80a18480237a32129b17ce086fb6
 EBUILD gtksourceview-3.22.2.ebuild 1323 BLAKE2B 8ecf0ab49a768d96515df5c4790c30cb6a1d8382b45c9aa2110c392274af1f9b05987ace8ba9e5c787cae3b7c4248c37c33aac2070cfd7d9d60654e212191e2b SHA512 ff2ca2a7344608b335d59bb2391e85342e082a523ef1a799dd47c4c989f8e7bb294027f551b13546c2d84aac35913b2e0d122d52a1df03b5df289b652159fc45
 EBUILD gtksourceview-3.24.3.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
 EBUILD gtksourceview-3.24.4.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
+EBUILD gtksourceview-3.24.6.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
new file mode 100644
index 000000000000..1e25a7583c48
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.48:2
+	>=dev-libs/libxml2-2.6:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	glade? ( >=dev-util/glade-3.9:3.10 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	dev-util/itstool
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-deprecations \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	insinto /usr/share/${PN}-3.0/language-specs
+	doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 26b6e1b51e7b..2edfca58f30e 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,9 +1,7 @@
 DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06c1686ac07aa08b587bfba761a834e698f033bdb79666ea6ddd6c1f672ce968897c7594e4467c5b6dee644877e SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d
 DIST pango-1.40.3.tar.xz 1061044 BLAKE2B 79acd03144b58a3c160888cf4e3638faaf622cfcb406ddcd6a17907bddb7b3c6bf8c4a8ffbedb095664b7d19daa6837239e317d03e9a485f01b832227d1c3b7d SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27
-DIST pango-1.40.5.tar.xz 1065152 BLAKE2B cdce82d561c8fd5d342d0138b21ce3204d9c1a726926f8eee68d074466ca58270df19ae6c0ff0581d927cd34531e626904bac00017c386764c89ed415b04389a SHA512 40e8bf85dbb4b6fd35da3acec06a0d2b9dde95a3c5a212d243dbcbc0d00f12bd061757a04cb2f4a8db61329efd7ed9be53e3f5d6a2eb2a3defba1d12f9eed43d
 DIST pango-1.40.6.tar.xz 832040 BLAKE2B af5597194e02c21b8e3ceb6097482dd23a9eaf74b5ca618cc39a1f44317cdab6ecef3125f5952a7b9fd306e67301de4503efbf082b3c8c172615c523e71d6a55 SHA512 d916b364a77de3e68779e6d841d95bca456daf89405b92eaf51dceef093a9761cbb6c48f4c2971dec47c0bbdb645a3f3f4fb9af425274bf1d1822b278575e1f7
 EBUILD pango-1.40.12.ebuild 1703 BLAKE2B 4215d6642b61e259719358ab61cd4583ebb9c1e53f50c5102a34f33fd64ea56490587007089d243acee6007309424c1dc6da5769e2760a177639235935c88c5e SHA512 172916acea9cc2af4d04399e67afed575eebbcbd92e501e7d2653f0bb3377f60dc61e8f9278891bba49f8ce132ae1b96277c7d20157d343f4569cd7c3baec851
 EBUILD pango-1.40.3.ebuild 1710 BLAKE2B bf310621d2b86abf1162aa80788b5d6c6db33bb05ce13f398705cb0fe45389007f7494ecff8f1d6fb6f1752ef94ee358b27baef1052e4bdb725a6c47c820da70 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139
-EBUILD pango-1.40.5.ebuild 1702 BLAKE2B 7686e147bc6b0130d326c874d64582ccb5e2881efc5985c1bd1fa27d7e2bd03b8f744a5fca424466a97aab7b59e75ad36e7c0ac572508da5ea34acb6a164c67c SHA512 7111f759d6202669fae7a881e298a30962ec2a07184a566ddda64e5f681923803ae60d385b2cbabda05dfbc062de44c3962176ad6ce37aa2e11b7a5a2cd9e1be
 EBUILD pango-1.40.6.ebuild 1702 BLAKE2B 1fa06c4602f29f8961f5935de4f6f52fc643dba2f3f4272864aa708f5da473ce33e0fbd5618c78e4cc395c1beb101232ceb22ed8627db7b7a14232c6a2753450 SHA512 81d280a89db9f79c26c6472247cf373f250eae38861b1105e4ddf7ee979cd0a55bff8aae9ab34cce6a590d72573354d5662bfd16707015dde3d3abeb693f3d5b
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.5.ebuild b/x11-libs/pango/pango-1.40.5.ebuild
deleted file mode 100644
index 2b45739d6f2c..000000000000
--- a/x11-libs/pango/pango-1.40.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal toolchain-funcs
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection test"
-
-RDEPEND="
-	>=media-libs/harfbuzz-0.9.30:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	X? (
-		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.20
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( media-fonts/cantarell )
-	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
-	!<=sys-devel/autoconf-2.63:2.5
-"
-
-multilib_src_configure() {
-	tc-export CXX
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--with-cairo \
-		$(multilib_native_use_enable introspection) \
-		$(use_with X xft) \
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/html docs/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}