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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     3828d30c4946c20b93416aa22868c3256eadff99
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 15:18:57 2011 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 15:18:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3828d30c

x11-libs/vte: QAed

	* Leave gtk-doc handling to gnome2 eclass
	* Split config and source modifications into proper phases
	* Re-add glade to vte:0, will trigger a conflict when both slots have USE=glade, but that's ok.
	* Various cleanups

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

---
 x11-libs/vte/vte-0.28.0-r300.ebuild |   15 ++++++++-------
 x11-libs/vte/vte-0.28.0.ebuild      |   21 +++++++++------------
 x11-libs/vte/vte-9999.ebuild        |   29 +++++++++++------------------
 3 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/x11-libs/vte/vte-0.28.0-r300.ebuild b/x11-libs/vte/vte-0.28.0-r300.ebuild
index e6164b6..33bc45e 100644
--- a/x11-libs/vte/vte-0.28.0-r300.ebuild
+++ b/x11-libs/vte/vte-0.28.0-r300.ebuild
@@ -13,13 +13,13 @@ HOMEPAGE="http://git.gnome.org/browse/vte"
 
 LICENSE="LGPL-2"
 SLOT="2.90"
-IUSE="debug doc glade +introspection"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
+IUSE="debug doc glade +introspection"
 
 PDEPEND="x11-libs/gnome-pty-helper"
 RDEPEND=">=dev-libs/glib-2.26:2
@@ -30,15 +30,15 @@ RDEPEND=">=dev-libs/glib-2.26:2
 	x11-libs/libX11
 	x11-libs/libXft
 
+	glade? ( >=dev-util/glade-3.9:3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.13 )
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
-	sys-apps/sed
-	sys-devel/gettext"
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.13 )"
 
-src_prepare() {
+pkg_setup() {
 	# Python bindings are via gobject-introspection
 	# Ex: from gi.repository import Vte
 	G2CONF="${G2CONF}
@@ -49,13 +49,14 @@ src_prepare() {
 		$(use_enable debug)
 		$(use_enable glade glade-catalogue)
 		$(use_enable introspection)
-		--with-html-dir=${ROOT}/usr/share/doc/${PF}/html
 		--with-gtk=3.0"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+}
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-gdk-targets.patch"
 
 	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
-}
+}
\ No newline at end of file

diff --git a/x11-libs/vte/vte-0.28.0.ebuild b/x11-libs/vte/vte-0.28.0.ebuild
index 562c3ba..4e43a5d 100644
--- a/x11-libs/vte/vte-0.28.0.ebuild
+++ b/x11-libs/vte/vte-0.28.0.ebuild
@@ -14,45 +14,42 @@ HOMEPAGE="http://git.gnome.org/browse/vte"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc +introspection python"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
+IUSE="debug doc glade +introspection python"
 
 PDEPEND="x11-libs/gnome-pty-helper"
 RDEPEND=">=dev-libs/glib-2.26:2
-	>=x11-libs/gtk+-2.20.0:2
+	>=x11-libs/gtk+-2.20:2
 	>=x11-libs/pango-1.22.0
 
 	sys-libs/ncurses
 	x11-libs/libX11
 	x11-libs/libXft
 
+	glade? ( <dev-util/glade-3.9:3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
-	python? ( >=dev-python/pygtk-2.4 ) "
+	python? ( >=dev-python/pygtk-2.4:2 )"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.13 )
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
-	sys-apps/sed
-	sys-devel/gettext"
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.13 )"
 
 pkg_setup() {
-	# Glade is disabled because it needs gladeui-1.0 & gtk3 glade is gladeui-2.0
-	# glade isn't slotted, and gtksourceview (for instance) needs gladeui-2.0
 	G2CONF="${G2CONF}
-		--disable-glade-catalogue
 		--disable-gnome-pty-helper
 		--disable-deprecation
 		--disable-maintainer-mode
 		--disable-static
 		$(use_enable debug)
+		$(use_enable glade glade-catalogue)
 		$(use_enable introspection)
 		$(use_enable python)
-		--with-html-dir=${ROOT}/usr/share/doc/${PF}/html
 		--with-gtk=2.0"
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 	use python && python_set_active_version 2
@@ -60,5 +57,5 @@ pkg_setup() {
 
 src_install() {
 	gnome2_src_install
-	python_clean_installation_image
-}
+	use python && python_clean_installation_image
+}
\ No newline at end of file

diff --git a/x11-libs/vte/vte-9999.ebuild b/x11-libs/vte/vte-9999.ebuild
index cd7db5a..7708a9e 100644
--- a/x11-libs/vte/vte-9999.ebuild
+++ b/x11-libs/vte/vte-9999.ebuild
@@ -5,24 +5,22 @@
 EAPI="3"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-#PYTHON_DEPEND="python? 2:2.4"
 
-inherit autotools eutils gnome2 #python
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME terminal widget"
 HOMEPAGE="http://git.gnome.org/browse/vte"
 
 LICENSE="LGPL-2"
 SLOT="2.90"
-IUSE="debug doc glade +introspection" #python
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
+IUSE="debug doc glade +introspection"
 
-# No python bindings (yet) with gtk+:3
 PDEPEND="x11-libs/gnome-pty-helper"
 RDEPEND=">=dev-libs/glib-2.26:2
 	>=x11-libs/gtk+-3.0:3
@@ -32,16 +30,17 @@ RDEPEND=">=dev-libs/glib-2.26:2
 	x11-libs/libX11
 	x11-libs/libXft
 
-	glade? ( dev-util/glade:3 )
+	glade? ( >=dev-util/glade-3.9:3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.13 )
 	>=dev-util/intltool-0.35
 	>=dev-util/pkgconfig-0.9
-	sys-apps/sed
-	sys-devel/gettext"
+	sys-devel/gettext
+	doc? ( >=dev-util/gtk-doc-1.13 )"
 
-src_prepare() {
+pkg_setup() {
+	# Python bindings are via gobject-introspection
+	# Ex: from gi.repository import Vte
 	G2CONF="${G2CONF}
 		--disable-gnome-pty-helper
 		--disable-deprecation
@@ -50,20 +49,14 @@ src_prepare() {
 		$(use_enable debug)
 		$(use_enable glade glade-catalogue)
 		$(use_enable introspection)
-		--with-html-dir=${ROOT}/usr/share/doc/${PF}/html
 		--with-gtk=3.0"
-		#$(use_enable python)
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	#use python && python_set_active_version 2
+}
 
+src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.27.90-fix-gdk-targets.patch"
 
 	[[ ${PV} != 9999 ]] && eautoreconf
 
 	gnome2_src_prepare
-}
-
-#src_install() {
-#	gnome2_src_install
-#	python_clean_installation_image
-#}
+}
\ No newline at end of file