x11-libs/pango: 1.34.1 → 1.36.1

3 files changed, 122 insertions, 17 deletions

diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
new file mode 100644
index 00000000..4677ca9d
--- /dev/null
+++ b/x11-libs/pango/Manifest
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+DIST pango-1.36.1.tar.xz 1017924 SHA256 42e4b51cdc99e6878a9ea2a5ef2b31b79c1033f8518726df738a3c54c90e59f8 SHA512 4807462ad2ff886ebdf83a6d4a4f7f855163de1d58a9cdb94de48d003bbdff2697ebb0628029e6270cee13071b81f8104b35ec9e0d6801312969299b8d8f859c WHIRLPOOL 7e388d553a9dbe92705db19089b499227cd769a80b14bb59910e82f8601f0b7caef10d7abf5f8eba6785cc656ab165979697d2f3899dd41d3ff489b689cf8201
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREKAAYFAlKqOWMACgkQ1fmVwcYIWAY1WQCfUAEzAR+wHClW29dbsLB8a264
+a3oAnRYv5D3j3Xrpt/Up9HUj33Bcz95Z
+=jJXK
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.36.1.ebuild b/x11-libs/pango/pango-1.36.1.ebuild
new file mode 100644
index 00000000..dbe41c67
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection"
+
+RDEPEND="
+	>=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)]
+	>=dev-libs/glib-2.33.12:2
+	>=media-libs/fontconfig-2.10.91:1.0=
+	media-libs/freetype:2=
+	>=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 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	virtual/pkgconfig
+	X? ( x11-proto/xproto )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+src_prepare() {
+	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
+
+	local PANGO_CONFDIR="/etc/pango/${CHOST}"
+	dodir "${PANGO_CONFDIR}"
+	keepdir "${PANGO_CONFDIR}"
+}
+
+pkg_postinst() {
+	gnome2_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)
+
+	# be atomic!
+	if 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}"
+
+	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
+}
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index e47ce313..3058c259 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,47 +19,52 @@ SLOT="0"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 IUSE="X +introspection"
 
 RDEPEND="
-	>=media-libs/harfbuzz-0.9.9:=
+	>=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)]
 	>=dev-libs/glib-2.33.12:2
-	>=media-libs/fontconfig-2.5.0:1.0=
+	>=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
-	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-	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
 
-	local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+	local PANGO_CONFDIR="/etc/pango/${CHOST}"
 	dodir "${PANGO_CONFDIR}"
 	keepdir "${PANGO_CONFDIR}"
 }