| 1 |
commit: 8180d774d725ea18c44a8864b4ffac4fbe805bed |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Thu Dec 5 11:05:33 2013 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Thu Dec 5 11:05:33 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=8180d774 |
| 7 |
|
| 8 |
media-sound/rhythmbox: Fix live version and sync with portage |
| 9 |
|
| 10 |
--- |
| 11 |
media-sound/rhythmbox/rhythmbox-9999.ebuild | 139 +++++++++++++--------------- |
| 12 |
1 file changed, 62 insertions(+), 77 deletions(-) |
| 13 |
|
| 14 |
diff --git a/media-sound/rhythmbox/rhythmbox-9999.ebuild b/media-sound/rhythmbox/rhythmbox-9999.ebuild |
| 15 |
index 629e7fe..9a0c350 100644 |
| 16 |
--- a/media-sound/rhythmbox/rhythmbox-9999.ebuild |
| 17 |
+++ b/media-sound/rhythmbox/rhythmbox-9999.ebuild |
| 18 |
@@ -1,14 +1,14 @@ |
| 19 |
-# Copyright 1999-2012 Gentoo Foundation |
| 20 |
+# Copyright 1999-2013 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
# $Header: $ |
| 23 |
|
| 24 |
-EAPI="4" |
| 25 |
+EAPI="5" |
| 26 |
GNOME2_LA_PUNT="yes" |
| 27 |
-PYTHON_DEPEND="python? 2:2.5" |
| 28 |
-PYTHON_USE_WITH="xml" |
| 29 |
-PYTHON_USE_WITH_OPT="python" |
| 30 |
+GCONF_DEBUG="no" |
| 31 |
+PYTHON_COMPAT=( python3_{2,3} ) |
| 32 |
+PYTHON_REQ_USE="xml" |
| 33 |
|
| 34 |
-inherit eutils gnome2 python multilib virtualx |
| 35 |
+inherit eutils gnome2 python-single-r1 multilib virtualx |
| 36 |
if [[ ${PV} = 9999 ]]; then |
| 37 |
inherit gnome2-live |
| 38 |
fi |
| 39 |
@@ -18,35 +18,40 @@ HOMEPAGE="http://www.rhythmbox.org/" |
| 40 |
|
| 41 |
LICENSE="GPL-2" |
| 42 |
SLOT="0" |
| 43 |
-IUSE="cdr daap dbus doc +keyring html ipod libnotify lirc mtp nsplugin +python |
| 44 |
+IUSE="cdr daap dbus +libsecret html ipod libnotify lirc mtp nsplugin +python |
| 45 |
test +udev upnp-av visualizer webkit zeitgeist" |
| 46 |
+ |
| 47 |
+IUSE+=" python_single_target_python3_2 +python_single_target_python3_3" |
| 48 |
+ |
| 49 |
if [[ ${PV} = 9999 ]]; then |
| 50 |
KEYWORDS="" |
| 51 |
else |
| 52 |
- KEYWORDS="~amd64 ~x86" |
| 53 |
+ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 54 |
fi |
| 55 |
|
| 56 |
REQUIRED_USE=" |
| 57 |
ipod? ( udev ) |
| 58 |
mtp? ( udev ) |
| 59 |
dbus? ( python ) |
| 60 |
- webkit? ( python )" |
| 61 |
+ webkit? ( python ) |
| 62 |
+ python? ( ${PYTHON_REQUIRED_USE} ) |
| 63 |
+" |
| 64 |
|
| 65 |
# FIXME: double check what to do with fm-radio plugin |
| 66 |
# webkit-gtk-1.10 is needed because it uses gstreamer-1.0 |
| 67 |
-COMMON_DEPEND=">=dev-libs/glib-2.34.0:2 |
| 68 |
- dev-libs/json-glib |
| 69 |
+COMMON_DEPEND=" |
| 70 |
+ >=dev-libs/glib-2.34.0:2 |
| 71 |
>=dev-libs/libxml2-2.7.8:2 |
| 72 |
>=x11-libs/gtk+-3.6:3[introspection] |
| 73 |
>=x11-libs/gdk-pixbuf-2.18.0:2 |
| 74 |
>=dev-libs/gobject-introspection-0.10.0 |
| 75 |
>=dev-libs/libpeas-0.7.3[gtk,python?] |
| 76 |
>=dev-libs/totem-pl-parser-3.2.0 |
| 77 |
- >=net-libs/libsoup-2.26:2.4 |
| 78 |
- >=net-libs/libsoup-gnome-2.26:2.4 |
| 79 |
- >=media-libs/gst-plugins-base-0.11.92:1.0[introspection] |
| 80 |
- >=media-libs/gstreamer-0.11.92:1.0[introspection] |
| 81 |
+ >=net-libs/libsoup-2.34:2.4 |
| 82 |
+ media-libs/gst-plugins-base:1.0[introspection] |
| 83 |
+ media-libs/gstreamer:1.0[introspection] |
| 84 |
>=sys-libs/tdb-1.2.6 |
| 85 |
+ dev-libs/json-glib |
| 86 |
|
| 87 |
visualizer? ( |
| 88 |
>=media-libs/clutter-1.8:1.0 |
| 89 |
@@ -56,13 +61,13 @@ COMMON_DEPEND=">=dev-libs/glib-2.34.0:2 |
| 90 |
media-plugins/gst-plugins-libvisual:1.0 ) |
| 91 |
cdr? ( >=app-cdr/brasero-2.91.90 ) |
| 92 |
daap? ( |
| 93 |
- >=net-libs/libdmapsharing-2.9.16:3.0 |
| 94 |
+ >=net-libs/libdmapsharing-2.9.19:3.0 |
| 95 |
media-plugins/gst-plugins-soup:1.0 ) |
| 96 |
- keyring? ( >=app-crypt/libsecret-0.14 ) |
| 97 |
+ libsecret? ( >=app-crypt/libsecret-0.14 ) |
| 98 |
html? ( >=net-libs/webkit-gtk-1.10:3 ) |
| 99 |
libnotify? ( >=x11-libs/libnotify-0.7.0 ) |
| 100 |
lirc? ( app-misc/lirc ) |
| 101 |
- python? ( >=dev-python/pygobject-3.0:3 ) |
| 102 |
+ python? ( >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] ) |
| 103 |
udev? ( |
| 104 |
virtual/udev[gudev] |
| 105 |
ipod? ( >=media-libs/libgpod-0.7.92[udev] ) |
| 106 |
@@ -87,61 +92,59 @@ RDEPEND="${COMMON_DEPEND} |
| 107 |
x11-libs/pango[introspection] |
| 108 |
|
| 109 |
dbus? ( sys-apps/dbus ) |
| 110 |
- keyring? ( >=app-crypt/libsecret-0.14[introspection] ) |
| 111 |
+ libsecret? ( >=app-crypt/libsecret-0.14[introspection] ) |
| 112 |
webkit? ( |
| 113 |
- dev-python/mako |
| 114 |
+ dev-python/mako[${PYTHON_USEDEP}] |
| 115 |
>=net-libs/webkit-gtk-1.10:3[introspection] ) ) |
| 116 |
" |
| 117 |
-# gtk-doc-am needed for eautoreconf |
| 118 |
-# dev-util/gtk-doc-am |
| 119 |
DEPEND="${COMMON_DEPEND} |
| 120 |
virtual/pkgconfig |
| 121 |
app-text/yelp-tools |
| 122 |
+ dev-util/gtk-doc-am |
| 123 |
>=dev-util/intltool-0.35 |
| 124 |
>=app-text/gnome-doc-utils-0.9.1 |
| 125 |
- doc? ( >=dev-util/gtk-doc-1.4 ) |
| 126 |
- test? ( dev-libs/check )" |
| 127 |
-DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \ |
| 128 |
- MAINTAINERS MAINTAINERS.old NEWS README THANKS" |
| 129 |
+ test? ( dev-libs/check ) |
| 130 |
+" |
| 131 |
|
| 132 |
pkg_setup() { |
| 133 |
- if use python; then |
| 134 |
- python_set_active_version 2 |
| 135 |
- python_pkg_setup |
| 136 |
- G2CONF="${G2CONF} PYTHON=$(PYTHON -2)" |
| 137 |
- fi |
| 138 |
- |
| 139 |
- # --enable-vala just installs the sample vala plugin, and the configure |
| 140 |
- # checks are broken, so don't enable it |
| 141 |
- G2CONF="${G2CONF} |
| 142 |
- MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins |
| 143 |
- --enable-mmkeys |
| 144 |
- --disable-more-warnings |
| 145 |
- --disable-schemas-compile |
| 146 |
- --disable-static |
| 147 |
- --disable-vala |
| 148 |
- --without-hal |
| 149 |
- $(use_enable visualizer) |
| 150 |
- $(use_enable daap) |
| 151 |
- $(use_enable libnotify) |
| 152 |
- $(use_enable lirc) |
| 153 |
- $(use_enable nsplugin browser-plugin) |
| 154 |
- $(use_enable python) |
| 155 |
- $(use_enable upnp-av grilo) |
| 156 |
- $(use_with cdr brasero) |
| 157 |
- $(use_with daap) |
| 158 |
- $(use_with keyring libsecret) |
| 159 |
- $(use_with html webkit) |
| 160 |
- $(use_with ipod) |
| 161 |
- $(use_with mtp) |
| 162 |
- $(use_with udev gudev)" |
| 163 |
- |
| 164 |
- export GST_INSPECT=/bin/true |
| 165 |
+ use python && python-single-r1_pkg_setup |
| 166 |
} |
| 167 |
|
| 168 |
src_prepare() { |
| 169 |
+ DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \ |
| 170 |
+ MAINTAINERS MAINTAINERS.old NEWS README THANKS" |
| 171 |
+ |
| 172 |
+ rm -v lib/rb-marshal.{c,h} || die |
| 173 |
gnome2_src_prepare |
| 174 |
- echo > py-compile |
| 175 |
+} |
| 176 |
+ |
| 177 |
+src_configure() { |
| 178 |
+ # FIXME: bug??? |
| 179 |
+ export GST_INSPECT=/bin/true |
| 180 |
+ |
| 181 |
+ # --enable-vala just installs the sample vala plugin, and the configure |
| 182 |
+ # checks are broken, so don't enable it |
| 183 |
+ gnome2_src_configure \ |
| 184 |
+ MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \ |
| 185 |
+ VALAC=$(type -P valac-0.14) \ |
| 186 |
+ --enable-mmkeys \ |
| 187 |
+ --disable-more-warnings \ |
| 188 |
+ --disable-static \ |
| 189 |
+ --disable-vala \ |
| 190 |
+ --without-hal \ |
| 191 |
+ $(use_enable visualizer) \ |
| 192 |
+ $(use_enable daap) \ |
| 193 |
+ $(use_enable libnotify) \ |
| 194 |
+ $(use_enable lirc) \ |
| 195 |
+ $(use_enable nsplugin browser-plugin) \ |
| 196 |
+ $(use_enable python) \ |
| 197 |
+ $(use_enable upnp-av grilo) \ |
| 198 |
+ $(use_with cdr brasero) \ |
| 199 |
+ $(use_with html webkit) \ |
| 200 |
+ $(use_with ipod) \ |
| 201 |
+ $(use_with libsecret) \ |
| 202 |
+ $(use_with mtp) \ |
| 203 |
+ $(use_with udev gudev) |
| 204 |
} |
| 205 |
|
| 206 |
src_test() { |
| 207 |
@@ -149,21 +152,3 @@ src_test() { |
| 208 |
unset DBUS_SESSION_BUS_ADDRESS |
| 209 |
Xemake check || die "test failed" |
| 210 |
} |
| 211 |
- |
| 212 |
-pkg_postinst() { |
| 213 |
- gnome2_pkg_postinst |
| 214 |
- if use python; then |
| 215 |
- python_need_rebuild |
| 216 |
- python_mod_optimize /usr/$(get_libdir)/rhythmbox/plugins |
| 217 |
- fi |
| 218 |
- |
| 219 |
- ewarn |
| 220 |
- ewarn "If ${PN} doesn't play some music format, please check your" |
| 221 |
- ewarn "USE flags on media-plugins/gst-plugins-meta:1.0" |
| 222 |
- ewarn |
| 223 |
-} |
| 224 |
- |
| 225 |
-pkg_postrm() { |
| 226 |
- gnome2_pkg_postrm |
| 227 |
- python_mod_cleanup /usr/$(get_libdir)/rhythmbox/plugins |
| 228 |
-} |
Archives