[gentoo-commits] proj/gnome:master commit in: x11-libs/pango/

["Alexandre Rostovtsev" <tetromino@gentoo.org>]

commit:     a1a5838acbd932bb36dbd14c3a90c5b5850800b4
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  4 07:54:47 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Sun Nov  4 07:55:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a1a5838a

x11-libs/pango: add deprecated USE flag to pull in pangox-compat

Otherwise, pangox-compat is not very discoverable.

---
 x11-libs/pango/pango-1.32.1.ebuild |    3 ++-
 x11-libs/pango/pango-9999.ebuild   |   19 +++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/x11-libs/pango/pango-1.32.1.ebuild b/x11-libs/pango/pango-1.32.1.ebuild
index 4b800bb..4bfcd7c 100644
--- a/x11-libs/pango/pango-1.32.1.ebuild
+++ b/x11-libs/pango/pango-1.32.1.ebuild
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="X +introspection"
+IUSE="X deprecated +introspection"
 
 RDEPEND="
 	>=media-libs/harfbuzz-0.9.3
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	X? ( x11-proto/xproto )
 	!<=sys-devel/autoconf-2.63:2.5"
+PDEPEND="deprecated? ( x11-libs/pangox-compat )"
 
 src_prepare() {
 	tc-export CXX

diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index bb4bb93..4bfcd7c 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -22,7 +22,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
-IUSE="X +introspection"
+IUSE="X deprecated +introspection"
 
 RDEPEND="
 	>=media-libs/harfbuzz-0.9.3
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND}
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	X? ( x11-proto/xproto )
 	!<=sys-devel/autoconf-2.63:2.5"
+PDEPEND="deprecated? ( x11-libs/pangox-compat )"
 
 src_prepare() {
 	tc-export CXX
@@ -56,19 +57,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; }