[gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/

2021-01-30 Thread Mart Raudsepp
commit: 19f83f669be6c7d4a30a9398e4b8b90750a444f3
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Jan 30 19:43:54 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jan 30 20:02:38 2021 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=19f83f66

media-sound/rhythmbox-: sync with main tree

Bug: https://bugs.gentoo.org/767559
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-sound/rhythmbox/rhythmbox-.ebuild | 22 +-
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/media-sound/rhythmbox/rhythmbox-.ebuild 
b/media-sound/rhythmbox/rhythmbox-.ebuild
index 02d97a9e..f3ca7b58 100644
--- a/media-sound/rhythmbox/rhythmbox-.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome2 python-single-r1 multilib virtualx
@@ -17,7 +17,8 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox;
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python 
test +udev upnp-av"
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp +python test +udev 
upnp-av"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
ipod? ( udev )
mtp? ( udev )
@@ -29,7 +30,6 @@ if [[ ${PV} !=  ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-# FIXME: double check what to do with fm-radio plugin
 COMMON_DEPEND="
>=dev-libs/glib-2.38:2
>=dev-libs/libxml2-2.7.8:2
@@ -53,10 +53,12 @@ COMMON_DEPEND="
lirc? ( app-misc/lirc )
python? (
${PYTHON_DEPS}
-   >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
+   ')
)
udev? (
-   virtual/libgudev:=
+   dev-libs/libgudev:=
ipod? ( >=media-libs/libgpod-0.7.92[udev] )
mtp? ( >=media-libs/libmtp-0.3 ) )
 "
@@ -70,7 +72,7 @@ RDEPEND="${COMMON_DEPEND}
media-plugins/gst-plugins-taglib:1.0
x11-themes/adwaita-icon-theme
python? (
-   >=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
+   >=dev-libs/libpeas-0.7.3[python,${PYTHON_SINGLE_USEDEP}]
net-libs/libsoup:2.4[introspection]
x11-libs/gdk-pixbuf:2[introspection]
x11-libs/gtk+:3[introspection]
@@ -83,7 +85,6 @@ RDEPEND="${COMMON_DEPEND}
>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
 "
 DEPEND="${COMMON_DEPEND}
-   app-text/yelp-tools
dev-util/gtk-doc-am
>=dev-util/intltool-0.35
dev-util/itstool
@@ -97,13 +98,9 @@ pkg_setup() {
 }
 
 src_configure() {
-   # FIXME: bug???
-   export GST_INSPECT=/bin/true
-
# --enable-vala just installs the sample vala plugin, and the configure
# checks are broken, so don't enable it
gnome2_src_configure \
-   MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
VALAC=$(type -P true) \
--enable-mmkeys \
--disable-more-warnings \
@@ -112,7 +109,6 @@ src_configure() {
$(use_enable daap) \
$(use_enable libnotify) \
$(use_enable lirc) \
-   $(use_enable nsplugin browser-plugin) \
$(use_enable python) \
$(use_enable upnp-av grilo) \
$(use_with cdr brasero) \



[gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/

2019-03-22 Thread Mart Raudsepp
commit: 88aa159e921c569f999ffa76d43d84db35e034b1
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Mar 22 10:06:48 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Mar 22 10:07:08 2019 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=88aa159e

media-sound/rhythmbox-: blind sync

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 media-sound/rhythmbox/metadata.xml  |   6 +-
 media-sound/rhythmbox/rhythmbox-.ebuild | 113 
 2 files changed, 48 insertions(+), 71 deletions(-)

diff --git a/media-sound/rhythmbox/metadata.xml 
b/media-sound/rhythmbox/metadata.xml
index 011552ed..c87a0ebc 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -10,10 +10,6 @@
   GStreamer package maintainers
   
   
-   Build the local network music sharing plugin which 
uses the DAAP protocol using net-libs/libdmapsharing
-   Use net-libs/webkit-gtk for detecting and 
displaying HTML podcast episode descriptions.
-   Enable libsecret support to store login 
credentials
-   Build the plugin to inject events to 
gnome-extra/zeitgeist
-   Enable support for visualizations using 
media-plugins/gst-plugins-libvisual
+Build the local network music sharing plugin which uses 
the DAAP protocol using net-libs/libdmapsharing
   
 

diff --git a/media-sound/rhythmbox/rhythmbox-.ebuild 
b/media-sound/rhythmbox/rhythmbox-.ebuild
index 27c7fa2c..02d97a9e 100644
--- a/media-sound/rhythmbox/rhythmbox-.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
+EAPI=6
 GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python3_{3,4} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE="xml"
 
-inherit eutils gnome2 python-r1 multilib virtualx
+inherit eutils gnome2 python-single-r1 multilib virtualx
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi
@@ -18,59 +16,49 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox;
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cdr daap dbus +libsecret html ipod libnotify lirc mtp nsplugin +python
-test +udev upnp-av visualizer webkit zeitgeist"
-
-if [[ ${PV} =  ]]; then
-   KEYWORDS=""
-else
-   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
 
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python 
test +udev upnp-av"
 REQUIRED_USE="
ipod? ( udev )
mtp? ( udev )
dbus? ( python )
-   webkit? ( python )
-   python? ( ^^ ( $(python_gen_useflags '*') ) )
+   python? ( ${PYTHON_REQUIRED_USE} )
 "
 
+if [[ ${PV} !=  ]]; then
+   KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
 # FIXME: double check what to do with fm-radio plugin
-# webkit-gtk-1.10 is needed because it uses gstreamer-1.0
 COMMON_DEPEND="
-   >=dev-libs/glib-2.34.0:2
+   >=dev-libs/glib-2.38:2
>=dev-libs/libxml2-2.7.8:2
-   >=x11-libs/gtk+-3.6:3[introspection]
-   >=x11-libs/gdk-pixbuf-2.18.0:2
-   >=dev-libs/gobject-introspection-0.10.0
-   >=dev-libs/libpeas-0.7.3[gtk,python?]
-   >=dev-libs/totem-pl-parser-3.2.0
-   >=net-libs/libsoup-2.34:2.4
-   media-libs/gst-plugins-base:1.0[introspection]
-   media-libs/gstreamer:1.0[introspection]
+   >=x11-libs/gtk+-3.20.0:3[X,introspection]
+   >=x11-libs/gdk-pixbuf-2.18:2
+   >=dev-libs/gobject-introspection-0.10:=
+   >=dev-libs/libpeas-0.7.3[gtk]
+   >=dev-libs/totem-pl-parser-3.2
+   >=net-libs/libsoup-2.42:2.4
+   >=media-libs/gst-plugins-base-1.4:1.0[introspection]
+   >=media-libs/gstreamer-1.4:1.0[introspection]
>=sys-libs/tdb-1.2.6
dev-libs/json-glib
 
-   visualizer? (
-   >=media-libs/clutter-1.8:1.0
-   >=media-libs/clutter-gst-1.9.92:2.0
-   >=media-libs/clutter-gtk-1.0:1.0
-   >=x11-libs/mx-1.0.1:1.0
-   media-plugins/gst-plugins-libvisual:1.0 )
cdr? ( >=app-cdr/brasero-2.91.90 )
daap? (
>=net-libs/libdmapsharing-2.9.19:3.0
-   media-plugins/gst-plugins-soup:1.0 )
-   libsecret? ( >=app-crypt/libsecret-0.18 )
-   html? ( >=net-libs/webkit-gtk-1.10:3 )
+   >=media-plugins/gst-plugins-soup-1.4:1.0 )
+   gnome-keyring? ( >=app-crypt/libsecret-0.18 )
libnotify? ( >=x11-libs/libnotify-0.7.0 )
lirc? ( app-misc/lirc )
-   python? ( >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] )
+   python? (
+   ${PYTHON_DEPS}
+   >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+   )
udev? (
virtual/libgudev:=
ipod? ( >=media-libs/libgpod-0.7.92[udev] )
mtp? ( >=media-libs/libmtp-0.3 ) )

[gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/

2014-12-01 Thread Michał Górny
commit: 502b10432986261f403ab0d01ccf8d282d615f2c
Author: Michał Górny mgorny AT gentoo DOT org
AuthorDate: Mon Dec  1 14:09:22 2014 +
Commit: Michał Górny mgorny AT gentoo DOT org
CommitDate: Mon Dec  1 14:09:22 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=502b1043

media-sound/rhythmbox: use python-r1 to avoid issues

Use python-r1 to avoid issues with python-single-r1 and libpeas REQUIRED_USE.
Enforce proper USE dependency on libpeas.

Package-Manager: portage-2.2.14
Manifest-Sign-Key: EFB4464E!

---
 media-sound/rhythmbox/rhythmbox-.ebuild | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/media-sound/rhythmbox/rhythmbox-.ebuild 
b/media-sound/rhythmbox/rhythmbox-.ebuild
index 26c1d77..45ce3c2 100644
--- a/media-sound/rhythmbox/rhythmbox-.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-.ebuild
@@ -5,10 +5,10 @@
 EAPI=5
 GNOME2_LA_PUNT=yes
 GCONF_DEBUG=no
-PYTHON_COMPAT=( python3_{2,3} )
+PYTHON_COMPAT=( python3_{3,4} )
 PYTHON_REQ_USE=xml
 
-inherit eutils gnome2 python-single-r1 multilib virtualx
+inherit eutils gnome2 python-r1 multilib virtualx
 if [[ ${PV} =  ]]; then
inherit gnome2-live
 fi
@@ -21,9 +21,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_2 +python_single_target_python3_3
-
 if [[ ${PV} =  ]]; then
KEYWORDS=
 else
@@ -35,7 +32,7 @@ REQUIRED_USE=
mtp? ( udev )
dbus? ( python )
webkit? ( python )
-   python? ( ${PYTHON_REQUIRED_USE} )
+   python? ( ^^ ( $(python_gen_useflags '*') ) )
 
 
 # FIXME: double check what to do with fm-radio plugin
@@ -88,6 +85,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]
@@ -108,7 +106,7 @@ DEPEND=${COMMON_DEPEND}
 
 
 pkg_setup() {
-   use python  python-single-r1_pkg_setup
+   use python  [[ ${MERGE_TYPE} != binary ]]  python_setup
 }
 
 src_prepare() {



[gentoo-commits] proj/gnome:master commit in: media-sound/rhythmbox/

2014-10-25 Thread Gilles Dartiguelongue
commit: 2e8aee675f738af3848ff8ba8aa9182d575a099b
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sat Oct 25 20:39:10 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sat Oct 25 20:39:10 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2e8aee67

media-sound/rhythmbox: sync with gentoo-x86

---
 media-sound/rhythmbox/rhythmbox-.ebuild | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-sound/rhythmbox/rhythmbox-.ebuild 
b/media-sound/rhythmbox/rhythmbox-.ebuild
index 4ac23d7..26c1d77 100644
--- a/media-sound/rhythmbox/rhythmbox-.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,13 +14,14 @@ if [[ ${PV} =  ]]; then
 fi
 
 DESCRIPTION=Music management and playback software for GNOME
-HOMEPAGE=http://www.rhythmbox.org/;
+HOMEPAGE=https://wiki.gnome.org/Apps/Rhythmbox;
 
 LICENSE=GPL-2
 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_2 +python_single_target_python3_3
 
 if [[ ${PV} =  ]]; then
@@ -63,13 +64,13 @@ COMMON_DEPEND=
daap? (
=net-libs/libdmapsharing-2.9.19:3.0
media-plugins/gst-plugins-soup:1.0 )
-   libsecret? ( =app-crypt/libsecret-0.14 )
+   libsecret? ( =app-crypt/libsecret-0.18 )
html? ( =net-libs/webkit-gtk-1.10:3 )
libnotify? ( =x11-libs/libnotify-0.7.0 )
lirc? ( app-misc/lirc )
python? ( =dev-python/pygobject-3.0:3[${PYTHON_USEDEP}] )
udev? (
-   virtual/udev[gudev]
+   virtual/libgudev:=
ipod? ( =media-libs/libgpod-0.7.92[udev] )
mtp? ( =media-libs/libmtp-0.3 ) )
zeitgeist? ( gnome-extra/zeitgeist )
@@ -92,7 +93,7 @@ RDEPEND=${COMMON_DEPEND}
x11-libs/pango[introspection]
 
dbus? ( sys-apps/dbus )
-   libsecret? ( =app-crypt/libsecret-0.14[introspection] )
+   libsecret? ( =app-crypt/libsecret-0.18[introspection] )
webkit? (
dev-python/mako[${PYTHON_USEDEP}]
=net-libs/webkit-gtk-1.10:3[introspection] ) )
@@ -114,7 +115,9 @@ src_prepare() {
DOCS=AUTHORS ChangeLog DOCUMENTERS INTERNALS \
MAINTAINERS MAINTAINERS.old NEWS README THANKS
 
+   # upstream bug 737831
rm -v lib/rb-marshal.{c,h} || die
+
gnome2_src_prepare
 }
 
@@ -150,5 +153,5 @@ src_configure() {
 src_test() {
unset SESSION_MANAGER
unset DBUS_SESSION_BUS_ADDRESS
-   Xemake check || die test failed
+   Xemake check
 }