gentoo resync : 30.06.2018

3 files changed, 2 insertions, 61 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 79f6b510a201..d75110d5444c 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,7 +1,5 @@
-DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06c1686ac07aa08b587bfba761a834e698f033bdb79666ea6ddd6c1f672ce968897c7594e4467c5b6dee644877e SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.42.0.tar.xz 824984 BLAKE2B 2ea7b5d0d95c91b61ad8f841e75d7431f405ba1c1a01acef52364d3143c4e99f6ba66d03b52e7e94d4074edc7a116e4c9ffa16b7538851a82ec0b638c8f83f05 SHA512 32f621f7af65102ddf7f5ad949c1a9da9a559259255de42a6c0e7992b8692088f6701a4e11558c4243edc881cb8907defd6712f4c2bfca4bcadfe1cb5009b59f
-EBUILD pango-1.40.12-r1.ebuild 1675 BLAKE2B ebad2b225bf4182438ce05b45ba8d99dcf89b730c24408e96ad266144007ac9f26559d51d5a42d6c678acf37d24b93fa0707653bf114af614b2d4781a7980337 SHA512 03dd6d7d005e1f7753a630af3be6bc299dbff0832a6200c81b2b2a53e334aeb2ce1cc9ed8a622692c0b78cc60306851dfadf2b57511e1e30892340caf7c0524e
-EBUILD pango-1.40.14-r1.ebuild 1675 BLAKE2B afbf20e48ff6f0164ec598f17485becb136b51ae297c6e4daeaa38c43d63255627cb3c7293916cb7d6a959fed09c5a098f4112394d2d9a410d0f3ff81fb3c15a SHA512 b924bbde81ae8ae830bb049e96b40fc26fc1767e59c2a3dc96fb13828d55feded75198b324ef436e5c850342a36a1f2bd585001b99b9a10aec97df281f7dd925
+EBUILD pango-1.40.14-r1.ebuild 1673 BLAKE2B 8d4c72372d3f255c7009d8cd7c08f2349be8d27b296e284cd953658245330961112e922be2259548156c5fcb2093e73c23db56c4aaa4394f84e02cb1f501a5d1 SHA512 acd957d48ffb92997138360d3449e1759cb8b543d973b46fc2ce45659963bc7a6a7028d1a9ae4f4e2217e32292a382c15f2921c50b9aec6fa1ced5400eefdc8b
 EBUILD pango-1.42.0.ebuild 1731 BLAKE2B f9bb73c5885d5fa2852cdbc67116850fc3f783c0edc924ec34d60c6bfc5b6edfa2e67ca00e48270aed88d8744bbc55558ec3e9709d187accc80a9abc1d72cc15 SHA512 1947849d7c8bf0590964d50271c0356ce8ff07af4fd90eff5dbf90456e980607d43f3cfe3d36d7e774cef56d045f2150dff04de2998e79327df8ce102be1130f
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.12-r1.ebuild b/x11-libs/pango/pango-1.40.12-r1.ebuild
deleted file mode 100644
index fd8b2eb1f4ae..000000000000
--- a/x11-libs/pango/pango-1.40.12-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 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-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.11.91: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-base/xorg-proto )
-	!<=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
-}
diff --git a/x11-libs/pango/pango-1.40.14-r1.ebuild b/x11-libs/pango/pango-1.40.14-r1.ebuild
index f9569a296132..11af940b9d31 100644
--- a/x11-libs/pango/pango-1.40.14-r1.ebuild
+++ b/x11-libs/pango/pango-1.40.14-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+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"