Recover old version needed on arches without no stable pangox-compat still

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 105 insertions, 5 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index f5be55e74efb..583672fc0837 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,11 @@
 # 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.403 2014/04/27 09:41:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.404 2014/04/27 15:43:24 pacho Exp $
+
+*pango-1.30.1 (27 Apr 2014)
+
+  27 Apr 2014; Pacho Ramos <pacho@gentoo.org> +pango-1.30.1.ebuild:
+  Recover old version needed on arches without no stable pangox-compat still
 
   27 Apr 2014; Pacho Ramos <pacho@gentoo.org> -pango-1.30.1.ebuild,
   -pango-1.32.5.ebuild, -pango-1.36.2.ebuild:
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index b75bec52b2a4..b44f8d534057 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -7,15 +7,17 @@ AUX pango-1.30.1-config_get_key_system-declaration.patch 466 SHA256 2b075d8538a8
 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.30.1.tar.xz 1162828 SHA256 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe SHA512 39ac0df7e1b2e4dc0de29b977b06eae71a9f8ddcefbef1e96899d182c581eaa1dafedc581c18382e297a90a9621f9415e0e3c8868f388f963b97590e45e2b1d6 WHIRLPOOL 2cc6debed816735ae51bc326227969eba103bf4ff79bed74be896e7ae68448feed924fd0440bc5b2a10983ab4e874233de55ae191b28bdbabde6b6d830c418a9
 DIST pango-1.36.3.tar.xz 1021656 SHA256 ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22 SHA512 74f94c4e853f8d7538990589e5c9796e48cce32f935cf50d0155b57d00fbce155c9dd659b0803b861c568ddedffb14712fbcbefadfeefb43d2ed0fab949258a2 WHIRLPOOL c63a1b5d27eb55530bfc86da77f25fe6c022346cf30f1beeaaa1ef3b90cee6afde44d0735ad77811e7cc487cd35bb18efc667aaa470725c0b2cc3fdb6e495560
+EBUILD pango-1.30.1.ebuild 2667 SHA256 8f8dfa4c16699d6291b50319fefb0d09e5090d499d3d5320de2994fbdf69c8b5 SHA512 3a53a4b1651221d346fab8a54b9a7bc9d26c8997c29c12aa14cf9b6ccc897a961553be4d7284094ac5839e6921475f7e9814333ad49ee63fd773f1f379673c5e WHIRLPOOL ef61fcd5389a29a7fddf0c917ab504e152afebd1f8b3960bf12f5e6fa3fb617dfa0cb5a5d716f65335cbbf060ac491a5ada92cd6e53a08c9b15c1a77efcd8c4b
 EBUILD pango-1.36.3-r2.ebuild 3181 SHA256 ab397573e32497254757e446fd8a2340b2841f9633218b255f991c74674e35a1 SHA512 32e3d48765be2b86867ec07008a88979a0ea9da6fd8ada44ac8b28cff2fbec119b757aa20ceb25b43c713e616670e8c422fc30438243222444ad111c1cc49fbd WHIRLPOOL eb00ea4cfde6fb818a996dffd18e56cf518bc8ee4f56d8641d1c2e9bd32ad88c060d56f46e5781c8210b0be63bb77844226fa871b26c824ad401295d1032be60
 EBUILD pango-1.36.3.ebuild 2424 SHA256 350676a7576b39de432c47d59b50d05e7f83e7f7de40052155b08fa3ab30f583 SHA512 dfb39403ecaa8c9515999009b8ac4296e5364f58340218fe377f0e471e12e07e0e9c4f25ccf041bd786cc715a2c645f9db2f64e9b28e88a23eea627cb5fdde17 WHIRLPOOL 0a154614f755c08bb6206cea8fc40f90c4294d8be196e749e2e87dee6bf4b9899366043b01253a8dc49166dc292fccb35eb1c9b6021c03aa8be2c38757c2e92a
-MISC ChangeLog 51551 SHA256 fbabd1975183b2bc7f83a561f8509104a6500b177e3ec4ec241f8ae4e23aa9d5 SHA512 4bd2bb1e2a54237d592b8aa6b72749d7a9adabc95f21337959b1db79a2a3d3edf110933f7a7ab1f00c650d64d64faba6d7d5399fc36eb25c7077c88dc8b292f1 WHIRLPOOL dca3bc5249f4f6b17c5783635f05cc8cd1996dd20fb9d84467d9665e21884cd11e1dcfffe8408a0971807418db073ac33d623fe8832e81964ed2c7f25c91f51d
+MISC ChangeLog 51726 SHA256 e811b5dad60fd1e69ad4c8ab53390c1a8a218927b87659d5669fa4a7938f2ff1 SHA512 c044acb4320ce8ef9959da99c298124b4eaef2f7ca312dc214ac6f4bcf26294b1754a37383044ce40a54274615415cf7d13daac987837753590d956c8b6d0c43 WHIRLPOOL 68f675d9e893a3ca2922bc2f3eab1589ae5edbed50b5604076bed4493c14b5caa7263bb2095fead9abdba7a573fe412e072132928b074c699cb0e67cdd1c0512
 MISC metadata.xml 244 SHA256 20812e9c9f3ceb9adaeda150307d00c8e8d8ad03faac4518cf753cbdf5c729bb SHA512 849c0f727d60d5c50ed15fc640f59246c98115c37095507db0a6e03c196ed9875ca71d95b7f12170ec8ec81e7f907a364522c5ea7bcf51d253b264ab404a902f WHIRLPOOL c6e167a16dcd88d78cd123dcc5283a5adcc08daaf7dd713c139a2a606dbe2009f7c68b4d2d017c8357f5e422ee9b3e2516ccc7139eb8cdabebdb106be82582e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNc0K4ACgkQCaWpQKGI+9Si1ACfUrFGhTXyb+BiWmV9NSnSJ3+R
-MhAAn0HpIWtqUnR9IhMnCcLWxMsPYKS+
-=zoeu
+iEYEAREIAAYFAlNdJZ0ACgkQCaWpQKGI+9QSBwCdFSCRt8vU5YhvFUZePt+Wmwts
+WGkAn2VQyXyc5UvhuZ4G2vc7QriTFT4P
+=1Mqx
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild
new file mode 100644
index 000000000000..72eb039dc3ea
--- /dev/null
+++ b/x11-libs/pango/pango-1.30.1.ebuild
@@ -0,0 +1,93 @@
+# 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
+}