mgorny 14/12/01 14:09:29 Modified: rhythmbox-3.1.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.5 media-sound/rhythmbox/rhythmbox-3.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild?r1=1.4&r2=1.5 Index: rhythmbox-3.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rhythmbox-3.1.ebuild 24 Nov 2014 10:43:32 -0000 1.4 +++ rhythmbox-3.1.ebuild 1 Dec 2014 14:09:29 -0000 1.5 @@ -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 @@ 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 @@ 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 @@ >=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 @@ " pkg_setup() { - use python && python-single-r1_pkg_setup + use python && [[ ${MERGE_TYPE} != binary ]] && python_setup } src_prepare() { 1.266 media-sound/rhythmbox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?rev=1.266&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?rev=1.266&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?r1=1.265&r2=1.266 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- ChangeLog 24 Nov 2014 10:43:32 -0000 1.265 +++ ChangeLog 1 Dec 2014 14:09:29 -0000 1.266 @@ -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 <mgo...@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 <pa...@gentoo.org> rhythmbox-3.1.ebuild: python-3.3 is the default again
