Rekeyword on ppc now that xvid USE is masked on powerpc profile and there is no reason to get it dropped anymore, allowing us to be able to drop gtkmozembed stuff sooner, bug #372243. Remove old.

(Portage version: 2.1.10.19/cvs/Linux x86_64)

3 files changed, 9 insertions, 125 deletions

diff --git a/media-video/miro/ChangeLog b/media-video/miro/ChangeLog
index a4dfb7c876db..e56c7b5a23dd 100644
--- a/media-video/miro/ChangeLog
+++ b/media-video/miro/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/miro
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.10 2011/05/25 14:23:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.11 2011/09/26 13:03:34 pacho Exp $
+
+  26 Sep 2011; Pacho Ramos <pacho@gentoo.org> -miro-2.5.4.ebuild,
+  miro-4.0.1.ebuild:
+  Rekeyword on ppc now that xvid USE is masked on powerpc profile and there is
+  no reason to get it dropped anymore, allowing us to be able to drop
+  gtkmozembed stuff sooner, bug #372243. Remove old.
 
 *miro-4.0.1 (25 May 2011)
 
diff --git a/media-video/miro/miro-2.5.4.ebuild b/media-video/miro/miro-2.5.4.ebuild
deleted file mode 100644
index 7eb6eeacc795..000000000000
--- a/media-video/miro/miro-2.5.4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-2.5.4.ebuild,v 1.3 2011/03/11 20:47:12 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils fdo-mime gnome2-utils distutils
-
-DESCRIPTION="Open source video player and podcast client"
-HOMEPAGE="http://www.getmiro.com/"
-SRC_URI="http://ftp.osuosl.org/pub/pculture.org/${PN}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+gstreamer libnotify"
-
-CDEPEND="
-	dev-libs/boost[python]
-	dev-libs/glib:2
-	dev-python/pygobject:2
-	dev-python/pygtk:2
-	media-libs/xine-lib
-	>=net-libs/rb_libtorrent-0.14.1[python]
-	net-libs/xulrunner:1.9
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-RDEPEND="${CDEPEND}
-	gstreamer? ( dev-python/gst-python:0.10 )
-	libnotify? ( dev-python/notify-python )
-	|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-python/pysqlite:2 )
-	dev-python/dbus-python
-	dev-python/gconf-python
-	dev-python/gtkmozembed-python
-	dev-python/pycairo"
-DEPEND="${CDEPEND}
-	>=dev-python/pyrex-0.9.6.4
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P}/platform/gtk-x11"
-
-# NOTES:
-# it's probably not working with python-3
-# used xulrunner has to be the same as the one used for gtkmozembed-python
-# psyco can make miro speedier, add a USE flag, recommand in postinst ?
-
-# TODO:
-# create a real test suite, upstream bug 12369
-# try to have a real xine/gstreamer choice, upstream bug 12371
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# fix debug mode
-	epatch "${FILESDIR}"/${PN}-2.5.3-fix-debug.patch
-	# disable xine hack which is failing
-	epatch "${FILESDIR}"/${PN}-2.5.3-disable-xine-hack.patch
-	# prevent installing unneeded test files
-	epatch "${FILESDIR}"/${PN}-2.5.3-dont-install-test-files.patch # upstream bug 12370
-	# do not show --unittest option
-	epatch "${FILESDIR}"/${PN}-2.5.3-remove-unittest-option.patch # upstream bug 12370
-	# remove 'pkg-config --list-all' call, bug 294183, upstream bug 4613
-	epatch "${FILESDIR}"/${PN}-2.5.3-remove-pkg-config-list-all.patch
-
-	# disable autoupdate
-	sed -i -e "/autoupdate/d" ../../portable/startup.py || die "sed failed"
-
-	# be sure libnotify is never used if disabled
-	if ! use libnotify; then
-		sed -i -e "s:import pynotify:import pynotifyisdisabled:" \
-			../../portable/frontends/widgets/gtk/trayicon.py \
-			plat/frontends/widgets/application.py || die "sed failed"
-	fi
-
-	# set xine as the default renderer if gstreamer is disabled
-	if ! use gstreamer; then
-		sed -i -e "s:default=u\"gstreamer\":default=u\"xine\":" \
-			plat/options.py || die "sed failed"
-	fi
-}
-
-src_test() {
-	# there is a test suite but it has been designed to be used when installed
-	# should be fixed
-	#./run.sh --unittests || die "tests failed"
-	:
-}
-
-src_install() {
-	# doing the mv now otherwise, distutils_src_install will install it
-	mv README README.gtk || die "mv failed"
-
-	distutils_src_install
-
-	# installing docs
-	dodoc README.gtk ../../{ADOPTERS,CREDITS,README} || die "dodoc failed"
-	newdoc ../../portable/frontends/cli/README README.cli || die "dodoc failed"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-
-	elog "If you can't see a video or can't heard an audio,"
-	elog "enable needed media-libs/xine-lib USE flags"
-	elog "or install required gstreamer plugins"
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/media-video/miro/miro-4.0.1.ebuild b/media-video/miro/miro-4.0.1.ebuild
index e4c2e5ce46bb..90874a122300 100644
--- a/media-video/miro/miro-4.0.1.ebuild
+++ b/media-video/miro/miro-4.0.1.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/media-video/miro/miro-4.0.1.ebuild,v 1.1 2011/05/25 14:23:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-4.0.1.ebuild,v 1.2 2011/09/26 13:03:34 pacho Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.osuosl.org/pub/pculture.org/${PN}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="libnotify aac musepack xvid"
 
 CDEPEND="