Remove gobject-introspection 0.6.7, in portage now, also sync the live ebuild to the portage one

svn path=/; revision=211

3 files changed, 26 insertions, 54 deletions

diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 003b9ca..936e34d 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,3 +1 @@
-DIST gobject-introspection-0.6.7.tar.bz2 579956 RMD160 7bc190bdeb8fa5553b34c180d66e7652b7571d16 SHA1 3bcf1f694e6603c2645c579b7d358feb10ece14c SHA256 c97ca4e978b0583999775640e9e9f97b64a5880ad2a6adc3ce903207b616f24a
-EBUILD gobject-introspection-0.6.7.ebuild 776 RMD160 5a5e5b14e745c4bc2a56ef7d4b9be6b0985f923a SHA1 1d567b2099fac688574acf5d7494da08c62cd72e SHA256 353518cae4898dc8841e62a3c138e0f34a3bba1167b9e5e04a0fb995670b3337
-EBUILD gobject-introspection-9999.ebuild 706 RMD160 1018219bf897eb07917382899f699a3d3a87dfeb SHA1 3815cc23428e74eba625994dc2aac3122ac5c579 SHA256 629f377062d503a437955e77a301c326f5d210b9c635874a36826431c9c1ae74
+EBUILD gobject-introspection-9999.ebuild 1016 RMD160 17a7fe8ed0a6e0cbda6062f7e34547d546e4c331 SHA1 f614561f06631744c81458111b2702392ff4157b SHA256 b60194039d91a6738abf0e5f2be089ecd0ce0ebba8b7a35122b854f1d748d03a
diff --git a/dev-libs/gobject-introspection/gobject-introspection-0.6.7.ebuild b/dev-libs/gobject-introspection/gobject-introspection-0.6.7.ebuild
deleted file mode 100644
index ae0838f..0000000
--- a/dev-libs/gobject-introspection/gobject-introspection-0.6.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools gnome2 eutils
-
-DESCRIPTION="The GObject introspection"
-HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="" # doc
-
-RDEPEND=">=dev-libs/glib-2.19.0
-	|| (
-		sys-devel/gcc[libffi]
-		virtual/libffi )
-	>=dev-lang/python-2.5"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	sys-devel/flex"
-# No 1.12 release yet
-#	doc? ( dev-util/gtk-doc-1.12 )"
-
-G2CONF="${G2CONF}
---disable-gtk-doc
---disable-static"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Make it libtool-1 compatible, bug #270909
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	eautoreconf
-}
diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
index 5b5c694..f8d90a5 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild
@@ -4,32 +4,36 @@
 
 EAPI="2"
 
-inherit autotools gnome2 git
+inherit autotools python gnome2 git
 
 EGIT_REPO_URI="git://git.gnome.org/gobject-introspection"
 
-DESCRIPTION="The GObject introspection"
+DESCRIPTION="Introspection infrastructure for gobject library bindings"
 HOMEPAGE="http://live.gnome.org/GObjectIntrospection/"
 SRC_URI=""
 
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="" # doc
+IUSE="doc"
 
 RDEPEND=">=dev-libs/glib-2.19.0
-	|| (
-		sys-devel/gcc[libffi]
-		virtual/libffi )
-	>=dev-lang/python-2.5"
+	>=dev-lang/python-2.5
+	virtual/libffi"
 DEPEND="${RDEPEND}
-	dev-util/gtk-doc
-	>=dev-util/pkgconfig-0.18
+	>=dev-util/gtk-doc-1.12
+	dev-util/pkgconfig
 	sys-devel/flex"
 
-G2CONF="${G2CONF}
---disable-gtk-doc
---disable-static"
+src_prepare() {
+	G2CONF="${G2CONF} --disable-static"
+
+	# FIXME: Parallel compilation failure with USE=doc
+	use doc && MAKEOPTS="-j1"
+
+	# Don't pre-compile .py
+	ln -sf $(type -P true) py-compile
+}
 
 src_unpack() {
 	git_src_unpack	
@@ -37,3 +41,12 @@ src_unpack() {
 	gtkdocize
 	eautoreconf
 }
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/${PN}/giscanner/*
+	python_need_rebuild
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/lib*/${PN}/giscanner/*
+}