Update patch comments (committed upstream), use get_modname for module extension name

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

4 files changed, 18 insertions, 10 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 933aae787217..9dc8cd2c4ac9 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.349 2012/06/16 09:24:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.350 2012/06/17 08:17:22 grobian Exp $
+
+  17 Jun 2012; Fabian Groffen <grobian@gentoo.org>
+  files/pango-1.30.1-config_get_key_system-declaration.patch,
+  pango-1.30.1.ebuild:
+  Update patch comments (committed upstream), use get_modname for module
+  extension name
 
   16 Jun 2012; Fabian Groffen <grobian@gentoo.org>
   +files/pango-1.30.1-config_get_key_system-declaration.patch,
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 1526502f8711..c2bc2a7c2aec 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,7 +4,7 @@ Hash: SHA1
 AUX pango-1.26.0-lib64.patch 499 RMD160 0056b738ff517c2b1eb1a6b8e8173d91af0ebeaf SHA1 d514148e6ffced2b4f350abe25cd41282dbb3aae SHA256 1bb2671d49c54caf70e9df104ca26af4e76a536db14150a472b093d05d9f6347
 AUX pango-1.28.3-heap-corruption.patch 1554 RMD160 a18ea9747315f936ce5067c84c969eb221d54c3d SHA1 e287ff68f2e430d4b5b54a22f9418eb44d580642 SHA256 5973c66fcae43d5ba9cd55b966f79fd265ae6068d817ff0a0857e2e20093787d
 AUX pango-1.28.3-malloc-failure.patch 6282 RMD160 5161f148cc68b35863ad846bb5bf208509e2b82f SHA1 43d5bcfc1df3e5651c3e4f3804e386e69a57d654 SHA256 6838d7a2aaf81b1434135254f6309e82f9b09292a6d5b00eb0f336e020b825cb
-AUX pango-1.30.1-config_get_key_system-declaration.patch 380 RMD160 8602f50232b10e7f03c36109cd980d68cb71a5f2 SHA1 dbfcf3afe0e97e90e3fb8b4d95694b174fc37fea SHA256 2981ac33e3b47d50418138aa5896c0137bcb91d2bad2e501238eed9f994faad0
+AUX pango-1.30.1-config_get_key_system-declaration.patch 466 RMD160 7528b07836963fc496f271d95cc9e607aaeca5e2 SHA1 0d50ef28d7c36869e0145a852832fab12b35a9e9 SHA256 2b075d8538a87f905f326f40815cc50a0133a53a5c7024a7ff9507d6cd93318f
 AUX pango-1.30.1-coretext-hash.patch 2873 RMD160 334fcd62e54efd822b822d16c5090079683e3214 SHA1 d2dc0121fd925860722eb4d4aa33bd9db22d2671 SHA256 e1f8ba6514b96d5556a20aad341cd23bb1023ff7ca1afb9ec535b436c0928ed3
 DIST pango-1.28.3.tar.bz2 1509501 RMD160 cdfd6d695b169e15801956fbfd54438c109f7a61 SHA1 e72887d6e147b9abf54628c003836e61d97767a1 SHA256 5e278bc9430cc7bb00270f183360d262c5006b51248e8b537ea904573f200632
 DIST pango-1.28.4.tar.bz2 1503441 RMD160 e9dc19b62263fdbd5b58c00092220af87ed929df SHA1 e715954a5a3b358889d15b6235e1965303dbb622 SHA256 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f
@@ -15,13 +15,13 @@ EBUILD pango-1.28.3-r1.ebuild 2833 RMD160 aa189e531fdc8c350b8498c1e18c811e787150
 EBUILD pango-1.28.4.ebuild 2535 RMD160 f268748ca9565d04293d748eab5f1b05f2e26918 SHA1 4524b2443ab8a4ee92bd998b395c19a07876f73a SHA256 36f8333a7d2f8912b3fd793d42ffaa6600f924b6ae02d746ee7260368c893c40
 EBUILD pango-1.29.4.ebuild 2588 RMD160 4bb8850320d07f4e8bbee544465cafc3c699f190 SHA1 3fca6e0aaa8a4a514e38abdabd0943684e6abbf3 SHA256 2ada9e2de31fa581b2f4a8a4ced0c635d67d5fdd7074cde3afddc16480963d37
 EBUILD pango-1.30.0.ebuild 2568 RMD160 60ffe4410d82a61eaf6ad62b2071c2874a03f118 SHA1 2959c173ec91c2046f7bc79984080bf300af918d SHA256 1071809404a27a4c6f8e06079907256269893d6d787c6a3fa6b54b72ed840a7c
