Fix building without dev-libs/gobject-introspection (bug #355979 by Timo A. Hummel). Remove old.

(Portage version: 2.1.9.40/cvs/Linux x86_64)

4 files changed, 30 insertions, 56 deletions

diff --git a/dev-libs/totem-pl-parser/ChangeLog b/dev-libs/totem-pl-parser/ChangeLog
index 4f49223e028e..996f0e376035 100644
--- a/dev-libs/totem-pl-parser/ChangeLog
+++ b/dev-libs/totem-pl-parser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/totem-pl-parser
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.82 2011/02/21 20:39:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v 1.83 2011/02/22 17:59:19 pacho Exp $
+
+  22 Feb 2011; Pacho Ramos <pacho@gentoo.org> -totem-pl-parser-2.32.2.ebuild,
+  totem-pl-parser-2.32.3.ebuild, totem-pl-parser-2.32.3-r1.ebuild:
+  Fix building without dev-libs/gobject-introspection (bug #355979 by Timo A.
+  Hummel). Remove old.
 
 *totem-pl-parser-2.32.3-r1 (21 Feb 2011)
 
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.2.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.2.ebuild
deleted file mode 100644
index 5abc1ef4b09d..000000000000
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.2.ebuild,v 1.2 2011/01/30 18:28:41 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Playlist parsing library"
-HOMEPAGE="http://www.gnome.org/projects/totem/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc quvi +introspection"
-
-RDEPEND=">=dev-libs/glib-2.24
-	dev-libs/gmime:2.4
-	>=net-libs/libsoup-gnome-2.30:2.4
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	quvi? ( >=media-libs/quvi-0.2.11 )"
-DEPEND="${RDEPEND}
-	!<media-video/totem-2.21
-	>=sys-devel/gettext-0.17
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.11 )"
-# eautoreconf needs:
-#	>=dev-util/gtk-doc-am-1.11
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable quvi)
-		$(use_enable introspection)"
-	DOCS="AUTHORS ChangeLog NEWS"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Disable tests requiring network access, bug #346127
-	sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
-		-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
-		-i plparse/tests/parser.c || die "sed failed"
-}
-
-src_test() {
-	# This is required as told by upstream in bgo#629542
-	dbus-launch emake check || die "emake check failed"
-}
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild
index 3ae6e7f3fe0c..5fd93397e31f 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild,v 1.1 2011/02/21 20:39:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild,v 1.2 2011/02/22 17:59:19 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -9,6 +9,7 @@ inherit gnome2 eutils autotools
 
 DESCRIPTION="Playlist parsing library"
 HOMEPAGE="http://projects.gnome.org/totem/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -37,6 +38,15 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS"
 }
 
+src_unpack() {
+	# If gobject-introspection is installed, we don't need the extra .m4
+	if has_version "dev-libs/gobject-introspection"; then
+		unpack ${P}.tar.bz2
+	else
+		unpack ${A}
+	fi
+}
+
 src_prepare() {
 	gnome2_src_prepare
 
@@ -49,7 +59,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-quvi.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	AT_M4DIR=${WORKDIR} eautoreconf
 }
 
 src_test() {
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild
index a4f59e6bb720..37a9c385347c 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild,v 1.3 2011/02/21 20:39:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild,v 1.4 2011/02/22 17:59:19 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -9,6 +9,7 @@ inherit gnome2 eutils autotools
 
 DESCRIPTION="Playlist parsing library"
 HOMEPAGE="http://projects.gnome.org/totem/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -40,6 +41,15 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS"
 }
 
+src_unpack() {
+	# If gobject-introspection is installed, we don't need the extra .m4
+	if has_version "dev-libs/gobject-introspection"; then
+		unpack ${P}.tar.bz2
+	else
+		unpack ${A}
+	fi
+}
+
 src_prepare() {
 	gnome2_src_prepare
 
@@ -52,7 +62,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-quvi.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	AT_M4DIR=${WORKDIR} eautoreconf
 }
 
 src_test() {