Show elog messages only when needed (#440554 by poletti.marco). Drop old.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 19 insertions, 187 deletions

diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog
index 6911d93cef74..9b892f46f2eb 100644
--- a/x11-libs/pango/ChangeLog
+++ b/x11-libs/pango/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/pango
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.358 2012/10/28 16:36:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.359 2012/11/17 13:31:12 pacho Exp $
+
+  17 Nov 2012; Pacho Ramos <pacho@gentoo.org> -pango-1.28.4.ebuild,
+  -pango-1.29.4.ebuild, pango-1.30.1.ebuild:
+  Show elog messages only when needed (#440554 by poletti.marco). Drop old.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> pango-1.30.1.ebuild:
   ia64/s390/sh/sparc stable wrt #427544
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 334762f60c32..8aa7472ccb32 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -4,18 +4,14 @@ Hash: SHA256
 AUX pango-1.26.0-lib64.patch 499 SHA256 1bb2671d49c54caf70e9df104ca26af4e76a536db14150a472b093d05d9f6347 SHA512 5f668fe0e1e3465142ed5e959cc628cea508c1f383a519eef6d1ee0b5d08bbbd31b0fbd1cf44c3ba290aab143e7871ebf905ca6cda3fe812cd362a8114e8c17d WHIRLPOOL 6c586879d2f6b7e6ea2adfe4859ca18d8a1268878b608e22246a940d8959aafa2a5068e2527cf5ee72b2984e70dc41bd5b33c5b211ddb22739cc523b64c9698a
 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
-DIST pango-1.28.4.tar.bz2 1503441 SHA256 7eb035bcc10dd01569a214d5e2bc3437de95d9ac1cfa9f50035a687c45f05a9f SHA512 727c8c01446588b99b9a2e97a57ec2dd576facfcdf1c369eab7da532f9becc3151bea949209862c4b811861605d81b32637ca1ac1c5f34c597e1787e211f86b8 WHIRLPOOL cd82bff447a6e6efe60a1d706e864eed878dd203b0366d4b5d00e5b0a46a87655fa2e04c6bf6af71c3e75d88f35255fe468071b501e446ab1e84fcb987af4585
-DIST pango-1.29.4.tar.xz 1155456 SHA256 7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f SHA512 08bf77e451a970febc5a9bc56cf9c63166b532675ef4a3cdbaae9ed47243a0b11bcd6c840371f1221581e4eef0244739fcd08a67fe9ef4b2eeb8c1cc0fa49d62 WHIRLPOOL 1e4402743d957276fcc519d14769141324e1a5b9af7ded936ce910740107bde94a1ea6734ecef5f4c267e6f3484c3f0dbfdd55673be2a13e864e4d54d513fc6a
 DIST pango-1.30.1.tar.xz 1162828 SHA256 3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe SHA512 39ac0df7e1b2e4dc0de29b977b06eae71a9f8ddcefbef1e96899d182c581eaa1dafedc581c18382e297a90a9621f9415e0e3c8868f388f963b97590e45e2b1d6 WHIRLPOOL 2cc6debed816735ae51bc326227969eba103bf4ff79bed74be896e7ae68448feed924fd0440bc5b2a10983ab4e874233de55ae191b28bdbabde6b6d830c418a9
-EBUILD pango-1.28.4.ebuild 2348 SHA256 89d0f9587eaed881736e86c4bbf980e6ce215a90a309c2ebd5c0c9a6c0ca1728 SHA512 83d37252baaf14b8834509e5ea5a7b4f2243c0e0fcdc91acc2ea7fbc8bd06890b286f0794fe9c8abc67431f23a78212d4e0d7fd507cadd2de78d0d064ce1080b WHIRLPOOL 573e3274a9c75259fcf99d0beef9a1e70f39e7bc91989e530861628bbb246f571ddd1d6c8b1cfe04d2610f1b6a8269f37ebbfaf54c10cc842eee9630c051295f
-EBUILD pango-1.29.4.ebuild 2348 SHA256 a2af88e86846f83c3431d9d3a3fc95b232516a549232849977d74409cdff0e12 SHA512 a59990cabd6025d2bc00a81fc77418e1546b30f3f46d8e2d557293f11de1fcd2bc503f005a2159de7acd56e454a8bee6b76153c59d8585efb6f57bd33da76c8b WHIRLPOOL ceff73c622012beb9d8f2b14c51cc092a6857ebd9ecc9d781fceff30d612a16c979e95ee8d9e9a040f1bc634ce11c089ddb974b8d08a41e4e477f8649d8d162e
-EBUILD pango-1.30.1.ebuild 2745 SHA256 da67d4066845eb5c050278532606bf32bf50409a9b52be9fd532736e0e36b798 SHA512 6e7d38f7e214be56001e572a24af40d3b97541dcb5ac151649a2deb9379d3da6d6aacc1922dbacfcfa5fbe4acf5ae05d61ce8664ab2b2d9e6590536feb2b0ccf WHIRLPOOL d6b15e9433ed2e8efa44726d784347dbe8118da93c97ecd894d3e64d8cacf614d75f07f9eebae45e0282660e90361684a04f94bfe21e6a390f01e523ddccd822
-MISC ChangeLog 45729 SHA256 8a5e3c99efe417c9e95aa51c0d4092e2489bfd158dc06855ba1988c7ea5352e3 SHA512 a3c2dedca35756a95f2ca8fa7370e119f12b0808e72cf833f0705d97fa6e514fdac2d9c3aab3d7ec6aa2c73f1564cee851e9dfe95acf0c777e8223cb6dfc96d0 WHIRLPOOL 94552d54f1726f573c305d665aad5eb2cf304d7c7205e13c95e5f9405bc39dc169a380b50ca85c5f301faa06e92fc5c87eaab6dcc521316718ca06c44a2a8fa8
+EBUILD pango-1.30.1.ebuild 2785 SHA256 6a1f2b7fb8398dee7e0bcbb2d61b82a3d143cb898e8dff634726dab85dfc99da SHA512 cb5c46a7847c2d1f9121cbc2b8759d1939351e11032e18f2969fa048e30b627bdf7eebe4c349a86affe0958fe7819f6007220a7f33a7f74bf3965a41132383fa WHIRLPOOL ffd6ee5e9674557f0b17aec5070ec3211d393be0438e3c72bb9bd5ad33131ebfdb9a2a5f063873ce51b2fb30563ac936e65aa7548bb60aa53ecaaa453f3feec5
+MISC ChangeLog 45917 SHA256 88773fefbb2616275f86d8339b9427a8096b42bde358595634c0f463b5a4884a SHA512 997fb67aab173fd546c8a67ff0bb01f734ec01aaa2808521fd434d1568ac4eedf24e7794c1d65c34284288363df9360a50c6be1b2c1b4517f71d4bbaa3fa6cc3 WHIRLPOOL 2a4ef6c8e0b1d9199440496f015a48dbd527aa0132e358df81edea7f9a7c683b01ddf053916a12c79826dd52b054e6655132d4d58f22c7cd3586900643ad65e1
 MISC metadata.xml 272 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314 SHA512 f3e9cc433eb6e6475a4281ad4dbb021bd050e00e194e9dd1b7ea619ea55a7f09ea2f4952e1e192e38764aba9260a6b15f06082685def060aa9ac7ead67d97237 WHIRLPOOL ed5cb90610d66f50314f1269b41424aff0990c4ff733c10d2f1424492cd01e4f7de682f1677c15b3e70508fe72dca8d04fccac6282395f0adb27b0df99a307cc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCNXvEACgkQuQc30/atMkBVWwCeObQRezVE+kEJMPOU1fOcXRBr
-cP8AoJ5bK/Wb4g6BmYVVQ7zQwvsBnXhb
-=DNJO
+iEYEAREIAAYFAlCnkaIACgkQCaWpQKGI+9Q3qgCfahlnb+2EF1NxyrWajMNoDrXk
+ZssAnRGS5+RoSuC7e/OSWI4uiZZ9I09g
+=aNp5
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/pango/pango-1.28.4.ebuild b/x11-libs/pango/pango-1.28.4.ebuild
deleted file mode 100644
index dcc61ef9bc54..000000000000
--- a/x11-libs/pango/pango-1.28.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.22 2012/10/17 11:18:22 tetromino Exp $
-
-EAPI="3"
-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 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="X +introspection"
-
-RDEPEND=">=dev-libs/glib-2.24: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 )"
-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" ] )
-}
-
-pkg_setup() {
-	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"
-}
-
-src_prepare() {
-	# 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"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="${EPREFIX}/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="${EPREFIX}/etc/pango"
-		fi
-
-		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 > "${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}"
-
-	fi
-}
diff --git a/x11-libs/pango/pango-1.29.4.ebuild b/x11-libs/pango/pango-1.29.4.ebuild
deleted file mode 100644
index 02a1e6e72c9e..000000000000
--- a/x11-libs/pango/pango-1.29.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.17 2012/10/17 11:18:22 tetromino 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +introspection"
-
-# Use glib-2.29.5 for g_atomic_int_add
-RDEPEND=">=dev-libs/glib-2.29.5: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" ] )
-}
-
-pkg_setup() {
-	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"
-}
-
-src_prepare() {
-	# 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"
-		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 \
-		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \
-			> "${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}"
-}
diff --git a/x11-libs/pango/pango-1.30.1.ebuild b/x11-libs/pango/pango-1.30.1.ebuild
index 73c149dbe09c..ce08679ab229 100644
--- a/x11-libs/pango/pango-1.30.1.ebuild
+++ b/x11-libs/pango/pango-1.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.11 2012/10/28 16:36:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.1.ebuild,v 1.12 2012/11/17 13:31:12 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -36,17 +36,15 @@ function multilib_enabled() {
 	has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
 }
 
-pkg_setup() {
+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))"
+		$(use X && echo --x-includes="${EPREFIX}"/usr/include)
+		$(use X && echo --x-libraries="${EPREFIX}"/usr/$(get_libdir))"
 	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-}
 
-src_prepare() {
 	# In next release
 	epatch "${FILESDIR}/${P}-coretext-hash.patch"
 
@@ -86,7 +84,9 @@ pkg_postinst() {
 	fi
 	rm "${tmp_file}"
 
-	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"
+	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
 }