gentoo resync : 02.04.2018

4 files changed, 65 insertions, 5 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 41b7a1f0037f..1c7f1fb28f3b 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -1,5 +1,7 @@
 DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06c1686ac07aa08b587bfba761a834e698f033bdb79666ea6ddd6c1f672ce968897c7594e4467c5b6dee644877e SHA512 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
-EBUILD pango-1.40.12.ebuild 1701 BLAKE2B 08661b1dbc7dac4666817a1ab895b5eb0d7d30e2312c7bafe95c608bee0db22d2600480061461c4d59d6d0039ef7eb0b24573b7ce7090ec2d3d351038c0c1fc4 SHA512 285956d3935c0ac69d0ce7279bed589b6005342081deb22f5bc5708e08b289135c32a3edfde903ad34b2aeec45a829c0fcc48f1ab3cb00f60985b1e6e2faa771
-EBUILD pango-1.40.14.ebuild 1701 BLAKE2B d3c37516539337728f424b09e7b4a2fdde5e013023f779709808d350189594e069109a36f52a4360e19570dc3f1323a4774d812832b8d8a39397f5af0cb9720c SHA512 2c39611655b4d380e6cbd00be8e0fb57610a697ad7497db64460bd7d84a1426046dc298b8b6f1ce500bac39c44b9c42a75878c38d1b7147eb73aab77b918c0df
+DIST pango-1.42.0.tar.xz 824984 BLAKE2B 2ea7b5d0d95c91b61ad8f841e75d7431f405ba1c1a01acef52364d3143c4e99f6ba66d03b52e7e94d4074edc7a116e4c9ffa16b7538851a82ec0b638c8f83f05 SHA512 32f621f7af65102ddf7f5ad949c1a9da9a559259255de42a6c0e7992b8692088f6701a4e11558c4243edc881cb8907defd6712f4c2bfca4bcadfe1cb5009b59f
+EBUILD pango-1.40.12-r1.ebuild 1701 BLAKE2B f97fb2dc9cf1f55c91e0b0b5059ba7b739e0f1017b5c58dc73cbb8758bd42645d4afe5a2ff36fd5c22cadbdaa4285e035afd48bf7890b3cee58232f35057766b SHA512 54102b30b15ee4ec75ff087282ee1cfc6cd99a5c26df5fa49b566191e93e1cffe825a5af5a91e4aa23bf4c197df61717a8d22706d7ef6cb8190d56145bb1abe9
+EBUILD pango-1.40.14-r1.ebuild 1701 BLAKE2B 08aab38b70ab96697395dce5420c50ec000f3d6c51322a42136f07dda38caf78c79bbbcd7bd569c56b8abc853eeb631d6f0865f650af7fe398ff7f36af77956d SHA512 f7474728b77fd1c2ee5095035a182fb90f325e6094e6f130ee575d6655c1c5b558929b87b8f56c1b67854913c6fd61f3658d7cb99ef79e372883483655990872
+EBUILD pango-1.42.0.ebuild 1745 BLAKE2B 88eff2c258a8ecbab3a179d50e677d8b05d4ae5106d2ae6b325544707d081a404f68abed2fea3f64d300af8d7b5acae86265584efa393a3160a40425d40e55a9 SHA512 77132814106bb908e9eb5e5b89a124f7d449c1f0ade4211e5e2a7a545fd3213032d7edee3472951f1334783a86197c79b743cfd5f953ee7721fb2a219d80ce6f
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.12.ebuild b/x11-libs/pango/pango-1.40.12-r1.ebuild
index 2c65f9f55c81..7097e5a810ec 100644
--- a/x11-libs/pango/pango-1.40.12.ebuild
+++ b/x11-libs/pango/pango-1.40.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ 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.10.92:1.0=[${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:= )
diff --git a/x11-libs/pango/pango-1.40.14.ebuild b/x11-libs/pango/pango-1.40.14-r1.ebuild
index 6030ed55d425..94f249b25876 100644
--- a/x11-libs/pango/pango-1.40.14.ebuild
+++ b/x11-libs/pango/pango-1.40.14-r1.ebuild
@@ -18,7 +18,7 @@ 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.10.92:1.0=[${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:= )
diff --git a/x11-libs/pango/pango-1.42.0.ebuild b/x11-libs/pango/pango-1.42.0.ebuild
new file mode 100644
index 000000000000..6f6620c9c4d6
--- /dev/null
+++ b/x11-libs/pango/pango-1.42.0.ebuild
@@ -0,0 +1,58 @@
+# 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 ~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-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
+}