Version bump, drop old

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

3 files changed, 109 insertions, 94 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 16e1e48a4d81..8aa0c63ac80a 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,12 @@
 # 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.408 2014/06/24 22:19:40 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.409 2014/06/26 09:50:15 pacho Exp $
+
+*pango-1.36.5 (26 Jun 2014)
+
+  26 Jun 2014; Pacho Ramos <pacho@gentoo.org> +pango-1.36.5.ebuild,
+  -pango-1.30.1.ebuild:
+  Version bump, drop old
 
   24 Jun 2014; Michał Górny <mgorny@gentoo.org> pango-1.36.3-r2.ebuild:
   Lower dev-libs/glib dep to first known EAPI=5 version, requested by Funtoo for
diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild
deleted file mode 100644
index 72eb039dc3ea..000000000000
--- a/x11-libs/pango/pango-1.30.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.30.1.ebuild,v 1.15 2014/04/27 15:43:24 pacho Exp $
-
-EAPI="4"
-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="ia64 ppc ppc64 sparc"
-
-IUSE="X +introspection"
-
-RDEPEND=">=dev-libs/glib-2.31.0:2
-	>=media-libs/fontconfig-2.5.0:1.0
-	media-libs/freetype:2
-	>=x11-libs/cairo-1.7.6[X?]
-	X? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		>=x11-libs/libXft-2.0.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	X? ( x11-proto/xproto )
-	!<=sys-devel/autoconf-2.63:2.5"
-
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
-}
-
-src_prepare() {
-	tc-export CXX
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with X x)
-		$(use X && echo --x-includes="${EPREFIX}"/usr/include)
-		$(use X && echo --x-libraries="${EPREFIX}"/usr/$(get_libdir))"
-	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-
-	# In next release
-	epatch "${FILESDIR}/${P}-coretext-hash.patch"
-
-	# 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
-	# wont fight with each other on a multilib system.  Fix building for
-	# emul-linux-x86-gtklibs
-	if multilib_enabled ; then
-		epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch"
-		epatch "${FILESDIR}/${P}-AM_CONFIG_HEADER.patch" # fixed in 1.34
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	einfo "Generating modules listing..."
-
-	local PANGO_CONFDIR="${EROOT}/etc/pango"
-	multilib_enabled && PANGO_CONFDIR+="/${CHOST}"
-
-	mkdir -p "${PANGO_CONFDIR}"
-	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.6.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-1.36.5.ebuild b/x11-libs/pango/pango-1.36.5.ebuild
new file mode 100644
index 000000000000..241c60559975
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.5.ebuild
@@ -0,0 +1,102 @@
+# 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.5.ebuild,v 1.1 2014/06/26 09:50:15 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib toolchain-funcs multilib-minimal
+
+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 ~s390 ~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.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+	>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	X? (
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	virtual/pkgconfig
+	X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+	!<=sys-devel/autoconf-2.63:2.5
+"
+
+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
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		--with-cairo \
+		$(multilib_native_use_enable introspection) \
+		$(use_with X xft) \
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+}
+
+multilib_src_install() {
+	gnome2_src_install
+
+	local PANGO_CONFDIR="/etc/pango/${CHOST}"
+	dodir "${PANGO_CONFDIR}"
+	keepdir "${PANGO_CONFDIR}"
+}
+
+pkg_postinst() {
+	gnome2_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)
+
+		# 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}"
+	}
+	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
+}