-EBUILD pango-1.30.1.ebuild 2972 RMD160 f9d9b44cb6cb4f035ae95c1a1a3f859f83d51994 SHA1 8576098ca63af8275f2e72862ad9f371ed29842d SHA256 6c540217e3c769d15f36488b5ba36f4faa5c475595884a4eb2842f1ec7bde69b
-MISC ChangeLog 44210 RMD160 650a0143f3c77e237cb3a6a914f41f34e5c8bb6a SHA1 bd32fa8a353dd22fba464ba5b52f27f29b8b56d9 SHA256 6868ded9ffbd560c3cd4ed7b8865f57ac2ebb868d5bb478752c9cb2c32f89a0b
+EBUILD pango-1.30.1.ebuild 2994 RMD160 1856e0329f00ad70561f3309e06f148be8ceb5bc SHA1 794c643501b1b3d131644bc409658da2ce168c60 SHA256 4a8952197cd4de0f1370520734f843a90af9648a78a2c27549ca6e1799efc4ed
+MISC ChangeLog 44437 RMD160 601f9d6a5547dd386fb5d61796dc0d3c4d49846e SHA1 39951ba5746da741448b4c83c6faf50f72baf350 SHA256 34454fdcbd9ad1bde2adda67fff7762f349de67324254c55b62ee3e9f82d6896
 MISC metadata.xml 272 RMD160 94ca2c5330dafece28a4cd39f8c53c0926c72b58 SHA1 0594029445efc117f85d07402cacb33f063a8198 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (Darwin)
 
-iEYEARECAAYFAk/cUPEACgkQX3X2B8XHTonbiQCfZvWXnw8O2NB6nJTrdhSLKsV8
-1+cAn3r9R0ciQF9B4s/n92zsaVSclc5B
-=t91F
+iEYEARECAAYFAk/dkpcACgkQX3X2B8XHTokBUgCght26keUbDesS44pDWqxpV6+p
+7T4AoJew+amQwwvSb4BtU10Mkqcl73n8
+=cEb6
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch b/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch
index 0294fcc3b9a6..c7000f6d8586 100644
--- a/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch
+++ b/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch
@@ -1,4 +1,5 @@
 https://bugzilla.gnome.org/show_bug.cgi?id=667960#c5
+http://git.gnome.org/browse/pango/commit/?id=ee3537107a0bc41d5e5b2dc5c71106dec42ad144
 
 --- pango/pango-utils.h
 +++ pango/pango-utils.h
diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild
index d7b5bd1abdc4..4f1889dad2d9 100644
--- a/x11-libs/pango/pango-1.30.1.ebuild
+++ b/x11-libs/pango/pango-1.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.2 2012/06/16 09:24:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.3 2012/06/17 08:17:22 grobian Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -61,7 +61,8 @@ src_prepare() {
 	# In next release
 	epatch "${FILESDIR}/${P}-coretext-hash.patch"
 
-	# missing declaration causing QA abort on x64-macos, notified upstream
+	# missing declaration causing QA abort on x64-macos, should be in next
+	# release
 	epatch "${FILESDIR}"/${P}-config_get_key_system-declaration.patch
 
 	# make config file location host specific so that a 32bit and 64bit pango
@@ -87,7 +88,7 @@ pkg_postinst() {
 
 	# be atomic!
 	if pango-querymodules --system \
-		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
+		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \
 			> "${tmp_file}"; then
 		cat "${tmp_file}" > "${pango_conf}" || {
 			rm "${tmp_file}"; die; }