[gentoo-commits] proj/gnome:master commit in: media-video/totem/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     4ccb2f294f5ec68cf4bd599930279eba31bb9b3c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 09:25:01 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 09:25:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ccb2f29

media-video/totem: 2.91.5 -> 2.91.6

* Build fixes with latest gtk+:3

---
 .../{totem-2.91.5.ebuild => totem-2.91.6.ebuild}   |   10 +++++++---
 media-video/totem/totem-9999.ebuild                |   10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/media-video/totem/totem-2.91.5.ebuild b/media-video/totem/totem-2.91.6.ebuild
similarity index 95%
rename from media-video/totem/totem-2.91.5.ebuild
rename to media-video/totem/totem-2.91.6.ebuild
index e03cb6e..f84d8f9 100644
--- a/media-video/totem/totem-2.91.5.ebuild
+++ b/media-video/totem/totem-2.91.6.ebuild
@@ -32,7 +32,7 @@ fi
 # FIXME: Automagic tracker-0.9.0
 RDEPEND=">=dev-libs/glib-2.27.92
 	>=x11-libs/gdk-pixbuf-2.23.0
-	>=x11-libs/gtk+-2.99.2:3[introspection?]
+	>=x11-libs/gtk+-2.99.3:3[introspection?]
 	>=dev-libs/totem-pl-parser-2.32.2[introspection?]
 	>=dev-libs/libpeas-0.7.1[gtk]
 	>=x11-themes/gnome-icon-theme-2.16
@@ -137,14 +137,18 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+	mkdir -p m4
 	gnome2_src_prepare
 
 	# Fix broken smclient option passing
 	# FIXME: File a bug for this
 	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	if [[ ${PV} != 9999 ]]; then
+		intltoolize --force --copy --automake || die "intltoolize failed"
+		eautoreconf
+	fi
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig

diff --git a/media-video/totem/totem-9999.ebuild b/media-video/totem/totem-9999.ebuild
index e03cb6e..f84d8f9 100644
--- a/media-video/totem/totem-9999.ebuild
+++ b/media-video/totem/totem-9999.ebuild
@@ -32,7 +32,7 @@ fi
 # FIXME: Automagic tracker-0.9.0
 RDEPEND=">=dev-libs/glib-2.27.92
 	>=x11-libs/gdk-pixbuf-2.23.0
-	>=x11-libs/gtk+-2.99.2:3[introspection?]
+	>=x11-libs/gtk+-2.99.3:3[introspection?]
 	>=dev-libs/totem-pl-parser-2.32.2[introspection?]
 	>=dev-libs/libpeas-0.7.1[gtk]
 	>=x11-themes/gnome-icon-theme-2.16
@@ -137,14 +137,18 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# AC_CONFIG_AUX_DIR_DEFAULT doesn't exist, and eautoreconf/aclocal fails
+	mkdir -p m4
 	gnome2_src_prepare
 
 	# Fix broken smclient option passing
 	# FIXME: File a bug for this
 	epatch "${FILESDIR}/${PN}-2.90.0-smclient-target-detection.patch"
 
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
+	if [[ ${PV} != 9999 ]]; then
+		intltoolize --force --copy --automake || die "intltoolize failed"
+		eautoreconf
+	fi
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig