| 1 |
pacho 12/01/30 12:04:13 |
| 2 |
|
| 3 |
Modified: rhythmbox-0.12.8-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix build/running when python3 is main interpreter, bug #401047 by Alexander Sulfrian |
| 6 |
|
| 7 |
(Portage version: 2.1.10.44/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.19 media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild?rev=1.19&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild?rev=1.19&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild?r1=1.18&r2=1.19 |
| 15 |
|
| 16 |
Index: rhythmbox-0.12.8-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v |
| 19 |
retrieving revision 1.18 |
| 20 |
retrieving revision 1.19 |
| 21 |
diff -u -r1.18 -r1.19 |
| 22 |
--- rhythmbox-0.12.8-r1.ebuild 5 Jan 2012 06:38:12 -0000 1.18 |
| 23 |
+++ rhythmbox-0.12.8-r1.ebuild 30 Jan 2012 12:04:13 -0000 1.19 |
| 24 |
@@ -1,8 +1,11 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.18 2012/01/05 06:38:12 tetromino Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/rhythmbox-0.12.8-r1.ebuild,v 1.19 2012/01/30 12:04:13 pacho Exp $ |
| 29 |
|
| 30 |
-EAPI="3" |
| 31 |
+EAPI="4" |
| 32 |
+GNOME_TARBALL_SUFFIX="bz2" |
| 33 |
+GCONF_DEBUG="no" |
| 34 |
+PYTHON_DEPEND="python? 2" |
| 35 |
|
| 36 |
inherit eutils gnome2 python multilib virtualx |
| 37 |
|
| 38 |
@@ -44,7 +47,6 @@ |
| 39 |
musicbrainz? ( media-libs/musicbrainz:3 |
| 40 |
media-libs/musicbrainz:1 ) |
| 41 |
python? ( |
| 42 |
- >=dev-lang/python-2.4.2 |
| 43 |
|| ( |
| 44 |
>=dev-lang/python-2.5 |
| 45 |
dev-python/celementtree ) |
| 46 |
@@ -137,6 +139,11 @@ |
| 47 |
--disable-vala" |
| 48 |
|
| 49 |
export GST_INSPECT=/bin/true |
| 50 |
+ |
| 51 |
+ if use python; then |
| 52 |
+ python_set_active_version 2 |
| 53 |
+ python_pkg_setup |
| 54 |
+ fi |
| 55 |
} |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
@@ -152,6 +159,8 @@ |
| 59 |
|
| 60 |
# Fix building with recent glibc, bug #333373 |
| 61 |
epatch "${FILESDIR}/${P}-namespace-conflict.patch" |
| 62 |
+ |
| 63 |
+ use python && python_convert_shebangs -r 2 . |
| 64 |
} |
| 65 |
|
| 66 |
src_compile() { |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.212 media-sound/rhythmbox/ChangeLog |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?rev=1.212&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?rev=1.212&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/rhythmbox/ChangeLog?r1=1.211&r2=1.212 |
| 75 |
|
| 76 |
Index: ChangeLog |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v |
| 79 |
retrieving revision 1.211 |
| 80 |
retrieving revision 1.212 |
| 81 |
diff -u -r1.211 -r1.212 |
| 82 |
--- ChangeLog 17 Jan 2012 17:05:37 -0000 1.211 |
| 83 |
+++ ChangeLog 30 Jan 2012 12:04:13 -0000 1.212 |
| 84 |
@@ -1,6 +1,10 @@ |
| 85 |
# ChangeLog for media-sound/rhythmbox |
| 86 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 87 |
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.211 2012/01/17 17:05:37 pacho Exp $ |
| 88 |
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rhythmbox/ChangeLog,v 1.212 2012/01/30 12:04:13 pacho Exp $ |
| 89 |
+ |
| 90 |
+ 30 Jan 2012; Pacho Ramos <pacho@g.o> rhythmbox-0.12.8-r1.ebuild: |
| 91 |
+ Fix build/running when python3 is main interpreter, bug #401047 by Alexander |
| 92 |
+ Sulfrian |
| 93 |
|
| 94 |
17 Jan 2012; Pacho Ramos <pacho@g.o> rhythmbox-2.95.ebuild: |
| 95 |
>=x11-libs/gtk+-3.2 is needed, bug #399121 by erhard.furtner and Matthias |
Archives