Fixed issue with python versions, bug 383637

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

diff --git a/media-video/miro/ChangeLog b/media-video/miro/ChangeLog
index e56c7b5a23dd7a496fa7f65160f9bae92b3757cf..19465c2b1ea470fae15de513924d03fafac8d509 100644 (file)
--- a/media-video/miro/ChangeLog
+++ b/media-video/miro/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2011/09/26 13:03:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.12 2011/12/17 08:33:27 maksbotan Exp $
+
+*miro-4.0.1-r1 (17 Dec 2011)
+
+  17 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> +miro-4.0.1-r1.ebuild:
+  Fixed issue with python versions, bug 383637
 
   26 Sep 2011; Pacho Ramos <pacho@gentoo.org> -miro-2.5.4.ebuild,
   miro-4.0.1.ebuild:

diff --git a/media-video/miro/Manifest b/media-video/miro/Manifest
index 7d8088aa8b482229c4c4d739a192eaeaabaeeaf2..51c47f924e6e32493c89b611d1d3fdbfed6a29f2 100644 (file)
--- a/media-video/miro/Manifest
+++ b/media-video/miro/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-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
 AUX miro-2.5.3-dont-install-test-files.patch 1422 RMD160 6686dae4476951fa3b48a7891577298a629e86a1 SHA1 f1b816ac394542671f782fa4e6caaa2588151e86 SHA256 ad42ba3024da26c0e16ee8e8747b0eb0fbda604e6eeb3be7274c2ac7ac9aee3b
@@ -8,13 +5,7 @@ AUX miro-2.5.3-fix-debug.patch 472 RMD160 0cee057c074004a4c8662f19fba0d49247a5ba
 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-4.0.1.tar.gz 12806477 RMD160 ec96cd33472668dd21f326404ecd07a6126de34b SHA1 c79577a68ac1dac55ccd80138a8040dc4df00c72 SHA256 bac2d579350517590a2f38d3be40da25bca3b331969b03046c1ba545984a6881
+EBUILD miro-4.0.1-r1.ebuild 2258 RMD160 4642b7900636b8a56cf2f5fcfd28527967c0a415 SHA1 5bd21e6ec83dcad214d5b34a05b338847e589cdb SHA256 929ba2e74c9ef88c2bf95a8e21f641ee318b6564e8e66e55831e75c92a72765b
 EBUILD miro-4.0.1.ebuild 2169 RMD160 649e651fa11432c8222847798ddee4d344594c56 SHA1 d1f97e91f9b99e677f7384b45642844ded9333b9 SHA256 89566fd2c9e17ee4454230ab6ec2a7ef0c1b5320956a462058c1d750488cfed5
-MISC ChangeLog 2359 RMD160 8e9286f1e2397fc14c7bf21f3bc998764591cb5f SHA1 149f963faca6ad3835dbb6c16bfc923d1d12ccf6 SHA256 90b24839adf5f506ab75a905769b64c1f996db2e3b0d5269a315f22b6ce6da0c
+MISC ChangeLog 2516 RMD160 1a1c3fc7132afcaca6523973e09c48cb3a8320fb SHA1 443a78814f2cc4ed6c42d28b0aa4bf4464768646 SHA256 adcd69e6dede758bb55c6c051dc8347e4b828acd341fb3ce23814216b46e7e96
 MISC metadata.xml 234 RMD160 a88367247d0403d885bae8a3942fa70f63c5e517 SHA1 7121c922a55aa1d185a066d57d9f416c18ff04c8 SHA256 2c3afa6d9e2e94da9f6edc46a9f0235e640be6a67507f2096206cd1556d4b86c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk6AeCwACgkQCaWpQKGI+9TuLQCgh5L2ZreDC15KcCjKD3zdO9SH
-9LUAn2XSVyrk9et3lBPONW/DJM7DzazK
-=dvea
------END PGP SIGNATURE-----

diff --git a/media-video/miro/miro-4.0.1-r1.ebuild b/media-video/miro/miro-4.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..c99da1c
--- /dev/null
+++ b/media-video/miro/miro-4.0.1-r1.ebuild
@@ -0,0 +1,93 @@
+# 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-r1.ebuild,v 1.1 2011/12/17 08:33:27 maksbotan Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="sqlite"
+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="libnotify aac musepack xvid"
+
+CDEPEND="
+       dev-libs/glib:2
+       dev-libs/boost[python]
+       >=dev-python/pyrex-0.9.6.4
+       dev-python/pygtk:2
+       dev-python/pygobject:2
+       >=virtual/ffmpeg-0.6.90"
+
+RDEPEND="${CDEPEND}
+       dev-python/dbus-python
+       dev-python/pycairo
+       dev-python/gconf-python
+       dev-python/gst-python:0.10
+       dev-python/pyrex
+       >=dev-python/pywebkitgtk-1.1.5
+       dev-python/pycurl
+       >=net-libs/rb_libtorrent-0.14.1[python]
+       media-libs/mutagen
+       media-plugins/gst-plugins-meta:0.10
+       media-plugins/gst-plugins-pango:0.10
+       aac? ( media-plugins/gst-plugins-faad:0.10 )
+       libnotify? ( dev-python/notify-python )
+       musepack? ( media-plugins/gst-plugins-musepack:0.10 )
+       xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
+
+DEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/linux"
+
+pkg_setup() {
+       python_set_active_version 2
+       python_pkg_setup
+}
+
+src_prepare() {
+       epatch "${FILESDIR}/${PV}-ffmpeg.patch"
+       distutils_src_prepare
+}
+
+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 ../{CREDITS,README} || 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
+
+       ewarn
+       ewarn "If miro doesn't play some video or audio format, please"
+       ewarn "check your USE flags on media-plugins/gst-plugins-meta"
+       ewarn
+       elog "Miro for Linux doesn't support Adobe Flash, therefore you"
+       elog "you will not see any embedded video player on MiroGuide."
+       elog
+}
+
+pkg_postrm() {
+       distutils_pkg_postrm
+       fdo-mime_desktop_database_update
+       fdo-mime_mime_database_update
+       gnome2_icon_cache_update
+}