gentoo resync : 31.01.2018

4 files changed, 131 insertions, 6 deletions

diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index ef8c1aa10a7f..2301df536e28 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,5 @@
 DIST rhythmbox-3.4.1.tar.xz 6914220 BLAKE2B f98aa43ca6929cf99bc5cfdcfcc8893e35610c04f1357579d64d3cd85cd66672dbfcb4a4a9a55ff6ae79ae54bc3034deff6a955b7bf59d7ff313de9a5747360c SHA512 b00034e9369222f64d5d9c5e246b99f5d738336d3faf2d303c444f84c316688871e0a09992e96012f38e2e90e8efc936ad231bed5057a5aaf31ee66963f59ae6
-EBUILD rhythmbox-3.4.1-r1.ebuild 3632 BLAKE2B d65e51c78483b78ce55b9c24b16a56f0a6522f2f1552728eabf8ec6a35de3b5feb94d3d38efe0727fe6455f768f45409b9f8ad780bbc46eb74470f42ff4ec82e SHA512 687930f1fafe1a50bf205dd8a1ff9469fb76a6c2462f07ae11d78c48bbe73838881f409f7fe4b7ab45b8866d733c277a0b3be5113c545bdff25418cc0b3d3ade
-MISC metadata.xml 771 BLAKE2B 04593464007c48b275fc9ee76a99f8ecbcf74a63e2442e583e472794e50e4733d9e62c4d8d8bcb0cc664161e4dc5eefb0379c74d1468de1b4ff560a4c78cb186 SHA512 b50f990bbbdd508a2592f1d52b95caa2e0d78d0b670f207e5520a26847efe51199f3242c1327e144a8b087954c1ac82289eb5ebff6d207b8edc7caf687ecbd23
+DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
+EBUILD rhythmbox-3.4.1-r1.ebuild 3584 BLAKE2B 766825621a5d0bcb6749bbd378b1493b79533db83e49e8f63eb8cd5e48764bfa9c3cddc344c265d64bc92e84c1d9f209ec8d502de26dacbd9f6ae3c0bc175494 SHA512 741e89664c0bc10270ccf396a225b24188eda89f92bdc21364fff2d8e7797e27bd70017a1c9fa57beff89ad9363a1cb8f4355198087d6364545822ec4460d1c6
+EBUILD rhythmbox-3.4.2.ebuild 3262 BLAKE2B e9a0d4ba35fc5276a785ed5cc25d50ee2aa6137d790621c35ee3e303486b348fcc609b17f6778492a6d81f0d39dd5bff683be5e1dd6a18094f079169063f2d66 SHA512 63cab69793e8f2a89aa4b41c84693ac06d5f6496f805d3d47f5757736d3fcffb11c76fc14b649d30596a7e48719df9a68b02debcc8499ca541e116a61a5aa076
+MISC metadata.xml 667 BLAKE2B 7c46e770537887cb18d74dec63531852f4df3dd278255776883aa44a99a05f0a2a590a2520595d5311132bc8494a048ac8bb56ef56a1ed2d02c422a54c1b3807 SHA512 b6835f5abe6ee0fac5854666a857a589e7ece955e1615f2adde7007f1b4077f0a11965175381654408ac40b09a4d14e0c707302f9026984cde239b8f183ab60d
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index 501e3717867c..ce05ec73eb5f 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -11,7 +11,6 @@
   </maintainer>
   <use>
     <flag name="daap">Build the local network music sharing plugin which uses the DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
-    <flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
     <flag name="visualizer">Enable support for visualizations using <pkg>media-plugins/gst-plugins-libvisual</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
index b01e8579f2db..2116f2b42d65 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 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 visualizer zeitgeist"
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av visualizer"
 REQUIRED_USE="
 	ipod? ( udev )
 	mtp? ( udev )
@@ -59,7 +59,6 @@ COMMON_DEPEND="
 		>=media-libs/clutter-gtk-1.0:1.0
 		>=x11-libs/mx-1.0.1:1.0
 		>=media-plugins/gst-plugins-libvisual-1.4:1.0 )
-	zeitgeist? ( gnome-extra/zeitgeist )
 "
 RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-soup:1.0
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
new file mode 100644
index 000000000000..a16e6276e7ab
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+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"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.7.8:2
+	>=x11-libs/gtk+-3.16: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
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		>=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? (
+		${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 ) )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
+		net-libs/libsoup:2.4[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
+	upnp-av? (
+		>=media-libs/grilo-0.3:0.3
+		>=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
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# --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 \
+		--disable-static \
+		--disable-vala \
+		--without-hal \
+		$(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) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with ipod) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	virtx emake check CK_DEFAULT_TIMEOUT=60
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+	gnome2_src_install
+}