diff options
author | 2012-01-05 08:06:20 +0000 | |
---|---|---|
committer | 2012-01-05 08:06:20 +0000 | |
commit | 8c68d8ddbc604dc3557f7a69319955b560350b88 (patch) | |
tree | 436c514b7ff38622246567d112251c8ce1840460 /media-video/totem | |
parent | Add missing pycups dependency (bug #397737, thanks to My Th for reporting). (diff) | |
download | gentoo-2-8c68d8ddbc604dc3557f7a69319955b560350b88.tar.gz gentoo-2-8c68d8ddbc604dc3557f7a69319955b560350b88.tar.bz2 gentoo-2-8c68d8ddbc604dc3557f7a69319955b560350b88.zip |
Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585); move gnome2_src_prepare after eautoreconf.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-video/totem')
-rw-r--r-- | media-video/totem/ChangeLog | 9 | ||||
-rw-r--r-- | media-video/totem/totem-2.32.0-r2.ebuild | 11 | ||||
-rw-r--r-- | media-video/totem/totem-3.2.1.ebuild | 7 |
3 files changed, 15 insertions, 12 deletions
diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog index 817e0aed4f46..ee15d850c765 100644 --- a/media-video/totem/ChangeLog +++ b/media-video/totem/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/totem -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.327 2011/11/25 15:52:19 nirbheek Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.328 2012/01/05 08:06:19 tetromino Exp $ + + 05 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + totem-2.32.0-r2.ebuild, totem-3.2.1.ebuild: + Fix py-compile idiom for automake-1.11.2 compatibility (bug #396585); move + gnome2_src_prepare after eautoreconf. 25 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -totem-2.32.0.ebuild, totem-2.32.0-r2.ebuild: diff --git a/media-video/totem/totem-2.32.0-r2.ebuild b/media-video/totem/totem-2.32.0-r2.ebuild index 920102896495..9fba6ce387e0 100644 --- a/media-video/totem/totem-2.32.0-r2.ebuild +++ b/media-video/totem/totem-2.32.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.7 2011/11/25 15:52:19 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-2.32.0-r2.ebuild,v 1.8 2012/01/05 08:06:20 tetromino Exp $ EAPI="3" GCONF_DEBUG="yes" @@ -142,8 +142,6 @@ pkg_setup() { } src_prepare() { - gnome2_src_prepare - # Use fixed gnome-doc-utils.make, bug #348403 (can be dropped in next bump) cp -f /usr/share/gnome-doc-utils/gnome-doc-utils.make . || die @@ -156,9 +154,10 @@ src_prepare() { intltoolize --force --copy --automake || die "intltoolize failed" eautoreconf + gnome2_src_prepare + # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile + echo > py-compile } src_configure() { diff --git a/media-video/totem/totem-3.2.1.ebuild b/media-video/totem/totem-3.2.1.ebuild index bdeb866e2679..6e39486cc795 100644 --- a/media-video/totem/totem-3.2.1.ebuild +++ b/media-video/totem/totem-3.2.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.1.ebuild,v 1.1 2011/11/03 06:18:47 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-3.2.1.ebuild,v 1.2 2012/01/05 08:06:19 tetromino Exp $ EAPI="4" GCONF_DEBUG="yes" @@ -150,8 +150,7 @@ src_prepare() { #fi # disable pyc compiling - mv py-compile py-compile.orig - ln -s $(type -P true) py-compile + echo > py-compile gnome2_src_prepare } |