| 1 |
mgorny 14/12/01 14:09:29 |
| 2 |
|
| 3 |
Modified: rhythmbox-3.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use python-r1 to avoid issues with python-single-r1 when depending on libpeas. Enforce proper USE dependency on libpeas. |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.5 media-sound/rhythmbox/rhythmbox-3.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild?rev=1.5&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild?rev=1.5&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild?r1=1.4&r2=1.5 |
| 15 |
|
| 16 |
Index: rhythmbox-3.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild,v |
| 19 |
retrieving revision 1.4 |
| 20 |
retrieving revision 1.5 |
| 21 |
diff -u -r1.4 -r1.5 |
| 22 |
--- rhythmbox-3.1.ebuild 24 Nov 2014 10:43:32 -0000 1.4 |
| 23 |
+++ rhythmbox-3.1.ebuild 1 Dec 2014 14:09:29 -0000 1.5 |
| 24 |
@@ -1,14 +1,14 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild,v 1.4 2014/11/24 10:43:32 pacho Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-3.1.ebuild,v 1.5 2014/12/01 14:09:29 mgorny Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
GNOME2_LA_PUNT="yes" |
| 32 |
GCONF_DEBUG="no" |
| 33 |
-PYTHON_COMPAT=( python3_{2,3,4} ) |
| 34 |
+PYTHON_COMPAT=( python3_{3,4} ) |
| 35 |
PYTHON_REQ_USE="xml" |
| 36 |
|
| 37 |
-inherit eutils gnome2 python-single-r1 multilib virtualx |
| 38 |
+inherit eutils gnome2 python-r1 multilib virtualx |
| 39 |
|
| 40 |
DESCRIPTION="Music management and playback software for GNOME" |
| 41 |
HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox" |
| 42 |
@@ -18,9 +18,6 @@ |
| 43 |
IUSE="cdr daap dbus +libsecret html ipod libnotify lirc mtp nsplugin +python |
| 44 |
test +udev upnp-av visualizer webkit zeitgeist" |
| 45 |
|
| 46 |
-# Let people emerge this by default, bug #472932 |
| 47 |
-IUSE+=" +python_single_target_python3_3" |
| 48 |
- |
| 49 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 50 |
|
| 51 |
REQUIRED_USE=" |
| 52 |
@@ -28,7 +25,7 @@ |
| 53 |
mtp? ( udev ) |
| 54 |
dbus? ( python ) |
| 55 |
webkit? ( python ) |
| 56 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
| 57 |
+ python? ( ^^ ( $(python_gen_useflags '*') ) ) |
| 58 |
" |
| 59 |
|
| 60 |
# Tests failing for years without upstream caring at all |
| 61 |
@@ -85,6 +82,7 @@ |
| 62 |
>=media-libs/grilo-0.2:0.2 |
| 63 |
>=media-plugins/grilo-plugins-0.2:0.2[upnp-av] ) |
| 64 |
python? ( |
| 65 |
+ >=dev-libs/libpeas-0.7.3[${PYTHON_USEDEP}] |
| 66 |
x11-libs/gdk-pixbuf:2[introspection] |
| 67 |
x11-libs/gtk+:3[introspection] |
| 68 |
x11-libs/pango[introspection] |
| 69 |
@@ -105,7 +103,7 @@ |
| 70 |
" |
| 71 |
|
| 72 |
pkg_setup() { |
| 73 |
- use python && python-single-r1_pkg_setup |
| 74 |
+ use python && [[ ${MERGE_TYPE} != binary ]] && python_setup |
| 75 |
} |
| 76 |
|
| 77 |
src_prepare() { |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
1.266 media-sound/rhythmbox/ChangeLog |
| 82 |
|
| 83 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?rev=1.266&view=markup |
| 84 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?rev=1.266&content-type=text/plain |
| 85 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?r1=1.265&r2=1.266 |
| 86 |
|
| 87 |
Index: ChangeLog |
| 88 |
=================================================================== |
| 89 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v |
| 90 |
retrieving revision 1.265 |
| 91 |
retrieving revision 1.266 |
| 92 |
diff -u -r1.265 -r1.266 |
| 93 |
--- ChangeLog 24 Nov 2014 10:43:32 -0000 1.265 |
| 94 |
+++ ChangeLog 1 Dec 2014 14:09:29 -0000 1.266 |
| 95 |
@@ -1,6 +1,10 @@ |
| 96 |
# ChangeLog for media-sound/rhythmbox |
| 97 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 98 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.265 2014/11/24 10:43:32 pacho Exp $ |
| 99 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.266 2014/12/01 14:09:29 mgorny Exp $ |
| 100 |
+ |
| 101 |
+ 01 Dec 2014; Michał Górny <mgorny@g.o> rhythmbox-3.1.ebuild: |
| 102 |
+ Use python-r1 to avoid issues with python-single-r1 when depending on libpeas. |
| 103 |
+ Enforce proper USE dependency on libpeas. |
| 104 |
|
| 105 |
24 Nov 2014; Pacho Ramos <pacho@g.o> rhythmbox-3.1.ebuild: |
| 106 |
python-3.3 is the default again |
Archives