summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-23 23:30:59 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-03-23 23:30:59 +0000
commit8cccad53273be041f2b0df5171274927be178a61 (patch)
tree72abead2ee852034f9a604e1b8a7170ec24c210c /media-sound/rhythmbox
parentTlen protocol is blacklisted, remove (diff)
downloadhistorical-8cccad53273be041f2b0df5171274927be178a61.tar.gz
historical-8cccad53273be041f2b0df5171274927be178a61.tar.bz2
historical-8cccad53273be041f2b0df5171274927be178a61.zip
Fix dependencies. Call functions from python.eclass only with USE="python".
Package-Manager: portage-2.2.0_alpha28_p4/cvs/Linux x86_64
Diffstat (limited to 'media-sound/rhythmbox')
-rw-r--r--media-sound/rhythmbox/Manifest12
-rw-r--r--media-sound/rhythmbox/rhythmbox-0.13.3.ebuild15
2 files changed, 11 insertions, 16 deletions
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index d588edf77889..eb3549a38dca 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX rhythmbox-0.12-python-initialization.patch 5167 RMD160 cacae6274841d595a0d55ed92c42815793081176 SHA1 0b306455b027f8f9c73e185acdbbb1d041ce882d SHA256 54f3f492d4c3204b93a1fed3886ca76aa42d36737e66c6424426fc0116b25d3e
AUX rhythmbox-0.12.8-libnotify-0.7.patch 1156 RMD160 78ce782ffc424eefbe9fc59cb94e245714377c61 SHA1 cef431a34f3e82d3475229b3111ca234af8aee7d SHA256 39b66a3b8e439f0e0dbde63a1d7f5472c262f344db1334b24591e18be22fb46d
AUX rhythmbox-0.12.8-namespace-conflict.patch 2155 RMD160 2ed6fe3966c860845d0d12ca3e8023c78d7e1bdb SHA1 6e67ba7802d6dc1ff4131942d9aa1af91dec2586 SHA256 538b36af3824aa45b215b247d586c872ff1ee6cb174b8764e22a11410fd3a204
DIST rhythmbox-0.12.8.tar.bz2 5358950 RMD160 072d4fa06408ebc181b40147db1575d0ef4c99fe SHA1 5d27923cc29b81d7bfbc73d867d7976a5295f964 SHA256 1752fab135808aa78a9afde78448e992020c58c07701f43c989fbabfc6352213
DIST rhythmbox-0.13.3.tar.bz2 9978135 RMD160 f6f155768ce9c87d844ee47f7f1cc4f167d05052 SHA1 1c6e83972dcd7de8fc1a71586843e29092a0c706 SHA256 ad6532864bb4df30f1014ec81ddc0d2d3f69241235627f46abe5578cf629052a
EBUILD rhythmbox-0.12.8-r1.ebuild 5320 RMD160 163e93a6c72e6c8987e64ec25e7f0d2c7b471054 SHA1 26ce9fdade1676cd8f709a499d76b27594a7e05a SHA256 46c6558a25b0c34ebb46aa81d273df044129e735445bf4bbe2703cb03179b3c3
-EBUILD rhythmbox-0.13.3.ebuild 5125 RMD160 896be48595a18fa09ca38f428b81aa98633f4d69 SHA1 3ec5165cde1f6e53e38fb87c10a344f49f441800 SHA256 d0fb577ca30857ff568b49791bf116b1c07691d963cc5bd0c24fe6c9ead60d2c
+EBUILD rhythmbox-0.13.3.ebuild 5234 RMD160 8df8f84254d55fc095bd01bf0b6537d7ed93c362 SHA1 be291462337ce5cca8ecf97f050d87d6e3062bec SHA256 1804e636849df2989b3c7ce39cbbb1e2b83cfaaceff5e57094e312a6ad3c4c58
MISC ChangeLog 30977 RMD160 3b9106411883da742b9bd261b373a027d1dc3591 SHA1 e74e1ba85a64339fe16f0d72786d04e578b7feac SHA256 1b7bef616654c967495ad9360d92714875d2a5a5f174d0934bd26b4b71ad4a8b
MISC metadata.xml 493 RMD160 99d7c84f2cb44d34d07dbdbc9666531ca7d081ef SHA1 e014344c61ed45fd609943fec4097f3861bcebec SHA256 1fece30d8969d46bfa5a547efda6d08b53017ad2475729fc8e7b8ee25621dc0f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2Ke+sACgkQ1fmVwcYIWAYIEACeOLmi/K3B2hPLO7vDTnv+RM6K
-wEEAoOkZLAb9hOy5QWMhD+bsr2QSyn+8
-=CL+P
------END PGP SIGNATURE-----
diff --git a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild b/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
index 391bdf9a32a9..d5cd511df4ee 100644
--- a/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-0.13.3.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-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.1 2011/03/23 23:01:56 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.13.3.ebuild,v 1.2 2011/03/23 23:30:59 arfrever Exp $
EAPI="3"
PYTHON_DEPEND="python? 2:2.4"
@@ -53,7 +53,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.26:2
musicbrainz? ( media-libs/musicbrainz:3 )
python? (
|| (
- >=dev-lang/python-2.5
+ dev-lang/python:2.7
+ dev-lang/python:2.6
+ dev-lang/python:2.5
dev-python/celementtree )
>=dev-python/pygtk-2.8:2
>=dev-python/pygobject-2.15.4:2
@@ -92,8 +94,11 @@ DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
MAINTAINERS MAINTAINERS.old NEWS README THANKS"
pkg_setup() {
- python_set_active_version 2
- G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ G2CONF="${G2CONF} PYTHON=$(PYTHON -2)"
+ fi
if ! use hal && ! use udev; then
if use ipod; then
@@ -191,5 +196,5 @@ pkg_postinst() {
pkg_postrm() {
gnome2_pkg_postrm
- python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
+ use python && python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins
}