diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-12-01 14:09:29 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-12-01 14:09:29 +0000 |
| commit | 35bf965ad740c58610fc6ab31404b908e374a1ee (patch) | |
| tree | 4448d5aff5d15ab65f5af9ec77995969faae3bd8 /media-sound/rhythmbox | |
| parent | version bump (diff) | |
| download | gentoo-2-35bf965ad740c58610fc6ab31404b908e374a1ee.tar.gz gentoo-2-35bf965ad740c58610fc6ab31404b908e374a1ee.tar.bz2 gentoo-2-35bf965ad740c58610fc6ab31404b908e374a1ee.zip | |
Use python-r1 to avoid issues with python-single-r1 when depending on libpeas. Enforce proper USE dependency on libpeas.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-sound/rhythmbox')
| -rw-r--r-- | media-sound/rhythmbox/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/rhythmbox/rhythmbox-3.1.ebuild | 14 |
2 files changed, 11 insertions, 9 deletions
diff --git a/media-sound/rhythmbox/ChangeLog b/media-sound/rhythmbox/ChangeLog index c87f8cd1104a..d1f17dc47f58 100644 --- a/media-sound/rhythmbox/ChangeLog +++ b/media-sound/rhythmbox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/rhythmbox # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.265 2014/11/24 10:43:32 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.266 2014/12/01 14:09:29 mgorny Exp $ + + 01 Dec 2014; Michał Górny <mgorny@gentoo.org> rhythmbox-3.1.ebuild: + Use python-r1 to avoid issues with python-single-r1 when depending on libpeas. + Enforce proper USE dependency on libpeas. 24 Nov 2014; Pacho Ramos <pacho@gentoo.org> rhythmbox-3.1.ebuild: python-3.3 is the default again diff --git a/media-sound/rhythmbox/rhythmbox-3.1.ebuild b/media-sound/rhythmbox/rhythmbox-3.1.ebuild index e7d8e7e6bcee..7a861b4b3824 100644 --- a/media-sound/rhythmbox/rhythmbox-3.1.ebuild +++ b/media-sound/rhythmbox/rhythmbox-3.1.ebuild @@ -1,14 +1,14 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild,v 1.4 2014/11/24 10:43:32 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild,v 1.5 2014/12/01 14:09:29 mgorny Exp $ EAPI="5" GNOME2_LA_PUNT="yes" GCONF_DEBUG="no" -PYTHON_COMPAT=( python3_{2,3,4} ) +PYTHON_COMPAT=( python3_{3,4} ) PYTHON_REQ_USE="xml" -inherit eutils gnome2 python-single-r1 multilib virtualx +inherit eutils gnome2 python-r1 multilib virtualx DESCRIPTION="Music management and playback software for GNOME" HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox" @@ -18,9 +18,6 @@ SLOT="0" IUSE="cdr daap dbus +libsecret html ipod libnotify lirc mtp nsplugin +python test +udev upnp-av visualizer webkit zeitgeist" -# Let people emerge this by default, bug #472932 -IUSE+=" +python_single_target_python3_3" - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" REQUIRED_USE=" @@ -28,7 +25,7 @@ REQUIRED_USE=" mtp? ( udev ) dbus? ( python ) webkit? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) + python? ( ^^ ( $(python_gen_useflags '*') ) ) " # Tests failing for years without upstream caring at all @@ -85,6 +82,7 @@ RDEPEND="${COMMON_DEPEND} >=media-libs/grilo-0.2:0.2 >=media-plugins/grilo-plugins-0.2:0.2[upnp-av] ) python? ( + >=dev-libs/libpeas-0.7.3[${PYTHON_USEDEP}] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] @@ -105,7 +103,7 @@ DEPEND="${COMMON_DEPEND} " pkg_setup() { - use python && python-single-r1_pkg_setup + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup } src_prepare() { |