summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2022-07-20 21:37:24 -0400
committerMatt Turner <mattst88@gentoo.org>2022-07-20 21:58:27 -0400
commit54c9890abe3be77d4a9ff81ffa575fa9703e3d62 (patch)
treeed8c3cdd074fade58a317f6a56780dcccbf75df0 /media-sound/rhythmbox
parentmedia-plugins/gst-plugins-libnice: Drop old versions (diff)
downloadgentoo-54c9890abe3be77d4a9ff81ffa575fa9703e3d62.tar.gz
gentoo-54c9890abe3be77d4a9ff81ffa575fa9703e3d62.tar.bz2
gentoo-54c9890abe3be77d4a9ff81ffa575fa9703e3d62.zip
media-sound/rhythmbox: Drop old versions
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-sound/rhythmbox')
-rw-r--r--media-sound/rhythmbox/Manifest1
-rw-r--r--media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch169
-rw-r--r--media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch42
-rw-r--r--media-sound/rhythmbox/rhythmbox-3.4.5.ebuild142
4 files changed, 0 insertions, 354 deletions
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index f873a3a85d5f..d8d889ce68c8 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,2 @@
DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
-DIST rhythmbox-3.4.5.tar.xz 3537764 BLAKE2B fe710816d0c48f5eac6925d5d160f0db060a3369a98afb8b57bd746998e40d413e51e3f5d2631d28eccb5af9a5b71b511f2c42812fbfa88e2cfd46f16338cc78 SHA512 aa9451a5046a99ed4318a45de6e3df069e7646d83e27895608a1e66f664312d0c2b72c8bb9da902eeb1255ab3d2f15956f4891ff51c1ad28f572c9c020dcefb7
DIST rhythmbox-3.4.6.tar.xz 3535224 BLAKE2B 5e24facd810e72296ea541f8131b2ac364de0b38b0fd08a1fe6223a333e619cd08a3959fbbc6fbbd36a39990c7cc871decaefc316ce4910460aa6b446b3cb4c0 SHA512 d48818a6f299b3da8ae78bf13e41d702244d83a473586008b53f9c4cc504495ac2570c520c65efaf9e75408363b0256121d12680940c673d2977c7d177ef1fb3
diff --git a/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
deleted file mode 100644
index 294d2d2ef66f..000000000000
--- a/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From c9dfc5a5899d2628ba1dd6f93f46cf589669bd45 Mon Sep 17 00:00:00 2001
-From: Jonathan Matthew <jonathan@d14n.org>
-Date: Tue, 17 May 2022 08:18:21 +1000
-Subject: [PATCH] build: don't use feature.allowed() around dependency checks
-
-When the feature specified as the 'required' parameter to dependency()
-is disabled, it returns an empty dependency object, which is much easier
-to deal with than a dependency variable that's only conditionally
-defined.
-
-Fixes: #1972
----
- meson.build | 94 +++++++++++++++++++++--------------------------------
- 1 file changed, 37 insertions(+), 57 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 5792b0e49..de265901b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -70,71 +70,52 @@ tdb = dependency('tdb', version: '>= 1.2.6', required: true)
- totem_plparser = dependency('totem-plparser', version: '>= 3.2.0', required: true)
-
- use_gudev = false
--if get_option('gudev').allowed()
-- gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
-- if gudev.found()
-- use_gudev = true
-- cdata.set('HAVE_GUDEV', 1)
-- endif
-+gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
-+if gudev.found()
-+ use_gudev = true
-+ cdata.set('HAVE_GUDEV', 1)
- endif
-
- use_ipod = false
--if get_option('ipod').allowed()
-- libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
-- if libgpod.found()
-- use_ipod = true
-- endif
-+libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
-+if libgpod.found()
-+ use_ipod = true
- endif
-
- use_mtp = false
--if get_option('mtp').allowed()
-- libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
--
-- if libmtp.found()
-- if use_gudev
-- use_mtp = true
-- elif get_option('mtp').enabled()
-- error('MTP explicitly requested but GUdev is not available')
-- endif
-+libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
-+if libmtp.found()
-+ if use_gudev
-+ use_mtp = true
-+ elif get_option('mtp').enabled()
-+ error('MTP explicitly requested but GUdev is not available')
- endif
- endif
-
- use_notify = false
--if get_option('libnotify').allowed()
-- libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
--
-- if libnotify.found()
-- use_notify = true
-- endif
-+libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
-+if libnotify.found()
-+ use_notify = true
- endif
-
- use_libsecret = false
--if get_option('libsecret').allowed()
-- libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
--
-- if libsecret.found()
-- use_libsecret = true
-- endif
-+libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
-+if libsecret.found()
-+ use_libsecret = true
- endif
- cdata.set('PY_LIBSECRET_ENABLED', use_libsecret)
- cdata.set('WITH_LIBSECRET', use_libsecret)
-
- use_lirc = false
--if get_option('lirc').allowed()
-- lirc = dependency('lirc', required: get_option('lirc'))
--
-- if lirc.found()
-- use_lirc = true
-- endif
-+lirc = dependency('lirc', required: get_option('lirc'))
-+if lirc.found()
-+ use_lirc = true
- endif
-
- have_libbrasero_media = false
--if get_option('brasero').allowed()
-- brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
--
-- if brasero_media.found()
-- have_libbrasero_media = true
-- endif
-+brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
-+if brasero_media.found()
-+ have_libbrasero_media = true
- endif
-
- have_gnu_fwrite_unlocked = false
-@@ -189,16 +170,16 @@ cdata.set('PLUGINDATADIR', plugindatadir)
- cdata.set('SAMPLEPLUGINDIR', libdir / 'rhythmbox' / 'sample-plugins')
-
- enable_python = false
--if get_option('plugins_python').allowed()
-- python = find_program('python3', required: get_option('plugins_python'))
-- pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
-- pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
-+python = find_program('python3', required: get_option('plugins_python'))
-+pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
-+pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
-+if python.found() and pygobject.found()
- enable_python = true
- endif
-
- enable_vala = false
--if get_option('plugins_vala').allowed()
-- vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
-+vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
-+if vala_found
- enable_vala = true
- vapi_dir = meson.current_source_dir() / 'bindings' / 'vala'
- add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
-@@ -231,12 +212,9 @@ if get_option('daap').allowed()
- endif
-
- enable_grilo = false
--if get_option('grilo').allowed()
-- grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
--
-- if grilo.found()
-- enable_grilo = true
-- endif
-+grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
-+if grilo.found()
-+ enable_grilo = true
- endif
-
- enable_check = false
-@@ -279,7 +257,9 @@ summary({'iPod integration': use_ipod,
- 'Python plugin support': enable_python,
- 'Vala plugin support': enable_vala,
- 'Libsecret keyring support': use_libsecret,
-- 'FM radio support': enable_fm_radio,},
-+ 'FM radio support': enable_fm_radio,
-+ 'Grilo support': enable_grilo,
-+ },
- section: 'Plugins')
-
- configinc = include_directories('.')
---
-2.35.1
-
diff --git a/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch b/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch
deleted file mode 100644
index 2843a4c0cabc..000000000000
--- a/media-sound/rhythmbox/files/3.4.5-relax-meson-version-check.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/GNOME/rhythmbox/commit/29a1627f1683aac358103710ffc1a51791951edd
-https://bugs.gentoo.org/845006
---- a/meson.build
-+++ b/meson.build
-@@ -3,10 +3,6 @@ project('rhythmbox', 'c',
- meson_version: '>= 0.59.0',
- default_options: ['c_std=gnu89'])
-
--if meson.version().version_compare('> 0.62.0')
-- error('unsupported version of meson, please use 0.62')
--endif
--
- gnome = import('gnome')
- i18n = import('i18n')
- pkg = import('pkgconfig')
-GitLab
-From 0fe3a388fac73a5d4217aed510d65976850734c4 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 4 May 2022 10:23:16 +0200
-Subject: [PATCH 2/2] ci: Install latest meson
-
---- a/.gitlab-ci.yml
-+++ b/.gitlab-ci.yml
-@@ -4,8 +4,6 @@ stages:
- - test
-
- variables:
-- MESON_VER: 0.62.0
--
- UBUNTU_DEPS:
- build-essential
- desktop-file-utils
-@@ -64,7 +62,7 @@ before_script:
- - export DEBIAN_FRONTEND=noninteractive
- - apt-get update
- - apt-get install -y $UBUNTU_DEPS
-- - pip3 install meson==$MESON_VER
-+ - pip3 install meson
-
- test:
- stage: test
-GitLab
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
deleted file mode 100644
index d9e9ffb13091..000000000000
--- a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org gnome2-utils python-single-r1 meson virtualx xdg
-
-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 gtk-doc ipod libnotify lirc mtp +python test +udev upnp-av"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- ipod? ( udev )
- mtp? ( udev )
- dbus? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-DEPEND="
- x11-libs/cairo
- >=x11-libs/gdk-pixbuf-2.18:2
- >=dev-libs/glib-2.56.0:2
- >=dev-libs/gobject-introspection-0.10:=
- >=media-libs/gstreamer-1.4.0:1.0[introspection]
- >=media-libs/gst-plugins-base-1.4.0:1.0[introspection]
- >=x11-libs/gtk+-3.20.0:3[introspection]
- dev-libs/json-glib
- >=dev-libs/libpeas-0.7.3[gtk]
- >=net-libs/libsoup-2.42.0:2.4
- >=dev-libs/libxml2-2.7.8:2
- x11-libs/pango
- >=sys-libs/tdb-1.2.6
- >=dev-libs/totem-pl-parser-3.2
-
- 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}
- $(python_gen_cond_dep '
- >=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
- ')
- )
- udev? (
- dev-libs/libgudev:=
- ipod? ( >=media-libs/libgpod-0.7.92[udev] )
- mtp? ( >=media-libs/libmtp-0.3 )
- )
-"
-RDEPEND="${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_SINGLE_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]
- )
-"
-BDEPEND="
- gtk-doc? ( dev-util/gtk-doc )
- >=dev-util/intltool-0.35
- dev-util/itstool
- virtual/pkgconfig
- test? ( dev-libs/check )
-"
-
-PATCHES=(
- "${FILESDIR}/${PV}"-relax-meson-version-check.patch
- "${FILESDIR}/${PV}"-build-don-t-use-feature.allowed-around-dependency-ch.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature cdr brasero)
- $(meson_feature daap)
- -Dfm_radio=enabled
- $(meson_feature upnp-av grilo)
- $(meson_feature udev gudev)
- $(meson_feature ipod)
- $(meson_feature libnotify)
- $(meson_feature gnome-keyring libsecret)
- $(meson_feature lirc)
- $(meson_feature mtp)
- $(meson_feature python plugins_python)
- -Dplugins_vala=disabled
- -Dsample-plugins=false
-
- -Dhelp=true
- $(meson_use gtk-doc gtk_doc)
- $(meson_use test tests)
- )
- meson_src_configure
-}
-
-src_test() {
- unset SESSION_MANAGER
- "${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
- GSETTINGS_SCHEMA_DIR="${S}/data" virtx meson_src_test
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}