gentoo resync : 25.08.2018

4 files changed, 5 insertions, 65 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 46e765fbfaf8..0ecf2fe65324 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,8 +1,6 @@
-AUX 1.42.3-pango-view.1.in 2769 BLAKE2B b44b839ea3a89b0ad4f6c4d6d99a70a75dbba9e0a2c056af83cc2a83a5a59535b19013985c223b5a82308094a1e3b28ed386abc40012c151b9391666e624e76a SHA512 6ab28e16b977658bed329187604805ae6e1b9f3cac2e3d4a6378d8fbda3b48d115539161a8e50472f134a6b7642b1064094dfb0986476c9e2218294c2ff28d84
+AUX 1.42.4-pango-view.1.in 2771 BLAKE2B 6cc529600d8bc0479a972046c0680139d1910fbeb1629ca66e9d50a80d6c805db1dc8bb1c6de77e73197f98b2b5ec8b8afeb4128ab588b155019fd287cee3105 SHA512 e26c20b889784a3f7aea0287ced559e25fdd23fd915949ab9c538f10d0a6c7200457132ed48061d2c47e004858f7307cf4c7c1027d6b2abd642911f5e81f72c6
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
-DIST pango-1.42.0.tar.xz 824984 BLAKE2B 2ea7b5d0d95c91b61ad8f841e75d7431f405ba1c1a01acef52364d3143c4e99f6ba66d03b52e7e94d4074edc7a116e4c9ffa16b7538851a82ec0b638c8f83f05 SHA512 32f621f7af65102ddf7f5ad949c1a9da9a559259255de42a6c0e7992b8692088f6701a4e11558c4243edc881cb8907defd6712f4c2bfca4bcadfe1cb5009b59f
-DIST pango-1.42.3.tar.xz 833264 BLAKE2B 8a830ececa1709003222a407c2043474bbcc3599cc6e475f6531f25857b08998650b1c4148846e5f4830961fbe6a50872c5c50b3b9d6c980fad3b78a21ef7a78 SHA512 339069d299f5fb2dd9652da0c7126e498aeba58351906038ac0e9d225082feddfd5e477d3f205d89106b2ce696ec480c727faca0e49ca7a5d1c38e7dcb4f0e91
+DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc
 EBUILD pango-1.40.14-r1.ebuild 1673 BLAKE2B 8d4c72372d3f255c7009d8cd7c08f2349be8d27b296e284cd953658245330961112e922be2259548156c5fcb2093e73c23db56c4aaa4394f84e02cb1f501a5d1 SHA512 acd957d48ffb92997138360d3449e1759cb8b543d973b46fc2ce45659963bc7a6a7028d1a9ae4f4e2217e32292a382c15f2921c50b9aec6fa1ced5400eefdc8b
-EBUILD pango-1.42.0.ebuild 1731 BLAKE2B f9bb73c5885d5fa2852cdbc67116850fc3f783c0edc924ec34d60c6bfc5b6edfa2e67ca00e48270aed88d8744bbc55558ec3e9709d187accc80a9abc1d72cc15 SHA512 1947849d7c8bf0590964d50271c0356ce8ff07af4fd90eff5dbf90456e980607d43f3cfe3d36d7e774cef56d045f2150dff04de2998e79327df8ce102be1130f
-EBUILD pango-1.42.3.ebuild 2022 BLAKE2B 500e430baf92e06e7c03133d4cd9d357086e39af9e528dbf4487251efc6f86ac37af1a104bd478edd9bc8ac8939b428bb5d37b83e7ddabcbd73faa22ff426667 SHA512 8fa04147f4f10499a4041b31ddb6df8386b26cf889507212656ec20149c4b0b4fa56cad051cd8f59c203c9819999ffe912ce43f4ef7e8c8cd48bcc01b12dae0b
+EBUILD pango-1.42.4.ebuild 2018 BLAKE2B 65bfe9d62d58a0f9d685f0359dc65015d51f5af59f59b67c66c0e0b3b000ba3455725df68292aec969c6d19678380900daa88bc7062809054ce2292bdc2140d8 SHA512 f6ddbbbb3151888723d8b549f544b5fde57f96ab817b5b3c37913c9080175b237713b43f2348676907f1020bf3e7c1f1e9fea677c54e04e967c4c3d789e1399b
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/files/1.42.3-pango-view.1.in b/x11-libs/pango/files/1.42.4-pango-view.1.in
index b5286e8affeb..0b6f07a90d3a 100644
--- a/x11-libs/pango/files/1.42.3-pango-view.1.in
+++ b/x11-libs/pango/files/1.42.4-pango-view.1.in
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.6.
-.TH PANGO-VIEW "1" "July 2018" "pango-view (pango) 1.42.3" "User Commands"
+.TH PANGO-VIEW "1" "August 2018" "pango-view (pango) 1.42.4" "User Commands"
 .SH NAME
 pango-view \- Pango text viewer
 .SH DESCRIPTION
diff --git a/x11-libs/pango/pango-1.42.0.ebuild b/x11-libs/pango/pango-1.42.0.ebuild
deleted file mode 100644
index 3fa51895fb50..000000000000
--- a/x11-libs/pango/pango-1.42.0.ebuild
+++ /dev/null
@@ -1,58 +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.12.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}]
-	>=dev-libs/fribidi-0.19.7[${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.42.3.ebuild b/x11-libs/pango/pango-1.42.4.ebuild
index 83fda4ac8c32..f0ca0b10e1a0 100644
--- a/x11-libs/pango/pango-1.42.3.ebuild
+++ b/x11-libs/pango/pango-1.42.4.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"