diff options
| -rw-r--r-- | x11-libs/pango/ChangeLog | 13 | ||||
| -rw-r--r-- | x11-libs/pango/Manifest | 26 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.26.0-lib64.patch | 20 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch | 29 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch | 13 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.30.1-coretext-hash.patch | 75 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch | 29 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.36.7.ebuild (renamed from x11-libs/pango/pango-1.36.3-r2.ebuild) | 44 |
8 files changed, 29 insertions, 220 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index ee5970ff4626..d9f295aee04f 100644 --- a/x11-libs/pango/ChangeLog +++ b/x11-libs/pango/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for x11-libs/pango # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.417 2014/08/25 11:04:04 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.418 2014/09/04 15:07:32 pacho Exp $ + +*pango-1.36.7 (04 Sep 2014) + + 04 Sep 2014; Pacho Ramos <pacho@gentoo.org> +pango-1.36.7.ebuild, + -files/pango-1.26.0-lib64.patch, -files/pango-1.30.1-AM_CONFIG_HEADER.patch, + -files/pango-1.30.1-config_get_key_system-declaration.patch, + -files/pango-1.30.1-coretext-hash.patch, + -files/pango-1.32.5-AM_CONFIG_HEADER.patch, -pango-1.36.3-r2.ebuild: + Version bump, stop installing manually the cache file under /etc using + upstream way of generating the file in proper place under /usr/lib that + handles all multilib magic by itself. Drop old. 25 Aug 2014; Agostino Sarubbo <ago@gentoo.org> pango-1.36.5.ebuild: Stable for alpha, wrt bug #512012 diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest index 8a77c4032a16..e646ea4bc2aa 100644 --- a/x11-libs/pango/Manifest +++ b/x11-libs/pango/Manifest @@ -1,33 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX pango-1.26.0-lib64.patch 499 SHA256 1bb2671d49c54caf70e9df104ca26af4e76a536db14150a472b093d05d9f6347 SHA512 5f668fe0e1e3465142ed5e959cc628cea508c1f383a519eef6d1ee0b5d08bbbd31b0fbd1cf44c3ba290aab143e7871ebf905ca6cda3fe812cd362a8114e8c17d WHIRLPOOL 6c586879d2f6b7e6ea2adfe4859ca18d8a1268878b608e22246a940d8959aafa2a5068e2527cf5ee72b2984e70dc41bd5b33c5b211ddb22739cc523b64c9698a -AUX pango-1.30.1-AM_CONFIG_HEADER.patch 930 SHA256 1e5a87201993614254bac5a6506ac6234c68d4726eb077b5b02d43eb5cc6206c SHA512 a57c970f95c5146580261ebd46279afd829afa6792fb7b70fcb2efeb968bc4c9c7082761bfb4b306fa640806e792ff8441b1840288cc47c497207f5e955318cf WHIRLPOOL 4b813b1ec2e742ae2292456bead5b63ff30ef93c0423983797a2ac1d73a39b240f6a33cc912e2a94028947c55ccdba866cf0a6259e7c6edac497cf236c4f4418 -AUX pango-1.30.1-config_get_key_system-declaration.patch 466 SHA256 2b075d8538a87f905f326f40815cc50a0133a53a5c7024a7ff9507d6cd93318f SHA512 6dc34b7701ecf32b4933b05ea6bb85f15dbc8db46456931673aee0b838764ee9ac176f8c9c6c688c3d5d485618434da61365bd00b58933a9ebf27cef2fa21f28 WHIRLPOOL 16a269e69e0893b431aa4a39d7e6b4bc9f3b46fb22deabc43d8a4f1447dc45e0afb2891caaa860edc35cb86a8ec949f2a11d5bdcd932e11310392467adce1554 -AUX pango-1.30.1-coretext-hash.patch 2873 SHA256 e1f8ba6514b96d5556a20aad341cd23bb1023ff7ca1afb9ec535b436c0928ed3 SHA512 e2a75b78cce63ba94683ad217a9a56156100bf6076983178d2ce446bcfbcee44ed26766991d04e578fe6b38cdc6668d7cf7c47a87a7a7967430588e589be50fa WHIRLPOOL 832a357d75ca441be60014161099b1c78c3dd961d132d181ec14a91f7d79b7c6c166be2100882b051ccd31e42c160618473f8866ece2b296ad3aacad7c53363e AUX pango-1.32.1-lib64.patch 1451 SHA256 f6b94cb1edfdb7d56ca75642f1c3c556c53b654d8ec8dcf391f0db9239092937 SHA512 a790850a498f5b164ce1f591239787e452d7b3b51b1b3edef26a1e3f722bedff2282687f1074a1a10f996aa798266a082871de6d9cbdb5ff9442023cbfb9c1ae WHIRLPOOL c41345af26d7dd6658c3e64fe2a59bcaed0b5bc8466f94775933d2812ba989adb56a2417559d37853fd5e0e53375c62ec1f6919326ef9ccf09a602c2e69be672 -AUX pango-1.32.5-AM_CONFIG_HEADER.patch 930 SHA256 6ca36b8067ab02ffdd92bd8f6300e1fef30b8ec2e504b3230f13cea7288d47a7 SHA512 6aa2447e02a376d22b633b8884dafc5a03576d66caa686e0215551f3cb9e203b94e40a6f5437aaada60fad552267267ef3ebec27f8506b78c771b9430d55d2b5 WHIRLPOOL fcf085614bc48ca68372ac990daeb38b6a813d8b201b38f9b1b1410517f085654adb36877c227391b49e869f58039582f744732a6d7e77a1b5555b5ccf6c5c03 DIST pango-1.36.3.tar.xz 1021656 SHA256 ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22 SHA512 74f94c4e853f8d7538990589e5c9796e48cce32f935cf50d0155b57d00fbce155c9dd659b0803b861c568ddedffb14712fbcbefadfeefb43d2ed0fab949258a2 WHIRLPOOL c63a1b5d27eb55530bfc86da77f25fe6c022346cf30f1beeaaa1ef3b90cee6afde44d0735ad77811e7cc487cd35bb18efc667aaa470725c0b2cc3fdb6e495560 DIST pango-1.36.5.tar.xz 1023952 SHA256 be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8 SHA512 d2c2f5ffcc67ec9f4bf942905b09294be4896f11b1fd66b6e63e75c3f269c8b5c1f9e75127f7b550fa354e0fc66eb32de24d262caa784ee7ac66709da776386c WHIRLPOOL ac6ecb13dbba51527a629e1b216ed6affa9881ffffd5ed90d3f1d96772a17c7815ae0a3c2340444c473092a1c2ec8966110bb1f2c6df2b0af7358a1c9e8255de -EBUILD pango-1.36.3-r2.ebuild 3012 SHA256 7a1c0f451f94f56c5549375cac2934537e4a40b6115cb1bb658ffcdfa5812db6 SHA512 44371b3048e5409d3d618256bb7b0f7be1d7c8865a4cfd0ff57de5dc870534417a7ebe37ed6540cf087c74b895c203cf495c865dc3e4af59fc424fd0f27ce3e7 WHIRLPOOL c830dbe981e09d61f75f28ee550ab6727deee90e91a602a08255904fa6b19328b71c04bdb93e92c7c3f8b74060376ec9a88c3c5f1a87566c328997fabcf78cf6 +DIST pango-1.36.7.tar.xz 1033896 SHA256 1f7b527423a1b3044fd9ae7fbe054107b06723ff1c73e0b5f7bf9b84358d404a SHA512 a048888ffdcf7dd574da01598a86d936540d057d2226d122c73c024d401c281260fd93262e7a683d88b58b9a90e44e7e7597945a84a4d4f81094e1498a4247e3 WHIRLPOOL d88a3fe0f9f6b9c403de1f6662db41c2e3f83e401d4413f9ab22a9e0525edd16eee7248c4b5555fc7c178dd167f06bbd66df5b3c1ee8a0b9febf244abf8256a8 EBUILD pango-1.36.3.ebuild 2424 SHA256 350676a7576b39de432c47d59b50d05e7f83e7f7de40052155b08fa3ab30f583 SHA512 dfb39403ecaa8c9515999009b8ac4296e5364f58340218fe377f0e471e12e07e0e9c4f25ccf041bd786cc715a2c645f9db2f64e9b28e88a23eea627cb5fdde17 WHIRLPOOL 0a154614f755c08bb6206cea8fc40f90c4294d8be196e749e2e87dee6bf4b9899366043b01253a8dc49166dc292fccb35eb1c9b6021c03aa8be2c38757c2e92a EBUILD pango-1.36.5.ebuild 3015 SHA256 2a33e45179d5a3d478182843b29b9a34bb3ab18b4fadf2154824c344307d2d81 SHA512 c126762cf94317e3d2c3fc033ad976c354f2b5a2010d31ac23ad4af82f42ed76acf6d4c63ba992caabb61a75e0fcc7d11afe8bff56aca6816b44f49ae4ee774b WHIRLPOOL 5b917d76b3b78631545fa05655a3fcaddb2fcd1ca8d7789cdf25746348b778692b13e5b6a66c1150913aa8e45b1459050318030953a9511a60e23d7c91624545 -MISC ChangeLog 53411 SHA256 70a04e59392ae7269fd98f77dfbd045d1f6e5b86ea4d080bf7eae178207454f3 SHA512 ac00c66c8dc2da45eb4b4d51d6cc21135c6d42788cf6086417813f7ea275f000e0ed4516cd9015eb300857b58e88132bb213abf153bcf5e7d4d1ec53463537d2 WHIRLPOOL 0ce26b67234505238fb7ff37ad79b72735d705bc44e4f093eb867067bca59b48ad5603b19a6a2aa4acddf377bade6ea8cd48d962e22d032d617278bca87d0c6e +EBUILD pango-1.36.7.ebuild 2314 SHA256 ab4df61ba76dd081f7a0e9b8ccd6fb4e88b3928d0bc8b33493e69d5575f5c0d6 SHA512 55a24b8521dc97e96e3b49060a3910f5dd83733db5fafea2b16065307f8ec33640408176b7f9784a8f1d69451d1f3e6acf7a6375e71ab388510e0afc0f333bb4 WHIRLPOOL 8ccfaee41244452291ea91c929c0e78ab1b1823b93fa849d6353fdc8fde9d8c35692e45bd0757c108eec2861eb4f7a9440c6109a23f731a4dd9e318096a1da56 +MISC ChangeLog 53964 SHA256 a362dfe860cc5cdd5c666d07139e5263decfb998949402927f1a75a20766bf2b SHA512 50ed66a19c5788d20b28d86947b697af5b63ad59746156c7a7be546deb16d150d118d2aac529116140dad0d110c1c2777626939ca9ae06ba7c3f91be4dec70d0 WHIRLPOOL 4ba750a34a31a86c091013e4d81bc75bcfa7447b025ee2848496ef2afbc416bbb629c202b2975ff31490a7ab4b337efebefb09d0d6d21436e94464f3544217db MISC metadata.xml 244 SHA256 20812e9c9f3ceb9adaeda150307d00c8e8d8ad03faac4518cf753cbdf5c729bb SHA512 849c0f727d60d5c50ed15fc640f59246c98115c37095507db0a6e03c196ed9875ca71d95b7f12170ec8ec81e7f907a364522c5ea7bcf51d253b264ab404a902f WHIRLPOOL c6e167a16dcd88d78cd123dcc5283a5adcc08daaf7dd713c139a2a606dbe2009f7c68b4d2d017c8357f5e422ee9b3e2516ccc7139eb8cdabebdb106be82582e5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJT+xgmAAoJELp701BxlEWfoCwQAI/Dmw3/g3jqfNFuUp5w1dO0 -0ZtIumAioJtyWpHFOpRmiD5g4kns66tfWepFMx86/dknQeTGqvA26KSmOsMPhxw/ -kEU+n7NyJ7ysxkj79wk/uaZwtpOXnX3J9dVRryZ1/kuTaJxujANyrUzYw+jht0e2 -IbseBVhNwupoKUGSIm4MwJ59fDqE0jE8Lpn9+Ebf37nxVR4s6vToTtR7agS2lJz+ -RUPvZ+6AzcB21nyJXJhRj5C+kCg3d4EQ/m2XoIW56+E5IR2iHJFXr5bJNd8jfrBR -GOUMkuCNdRHcyTaN9QcFeGRMb2+2Ne9uQnb2K9/I3BiC1iZ3Oj/RKXoUl5ezDqFX -WAEt7ZJXjZo4yqnhJdyvPdkGBifm35+WOyCUfb58OI//oxDxTntf5A6/mg37dbQz -uSQRUAKp3i6IJSsoe1gYzzBoCsiO2ceRU7RPgdSNAryBlqW/yDv6vPcfvimaP68c -33O/DLWaIPzCwlSo5G2vzOio6JtoRMe0dT1OtjzmoD+4bE5FAifaV1hbO5qKbkc2 -kdy+gVY42e+LXu6KEruBFhqJUTvYQjiFR4iD/VGysONdpwOiMH84Wmb+5WsvG4tT -z2XoqRGLmcZD9kkdzPLBzNlSkO23+hyV24XCS3u37AvItwexYHEmri8OVMCddVDm -mxgSJpcYdq9N8hWzTKR9 -=ZoOC +iEYEAREIAAYFAlQIgDUACgkQCaWpQKGI+9S9oQCfc028ePQPZVv7ns+lMj+0ppR/ +4HcAoIA/7A6X4oZhOeLdf5msOEjf1ZKq +=u9rl -----END PGP SIGNATURE----- diff --git a/x11-libs/pango/files/pango-1.26.0-lib64.patch b/x11-libs/pango/files/pango-1.26.0-lib64.patch deleted file mode 100644 index cdbdd5024e28..000000000000 --- a/x11-libs/pango/files/pango-1.26.0-lib64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pango/Makefile.am -+++ pango/Makefile.am -@@ -16,6 +16,7 @@ - -DPANGO_ENABLE_BACKEND \ - -DPANGO_ENABLE_ENGINE \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ -+ -DHOST=\"$(host_triplet)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ - -DG_DISABLE_DEPRECATED \ ---- pango/modules.c -+++ pango/modules.c -@@ -353,6 +353,7 @@ - - if (!file_str) - file_str = g_build_filename (pango_get_sysconf_subdirectory (), -+ HOST, - "pango.modules", - NULL); - diff --git a/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch b/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch deleted file mode 100644 index 0858f1032696..000000000000 --- a/x11-libs/pango/files/pango-1.30.1-AM_CONFIG_HEADER.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 51f952a6e018049d4b52bbd419653745cf1aaab3 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Sun, 6 Jan 2013 23:15:44 -0600 -Subject: [PATCH] Bug 691263 - Build with automake-1.13 broken - -Replace long obsolete AM_CONFIG_HEADER with proper AC_CONFIG_HEADERS. -automake-1.13 errors out upon seeing former. - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 8362280..dcd115e 100644 ---- a/configure.in -+++ b/configure.in -@@ -54,7 +54,7 @@ dnl -Wno-portability tells automake to stop complaining about the - dnl usage of GNU Make specific features. - AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - - PANGO_VERSION_MAJOR=pango_version_major() --- -1.8.2.1 - 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 deleted file mode 100644 index c7000f6d8586..000000000000 --- a/x11-libs/pango/files/pango-1.30.1-config_get_key_system-declaration.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 -@@ -42,6 +42,7 @@ - int *out); - - #ifdef PANGO_ENABLE_BACKEND -+char * pango_config_key_get_system (const char *key); - char * pango_config_key_get (const char *key); - void pango_lookup_aliases (const char *fontname, - char ***families, diff --git a/x11-libs/pango/files/pango-1.30.1-coretext-hash.patch b/x11-libs/pango/files/pango-1.30.1-coretext-hash.patch deleted file mode 100644 index 31d8c502db6d..000000000000 --- a/x11-libs/pango/files/pango-1.30.1-coretext-hash.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 70a85d441d973883af4afb57599bc570eeea4c83 Mon Sep 17 00:00:00 2001 -From: Kristian Rietveld <kris@loopnest.org> -Date: Tue, 5 Jun 2012 22:34:59 +0200 -Subject: [PATCH] coretext: don't insert item in the hash if it originated - from the hash - -Oversight in my fallback fix, this resulted in things being wrongly -destroyed due to unrefs. Oops. ---- - pango/pangocoretext-fontmap.c | 25 ++++++++++++++----------- - 1 files changed, 14 insertions(+), 11 deletions(-) - -diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c -index a856593..034d050 100644 ---- a/pango/pangocoretext-fontmap.c -+++ b/pango/pangocoretext-fontmap.c -@@ -1284,13 +1284,11 @@ pango_core_text_font_map_load_fontset (PangoFontMap *fontmap, - - if (G_UNLIKELY (!fontset)) - { -+ gboolean insert_in_hash = TRUE; -+ - fontset = pango_core_text_fontset_new (&key, desc); - -- if (G_LIKELY (fontset)) -- g_hash_table_insert (ctfontmap->fontset_hash, -- pango_core_text_fontset_get_key (fontset), -- fontset); -- else -+ if (G_UNLIKELY (!fontset)) - { - /* If no font(set) could be loaded, we fallback to "Sans", - * which should always work on Mac. We try to adhere to the -@@ -1308,7 +1306,9 @@ pango_core_text_font_map_load_fontset (PangoFontMap *fontmap, - language); - - fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key); -- if (G_UNLIKELY (!fontset)) -+ if (G_LIKELY (fontset)) -+ insert_in_hash = FALSE; -+ else - fontset = pango_core_text_fontset_new (&key, tmp_desc); - - if (G_UNLIKELY (!fontset)) -@@ -1335,7 +1335,9 @@ pango_core_text_font_map_load_fontset (PangoFontMap *fontmap, - } - - fontset = g_hash_table_lookup (ctfontmap->fontset_hash, &key); -- if (G_UNLIKELY (!fontset)) -+ if (G_LIKELY (fontset)) -+ insert_in_hash = FALSE; -+ else - fontset = pango_core_text_fontset_new (&key, tmp_desc); - - if (G_UNLIKELY (!fontset)) -@@ -1346,11 +1348,12 @@ pango_core_text_font_map_load_fontset (PangoFontMap *fontmap, - g_error ("Could not load fallback font, bailing out."); - } - } -- -- g_hash_table_insert (ctfontmap->fontset_hash, -- pango_core_text_fontset_get_key (fontset), -- fontset); - } -+ -+ if (insert_in_hash) -+ g_hash_table_insert (ctfontmap->fontset_hash, -+ pango_core_text_fontset_get_key (fontset), -+ fontset); - } - - /* Cannot use pango_core_text_fontset_key_free() here */ --- -1.7.8.6 - diff --git a/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch b/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch deleted file mode 100644 index 634c9ab4ab38..000000000000 --- a/x11-libs/pango/files/pango-1.32.5-AM_CONFIG_HEADER.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f45cdd9a4fef1096b071e6bad4cc40e06f48ba46 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Sun, 6 Jan 2013 23:15:44 -0600 -Subject: [PATCH] Bug 691263 - Build with automake-1.13 broken - -Replace long obsolete AM_CONFIG_HEADER with proper AC_CONFIG_HEADERS. -automake-1.13 errors out upon seeing former. - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index bb37a60..7ed2832 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,7 +54,7 @@ dnl -Wno-portability tells automake to stop complaining about the - dnl usage of GNU Make specific features. - AM_INIT_AUTOMAKE(1.9 gnits dist-xz no-dist-gzip -Wno-portability) - m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) --AM_CONFIG_HEADER([config.h]) -+AC_CONFIG_HEADERS([config.h]) - - - PANGO_VERSION_MAJOR=pango_version_major() --- -1.8.2.1 - diff --git a/x11-libs/pango/pango-1.36.3-r2.ebuild b/x11-libs/pango/pango-1.36.7.ebuild index 0a02e25cfadd..690201f8b7ce 100644 --- a/x11-libs/pango/pango-1.36.3-r2.ebuild +++ b/x11-libs/pango/pango-1.36.7.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.3-r2.ebuild,v 1.5 2014/06/24 22:19:40 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.36.7.ebuild,v 1.1 2014/09/04 15:07:32 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" -inherit autotools eutils gnome2 multilib toolchain-funcs multilib-minimal +inherit gnome2 multilib toolchain-funcs multilib-minimal DESCRIPTION="Internationalized text layout and rendering library" HOMEPAGE="http://www.pango.org/" @@ -35,7 +35,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.15 + >=dev-util/gtk-doc-am-1.20 virtual/pkgconfig X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) !<=sys-devel/autoconf-2.63:2.5 @@ -45,13 +45,6 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/pango-querymodules ) -src_prepare() { - epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" - eautoreconf - - gnome2_src_prepare -} - multilib_src_configure() { tc-export CXX @@ -62,14 +55,14 @@ multilib_src_configure() { $(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 - - local PANGO_CONFDIR="/etc/pango/${CHOST}" - dodir "${PANGO_CONFDIR}" - keepdir "${PANGO_CONFDIR}" } pkg_postinst() { @@ -77,26 +70,11 @@ pkg_postinst() { multilib_pkg_postinst() { einfo "Generating modules listing..." - local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" - local pango_conf="${PANGO_CONFDIR}/pango.modules" - local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX) + "${CHOST}-pango-querymodules" --update-cache - # be atomic! - if "${CHOST}-pango-querymodules" --system \ - "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \ - > "${tmp_file}"; then - cat "${tmp_file}" > "${pango_conf}" || { - rm "${tmp_file}"; die; } - else - ewarn "Cannot update pango.modules, file generation failed" - fi - rm "${tmp_file}" + # Remove old autogenerated file to prevent collisions with newer + rm -f "${EROOT}/etc/pango/${CHOST}/pango.modules" } - multilib_foreach_abi multilib_pkg_postinst - if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then - elog "In >=${PN}-1.30.1, default configuration file locations moved from" - elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and" - elog "~/.config/pango/pangox.aliases" - fi + multilib_foreach_abi multilib_pkg_postinst } |