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.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 23 insertions, 200 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/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
 }