[gentoo-commits] gentoo-x86 commit in dev-libs/totem-pl-parser: ChangeLog totem-pl-parser-2.32.3.ebuild totem-pl-parser-2.32.3-r1.ebuild totem-pl-parser-2.32.2.ebuild

[gentoo-commits] gentoo-x86 commit in dev-libs/totem-pl-parser: ChangeLog totem-pl-parser-2.32.3.ebuild totem-pl-parser-2.32.3-r1.ebuild totem-pl-parser-2.32.2.ebuild

[Pacho Ramos (pacho)]

pacho       11/02/22 17:59:19

  Modified:             ChangeLog totem-pl-parser-2.32.3.ebuild
                        totem-pl-parser-2.32.3-r1.ebuild
  Removed:              totem-pl-parser-2.32.2.ebuild
  Log:
  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)

Revision  Changes    Path
1.83                 dev-libs/totem-pl-parser/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog?r1=1.82&r2=1.83

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/ChangeLog,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- ChangeLog	21 Feb 2011 20:39:00 -0000	1.82
+++ ChangeLog	22 Feb 2011 17:59:19 -0000	1.83
@@ -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)
 



1.4                  dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild?r1=1.3&r2=1.4

Index: totem-pl-parser-2.32.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- totem-pl-parser-2.32.3.ebuild	21 Feb 2011 20:39:00 -0000	1.3
+++ totem-pl-parser-2.32.3.ebuild	22 Feb 2011 17:59:19 -0000	1.4
@@ -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 @@
 
 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 @@
 	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 @@
 	epatch "${FILESDIR}/${P}-fix-quvi.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	AT_M4DIR=${WORKDIR} eautoreconf
 }
 
 src_test() {



1.2                  dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild?r1=1.1&r2=1.2

Index: totem-pl-parser-2.32.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/totem-pl-parser/totem-pl-parser-2.32.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- totem-pl-parser-2.32.3-r1.ebuild	21 Feb 2011 20:39:00 -0000	1.1
+++ totem-pl-parser-2.32.3-r1.ebuild	22 Feb 2011 17:59:19 -0000	1.2
@@ -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 @@
 
 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 @@
 	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 @@
 	epatch "${FILESDIR}/${P}-fix-quvi.patch"
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	AT_M4DIR=${WORKDIR} eautoreconf
 }
 
 src_test() {