Version bump for Gnome 3.10. Clean up old revision.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 36 insertions, 24 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index b5f5fdd6cf4c..972db22c6e76 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.382 2013/12/22 15:44:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.383 2013/12/23 23:13:07 eva Exp $
+
+*pango-1.36.1 (23 Dec 2013)
+
+  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org> -pango-1.34.0.ebuild,
+  +pango-1.36.1.ebuild, metadata.xml:
+  Version bump for Gnome 3.10. Clean up old revision.
 
   22 Dec 2013; Jeroen Roovers <jer@gentoo.org> pango-1.34.1.ebuild:
   Stable for HPPA (bug #478252).
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 3d798d09a7cd..1ba590076d87 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -9,18 +9,18 @@ AUX pango-1.32.1-lib64.patch 1451 SHA256 f6b94cb1edfdb7d56ca75642f1c3c556c53b654
 AUX pango-1.32.5-AM_CONFIG_HEADER.patch 930 SHA256 6ca36b8067ab02ffdd92bd8f6300e1fef30b8ec2e504b3230f13cea7288d47a7 SHA512 6aa2447e02a376d22b633b8884dafc5a03576d66caa686e0215551f3cb9e203b94e40a6f5437aaada60fad552267267ef3ebec27f8506b78c771b9430d55d2b5 WHIRLPOOL fcf085614bc48ca68372ac990daeb38b6a813d8b201b38f9b1b1410517f085654adb36877c227391b49e869f58039582f744732a6d7e77a1b5555b5ccf6c5c03
 DIST pango-1.30.1.tar.xz 1162828 SHA256 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe SHA512 39ac0df7e1b2e4dc0de29b977b06eae71a9f8ddcefbef1e96899d182c581eaa1dafedc581c18382e297a90a9621f9415e0e3c8868f388f963b97590e45e2b1d6 WHIRLPOOL 2cc6debed816735ae51bc326227969eba103bf4ff79bed74be896e7ae68448feed924fd0440bc5b2a10983ab4e874233de55ae191b28bdbabde6b6d830c418a9
 DIST pango-1.32.5.tar.xz 999156 SHA256 7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821 SHA512 1a950a36cd419d15cf4f98fd15a1a50754ac63015c298e2de17b1174be253aefb3994b8fcc108bff90deab8c4864eee30bb7115205bb24989efd8442f122b101 WHIRLPOOL ea6640f644e9eb51e29d5ffdc62005fed50f18e1ab665a22902ce8dc1a03a087c71e7af2280d9415f1d01e561e28d3fc70738a9550ddb293b65fb6eb8e45b8b3
-DIST pango-1.34.0.tar.xz 1013600 SHA256 105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27 SHA512 26ab663d720e46baafb1c58081203bbf03f9b605ff3d665855cc80f2daa387c2e33df81087ebbafa83ca173902e13f81e0e913b5c1b1df5572e9011e1b4fa5db WHIRLPOOL 6fc9fa0a483f5e58e785d84fdb6ececbc32ca837b7661b6aa768b9ece99158b1b3d561939ff11cf05ea3e5f2bbe887ee52ea50426098fbe12711b9d04dcfa6d1
 DIST pango-1.34.1.tar.xz 1015112 SHA256 1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c SHA512 7ab0961c05cc30687827fe7fc8b86827bcd7916c048811c09796c38d449575eab292e817f3339be44e1e6a61f7aac7c172ceccaed7deda6e7b4286e8a4436255 WHIRLPOOL 478e6696678d823cd8cbbe9dc39a3a9c629c0dded33d609bf9bfb66aabcbe3089a401ea16ada15200b64dc032c3084ac318bcd8d6035c232e077eb6c381a7714
+DIST pango-1.36.1.tar.xz 1017924 SHA256 42e4b51cdc99e6878a9ea2a5ef2b31b79c1033f8518726df738a3c54c90e59f8 SHA512 4807462ad2ff886ebdf83a6d4a4f7f855163de1d58a9cdb94de48d003bbdff2697ebb0628029e6270cee13071b81f8104b35ec9e0d6801312969299b8d8f859c WHIRLPOOL 7e388d553a9dbe92705db19089b499227cd769a80b14bb59910e82f8601f0b7caef10d7abf5f8eba6785cc656ab165979697d2f3899dd41d3ff489b689cf8201
 EBUILD pango-1.30.1.ebuild 2856 SHA256 09558d613eaaf77f8eeab1076284302de1e01fb09bed5f8a03e796c1a1af8e8a SHA512 1587273940291e3a3d07ef7b09f87141e2ad768951c94b1cfc3b8570e4e7ced4d96ea49affd419979abc2061c2bc10ea3a01c1058bb8cc2d62e6df2cc9374ec3 WHIRLPOOL 41f54ddccec52e8ced2cf6928e33a56755e96353421c8734a73c781d4bc482b7f93a87fae4e739e7b8e173c2ab2898b952231f73a346404eb74557dfc1349171
 EBUILD pango-1.32.5.ebuild 2485 SHA256 db1f27cefce2bb99d6642cf69446d1981c5b5cdd9db62febbe540f3587a669a6 SHA512 e02d2db2ba835e6fe0d3aa6765f3fb7ec509a7a37f7cfbf4fc37e729c5a8e506fb265620fc0b10b7bffd3344e2ae0dc18718b1e160f8eb86eb653209a78a61f1 WHIRLPOOL 0f3a219cb0b82f2010715eef1c42a2df3a0780f9749a0dff106986014d5d9632a13f5070d309075cc01ccd56a3212b5ab1a671dc52e1e9acee558cbbd5025ea8
-EBUILD pango-1.34.0.ebuild 2378 SHA256 1d2fea6a82a4af10e55d1d0171b448b603b14201d90759343810e6bd375d6377 SHA512 7221aa34255efcb470ec8ee54ab431fb374a8b5726e24253f952032695877237bea179ca36451c66ce9f1accf4e5f7d9920d5373d329381148d8d67b3584d0a4 WHIRLPOOL eab39e57d2e9b8e6e533f18e2c64db643f843a0775f0849b63916df9fede373eaa717aadcfa36c220f1e70f58d59a9518ef9a94f9acef66137fa9e45a7890116
 EBUILD pango-1.34.1.ebuild 2491 SHA256 8de9aa91166b12cef8ba6eefc6e151786903e6ce29f90f8b9a7e577a13b15d7c SHA512 78d87f1b7f3287b558c323a41fe302b0e76cdac563a1086a22e947729f51166196fd04deac6fc8ee35e99dbbc3454da53ba4e0c2db8f9b0d8ec846a009266564 WHIRLPOOL 8e2563bb5de1edb4c266263596d8f8f3dcd6bb3e88d9ff6c116d2c9217b3f3847291f0b03a270aa4e1c67bd506a5c579eb548feb96cca51c3b135effacb4d5e4
-MISC ChangeLog 48851 SHA256 9be60f94e79ebe2444e66d6a24de3db74509832116b7be36ff98b85b657a80f8 SHA512 4194b729067e57bd388cce379cbe45c9c82a32af81b4e5ac7c4b0b75c1087853dcefb160a888534a89fc092c517242128df39b95f77f17a5e1a28fc551be7358 WHIRLPOOL 2f2b9ee1182c3062c1b0954b9c0eb6f60b8899b8d41c0aea31abc15ff43acef64999b5f89811dfd86387e533eb3af65669cf8f1f310a65051148d5777a51a510
-MISC metadata.xml 236 SHA256 0d79f522662df9549a3e12a1b925ebb74687f7093d1b2d05840b159c7aa1206b SHA512 1ffd95ae34da0b46cf88c3f593d4953f8a9d51ecce97c40fd0c390abbee9f33389469e410b12d668cfdc04fbc1eff2da91fc83e9d3aff4f3e31f5729d213ce3e WHIRLPOOL 948a017ce4de0653a24e7d7b6e34a7ed76ba20282f80d0629e6eccb4aebed21a62a53253e75efec4ca0da1a3b4bad9cfea4145b43ab2985b060673463dade1ad
+EBUILD pango-1.36.1.ebuild 2426 SHA256 06d87cc8756d53c761fcc8b50692671d28c834811ce0b5ab7d3fa557e22d8286 SHA512 12d80bd9ff694e9dd83682db0f1540bb4edd5ab683b88359971425378137d08e1f5c75a742e2378c038cc8d105c821a555000a5e012c9aa57b8d5cb4d47f8a51 WHIRLPOOL 81e512078ab8c418ba51fd08b9ab9595427944f04a8a743413570afd8a4cff411674ead91503dad4543f1f5adb7c2db2b2586fc2ef60d867cdd204ae32c1e71c
+MISC ChangeLog 49049 SHA256 514f9698dfefd89d459c9af34dbaba05ae504217d394fa0cd20f8a94f46f3e6f SHA512 9e25e45a5b98b72bb7b40e8c0a17fce1d1a33f5ef53447af40d3244abf4e485f3f6e2eee9e5a22c4638439cb99b5c1a43db69f5b96884ec37ee4d27306301f53 WHIRLPOOL 331b6d96e067186acd9efd1857b000e37eda9a99bf098bec2cbb07e239aeac01ed7aeee8abafca4e734e904b428aac23004521d856ee5d30f9834862db1377d0
+MISC metadata.xml 244 SHA256 20812e9c9f3ceb9adaeda150307d00c8e8d8ad03faac4518cf753cbdf5c729bb SHA512 849c0f727d60d5c50ed15fc640f59246c98115c37095507db0a6e03c196ed9875ca71d95b7f12170ec8ec81e7f907a364522c5ea7bcf51d253b264ab404a902f WHIRLPOOL c6e167a16dcd88d78cd123dcc5283a5adcc08daaf7dd713c139a2a606dbe2009f7c68b4d2d017c8357f5e422ee9b3e2516ccc7139eb8cdabebdb106be82582e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlK3CPkACgkQVWmRsqeSphNhcwCbBvrZhX9l8dVTCXUfcGJDLEFS
-zSUAmwSvzlfV8KYEOAFpkgHXCoh8h+kY
-=CMZN
+iEYEAREIAAYFAlK4w4QACgkQ1fmVwcYIWAYBJACghDKHm/5KYvuBCbAIaINiwfFV
+KMkAoOO6WmHdSbvclLfv1aAoOIcyTfD0
+=wnU6
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index 1ebecbbd0df7..e6cd55339ff7 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<upstream>
-  <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
-</upstream>
+  <herd>gnome</herd>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/x11-libs/pango/pango-1.34.0.ebuild b/x11-libs/pango/pango-1.36.1.ebuild
index f3c5112f347b..05c95b0aad75 100644
--- a/x11-libs/pango/pango-1.34.0.ebuild
+++ b/x11-libs/pango/pango-1.36.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.34.0.ebuild,v 1.3 2013/06/06 14:24:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.1.ebuild,v 1.1 2013/12/23 23:13:07 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -22,32 +22,38 @@ RDEPEND="
 	>=dev-libs/glib-2.33.12:2
 	>=media-libs/fontconfig-2.10.91:1.0=
 	media-libs/freetype:2=
-	>=x11-libs/cairo-1.7.6:=[X?]
+	>=x11-libs/cairo-1.12.10:=[X?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	X? (
 		x11-libs/libXrender
 		x11-libs/libX11
-		>=x11-libs/libXft-2.0.0 )"
+		>=x11-libs/libXft-2.0.0 )
+"
 DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/gtk-doc-am-1.15
 	virtual/pkgconfig
 	X? ( x11-proto/xproto )
-	!<=sys-devel/autoconf-2.63:2.5"
+	!<=sys-devel/autoconf-2.63:2.5
+"
 
 src_prepare() {
-	tc-export CXX
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with X xft)
-		"$(usex X --x-includes="${EPREFIX}/usr/include" "")"
-		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")
-
 	epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
 	eautoreconf
 
 	gnome2_src_prepare
 }
 
+src_configure() {
+	tc-export CXX
+
+	gnome2_src_configure \
+		--with-cairo \
+		$(use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+}
+
 src_install() {
 	gnome2_src_install