public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/
Date: Mon, 29 Oct 2012 22:06:05 +0000 (UTC)	[thread overview]
Message-ID: <1351548325.cf4ce9e4ec82b16679c3949a9fe6dab64657bc57.eva@gentoo> (raw)

commit:     cf4ce9e4ec82b16679c3949a9fe6dab64657bc57
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 29 22:05:25 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 22:05:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cf4ce9e4

x11-libs/pango: fix a few ebuild issues

Pango not having a modules file was pretty embarrassing.

---
 x11-libs/pango/pango-1.32.1.ebuild |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/x11-libs/pango/pango-1.32.1.ebuild b/x11-libs/pango/pango-1.32.1.ebuild
index bb4bb93..4b800bb 100644
--- a/x11-libs/pango/pango-1.32.1.ebuild
+++ b/x11-libs/pango/pango-1.32.1.ebuild
@@ -56,19 +56,25 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_install() {
+	gnome2_src_install
+
+	local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+	dodir "${PANGO_CONFDIR}"
+	keepdir "${PANGO_CONFDIR}"
+}
+
 pkg_postinst() {
-	einfo "Generating modules listing..."
+	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)
 
-	dodir "${PANGO_CONFDIR}"
-	keepdir "${PANGO_CONFDIR}"
-
 	# be atomic!
 	if pango-querymodules --system \
-		"${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \
+		"${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
 			> "${tmp_file}"; then
 		cat "${tmp_file}" > "${pango_conf}" || {
 			rm "${tmp_file}"; die; }


             reply	other threads:[~2012-10-29 22:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-29 22:06 Gilles Dartiguelongue [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-10-11 20:46 [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/ Ole Reifschneider
2014-02-12 23:48 Gilles Dartiguelongue
2013-12-24 16:57 Gilles Dartiguelongue
2013-12-12 23:20 Gilles Dartiguelongue
2012-12-19 18:15 Alexandre Rostovtsev
2012-11-20  8:10 Gilles Dartiguelongue
2012-11-04  7:57 Alexandre Rostovtsev
2012-06-07  7:22 Alexandre Restovtsev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1351548325.cf4ce9e4ec82b16679c3949a9fe6dab64657bc57.eva@gentoo \
    --to=eva@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox