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

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

commit:     6b201150b890b1dc353da38338ebfa36c5b0dc50
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 19 18:12:00 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed Dec 19 18:12:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6b201150

x11-libs/pango: moved to gx86

Sync live ebuild with gx86. Remove "deprecated" flag (since
pangox-compat is in gx86, we can directly add it as a dependency to the
ebuilds that need it). Move introspection to RDEPEND like in all other
ebuilds, and switch to global introspection flag.

---
 x11-libs/pango/metadata.xml        |    4 --
 x11-libs/pango/pango-1.32.2.ebuild |   90 ------------------------------------
 x11-libs/pango/pango-9999.ebuild   |   27 ++++++-----
 3 files changed, 14 insertions(+), 107 deletions(-)

diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index f3e5efc..6e0e2ec 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome</herd>
-  <use>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
-  </use>
 </pkgmetadata>

diff --git a/x11-libs/pango/pango-1.32.2.ebuild b/x11-libs/pango/pango-1.32.2.ebuild
deleted file mode 100644
index 4bfcd7c..0000000
--- a/x11-libs/pango/pango-1.32.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib toolchain-funcs
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="Internationalized text layout and rendering library"
-HOMEPAGE="http://www.pango.org/"
-
-LICENSE="LGPL-2+ FTL"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-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 deprecated +introspection"
-
-RDEPEND="
-	>=media-libs/harfbuzz-0.9.3
-	>=dev-libs/glib-2.33.12: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}
-	>=dev-util/gtk-doc-am-1.13
-	virtual/pkgconfig
-	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
-	DOCS="AUTHORS ChangeLog* NEWS README THANKS"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		$(use_with X xft)
-		$(use X && echo --x-includes=${EPREFIX}/usr/include)
-		$(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))"
-
-	epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
-	dodir "${PANGO_CONFDIR}"
-	keepdir "${PANGO_CONFDIR}"
-}
-
-pkg_postinst() {
-	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)
-
-	# be atomic!
-	if pango-querymodules --system \
-		"${EROOT}"usr/$(get_libdir)/pango/1.8.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}"
-
-	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"
-}

diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index 4bfcd7c..e47ce31 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -22,14 +22,15 @@ 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 deprecated +introspection"
+IUSE="X +introspection"
 
 RDEPEND="
-	>=media-libs/harfbuzz-0.9.3
+	>=media-libs/harfbuzz-0.9.9:=
 	>=dev-libs/glib-2.33.12:2
-	>=media-libs/fontconfig-2.5.0:1.0
-	media-libs/freetype:2
-	>=x11-libs/cairo-1.7.6[X?]
+	>=media-libs/fontconfig-2.5.0:1.0=
+	media-libs/freetype:2=
+	>=x11-libs/cairo-1.7.6:=[X?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 	X? (
 		x11-libs/libXrender
 		x11-libs/libX11
@@ -37,10 +38,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	virtual/pkgconfig
-	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
@@ -48,8 +47,8 @@ src_prepare() {
 	G2CONF="${G2CONF}
 		$(use_enable introspection)
 		$(use_with X xft)
-		$(use X && echo --x-includes=${EPREFIX}/usr/include)
-		$(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))"
+		"$(usex X --x-includes="${EPREFIX}/usr/include" "")"
+		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")
 
 	epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
 	eautoreconf
@@ -84,7 +83,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
 }