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.

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

4 files changed, 16 insertions, 136 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/Manifest b/media-video/miro/Manifest
index bbc62a8e47a4..7d8088aa8b48 100644
--- a/media-video/miro/Manifest
+++ b/media-video/miro/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 4.0.1-ffmpeg.patch 3439 RMD160 17f980d6905ccd44fbf7edb188721b5c162fc14f SHA1 f0c851d51318c0e0be8b91463ef901625d2587a9 SHA256 5f7a3ff21aae7684cad9a3d2aa5e40205fe0a8496cf7e9ca1e40f1f7861f5b75
 AUX miro-2.5.3-disable-xine-hack.patch 746 RMD160 cfb7f550eb9b8b1c18f3ed412737d441bbc7714c SHA1 b9ae72c6bf8bce862c23f00049b33fbf9d29f06c SHA256 2910e23cdf024d4d3dd20b0e93300162d468f6a36062c8e1412ede14d0520c7f
@@ -7,18 +7,14 @@ AUX miro-2.5.3-dont-install-test-files.patch 1422 RMD160 6686dae4476951fa3b48a78
 AUX miro-2.5.3-fix-debug.patch 472 RMD160 0cee057c074004a4c8662f19fba0d49247a5ba3c SHA1 f0587a930705a2edce7142d2c681c5beaaa5deec SHA256 27bafa26876df1aaef10688757c2eb4a2a3c8fff06665d376c026a316c68c103
 AUX miro-2.5.3-remove-pkg-config-list-all.patch 2880 RMD160 7aa0300eda840a9662df172c53397c19aab9967a SHA1 1298447816b3e06a4d5c309f66c2916eec1ae2c4 SHA256 ac28c97c1ca3051c3d0c2f7b17eca78a3e45e02c589cda813e98c166a3a21f55
 AUX miro-2.5.3-remove-unittest-option.patch 538 RMD160 f29c534b28ac453cb72d18cb3e0810f6744c38b6 SHA1 4f86a65c368ced0b7a37d091a3705cd2f80d2628 SHA256 889e8480faee3af86d9c2dbfa9375eeb102ca01df6c71b07fcb4b62b326cbe6a
-DIST miro-2.5.4.tar.gz 10032329 RMD160 38e5bf42db323b54803ce12ab1e8dec8192aac51 SHA1 4fd6cb48ed1fb3a9588c4af9f2da55f88654f194 SHA256 43f18abfc8cc7cdbb84fb5de2136397080e4c153881498b18970c81a671b0f67
 DIST miro-4.0.1.tar.gz 12806477 RMD160 ec96cd33472668dd21f326404ecd07a6126de34b SHA1 c79577a68ac1dac55ccd80138a8040dc4df00c72 SHA256 bac2d579350517590a2f38d3be40da25bca3b331969b03046c1ba545984a6881
-EBUILD miro-2.5.4.ebuild 3526 RMD160 2abb4a0d381f3dd88a71485beec9c8e32abf562b SHA1 46b7bb0ea1f8ddda64515daed388827a15598eb3 SHA256 3d32842e342a3d8735f203cd62076757b8cfbbf147d929c4f7832b2411a06b5a
-EBUILD miro-4.0.1.ebuild 2168 RMD160 81ae2cf6a1ef0f4a2640bdd3a4cfc98ec2753959 SHA1 2be9da5a34804e4055540e1555e7b4bd7bba87a6 SHA256 309db7a6c4caeb2e453affa080c528046af7ed1b17737c98e9eaae243c691460
-MISC ChangeLog 2073 RMD160 49a1949199527864cb7025b653a56be032d38369 SHA1 3eced1ed0e8655662b007bd40996e01519e89572 SHA256 aeda3e3912dff0f33e7772c4bf9cbe28b0b82599974dd22beda4ec4198837b0d
+EBUILD miro-4.0.1.ebuild 2169 RMD160 649e651fa11432c8222847798ddee4d344594c56 SHA1 d1f97e91f9b99e677f7384b45642844ded9333b9 SHA256 89566fd2c9e17ee4454230ab6ec2a7ef0c1b5320956a462058c1d750488cfed5
+MISC ChangeLog 2359 RMD160 8e9286f1e2397fc14c7bf21f3bc998764591cb5f SHA1 149f963faca6ad3835dbb6c16bfc923d1d12ccf6 SHA256 90b24839adf5f506ab75a905769b64c1f996db2e3b0d5269a315f22b6ce6da0c
 MISC metadata.xml 234 RMD160 a88367247d0403d885bae8a3942fa70f63c5e517 SHA1 7121c922a55aa1d185a066d57d9f416c18ff04c8 SHA256 2c3afa6d9e2e94da9f6edc46a9f0235e640be6a67507f2096206cd1556d4b86c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59p58ACgkQfXuS5UK5QB0PSQP8DBYerHiFtVCquYSQvjgOrR+d
-fNOUODHo4HWxIWEqBftU4JTvCQv4UUZVwNIuYc23xcZjBELV3SdR3FElYXhd/jeG
-N5MkBCOj4vjTD3WwFgVzZpsDYEPV2ZaLG6ZFqiWENH14FJYLTp5Bpck4lH7CeUv2
-LcAkiIz0DDRnJfbN6+U=
-=oAdy
+iEYEARECAAYFAk6AeCwACgkQCaWpQKGI+9TuLQCgh5L2ZreDC15KcCjKD3zdO9SH
+9LUAn2XSVyrk9et3lBPONW/DJM7DzazK
+=dvea
 -----END PGP SIGNATURE-----
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="