diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2012-04-25 10:11:21 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2012-04-25 10:11:21 +0000 |
| commit | b838cd49dcca2b852e5b647788ffb892bf73fc36 (patch) | |
| tree | 4f56350399e1c50f05d5e39a99f35a3ff96d0ca8 /x11-libs | |
| parent | fix gtk/pango/gdk-pixbuf query tools usage, be atomic, be POSIX (diff) | |
| download | gentoo-2-b838cd49dcca2b852e5b647788ffb892bf73fc36.tar.gz gentoo-2-b838cd49dcca2b852e5b647788ffb892bf73fc36.tar.bz2 gentoo-2-b838cd49dcca2b852e5b647788ffb892bf73fc36.zip | |
sync pango-querymodules usage with emul-linux-x86-gtklibs
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64, RepoMan options: --force)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/pango/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.28.3-r1.ebuild | 9 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.28.4.ebuild | 8 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.29.4.ebuild | 10 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.30.0.ebuild | 10 |
5 files changed, 23 insertions, 20 deletions
diff --git a/x11-libs/pango/ChangeLog b/x11-libs/pango/ChangeLog index 54f75839689a..6c5472d9d017 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.343 2012/04/25 09:42:36 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/ChangeLog,v 1.344 2012/04/25 10:11:21 lxnay Exp $ + + 25 Apr 2012; Fabio Erculiani <lxnay@gentoo.org> pango-1.28.3-r1.ebuild, + pango-1.28.4.ebuild, pango-1.29.4.ebuild, pango-1.30.0.ebuild: + sync pango-querymodules usage with emul-linux-x86-gtklibs 25 Apr 2012; Fabio Erculiani <lxnay@gentoo.org> pango-1.28.3-r1.ebuild, pango-1.28.4.ebuild, pango-1.29.4.ebuild, pango-1.30.0.ebuild: diff --git a/x11-libs/pango/pango-1.28.3-r1.ebuild b/x11-libs/pango/pango-1.28.3-r1.ebuild index 83f6c97b87f1..f80312c276e9 100644 --- a/x11-libs/pango/pango-1.28.3-r1.ebuild +++ b/x11-libs/pango/pango-1.28.3-r1.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.28.3-r1.ebuild,v 1.13 2012/04/25 09:42:36 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.3-r1.ebuild,v 1.14 2012/04/25 10:11:21 lxnay Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -90,10 +90,9 @@ pkg_postinst() { local pango_conf="${PANGO_CONFDIR}/pango.modules" local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild) - # be atomic! - pango-querymodules > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${pango_conf}" || die + 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 diff --git a/x11-libs/pango/pango-1.28.4.ebuild b/x11-libs/pango/pango-1.28.4.ebuild index 2b8becb33f22..e6f690458555 100644 --- a/x11-libs/pango/pango-1.28.4.ebuild +++ b/x11-libs/pango/pango-1.28.4.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.28.4.ebuild,v 1.19 2012/04/25 09:42:36 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.28.4.ebuild,v 1.20 2012/04/25 10:11:21 lxnay Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -82,9 +82,9 @@ pkg_postinst() { local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild) # be atomic! - pango-querymodules > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${pango_conf}" || die + 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 diff --git a/x11-libs/pango/pango-1.29.4.ebuild b/x11-libs/pango/pango-1.29.4.ebuild index 91fde6dbd1d3..a82313cfba60 100644 --- a/x11-libs/pango/pango-1.29.4.ebuild +++ b/x11-libs/pango/pango-1.29.4.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.29.4.ebuild,v 1.13 2012/04/25 09:42:36 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.29.4.ebuild,v 1.14 2012/04/25 10:11:21 lxnay Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -81,11 +81,11 @@ pkg_postinst() { local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild) # be atomic! - pango-querymodules \ + if pango-querymodules \ "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \ - > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${pango_conf}" || die + > "${tmp_file}"; then + cat "${tmp_file}" > "${pango_conf}" || { + rm "${tmp_file}"; die; } else ewarn "Cannot update pango.modules, file generation failed" fi diff --git a/x11-libs/pango/pango-1.30.0.ebuild b/x11-libs/pango/pango-1.30.0.ebuild index 6a5616ae36a6..3985b9767fbf 100644 --- a/x11-libs/pango/pango-1.30.0.ebuild +++ b/x11-libs/pango/pango-1.30.0.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.0.ebuild,v 1.4 2012/04/25 09:42:36 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.30.0.ebuild,v 1.5 2012/04/25 10:11:21 lxnay Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -80,11 +80,11 @@ pkg_postinst() { local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild) # be atomic! - pango-querymodules \ + if pango-querymodules \ "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \ - > "${tmp_file}" - if [ "${?}" = "0" ]; then - cat "${tmp_file}" > "${pango_conf}" || die + > "${tmp_file}"; then + cat "${tmp_file}" > "${pango_conf}" || { + rm "${tmp_file}"; die; } else ewarn "Cannot update pango.modules, file generation failed" fi |