diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2022-03-20 17:25:20 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2022-03-20 17:53:31 -0700 |
| commit | 0198dd66895d051654c0935e3dd484bd06b9890a (patch) | |
| tree | 95f3e8e96c5e707afce9c81affd86500f8afb69a /net-wireless/gnome-bluetooth | |
| parent | net-nds/openldap: make src_test run parallel tests (diff) | |
| download | gentoo-0198dd66895d051654c0935e3dd484bd06b9890a.tar.gz gentoo-0198dd66895d051654c0935e3dd484bd06b9890a.tar.bz2 gentoo-0198dd66895d051654c0935e3dd484bd06b9890a.zip | |
net-wireless/gnome-bluetooth: Resolve file conflicts
The udev rules are included in systemd-250. See
https://github.com/systemd/systemd/pull/21605
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'net-wireless/gnome-bluetooth')
| -rw-r--r-- | net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild (renamed from net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r1.ebuild) | 16 | ||||
| -rw-r--r-- | net-wireless/gnome-bluetooth/metadata.xml | 3 |
2 files changed, 7 insertions, 12 deletions
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r1.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild index cdca419d67c0..7b73eda902ca 100644 --- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r1.ebuild +++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild @@ -3,14 +3,14 @@ EAPI=7 PYTHON_COMPAT=( python3_{8..10} ) -inherit gnome.org meson python-any-r1 udev xdg +inherit gnome.org meson python-any-r1 xdg DESCRIPTION="Bluetooth graphical utilities integrated with GNOME" HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth" LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version -IUSE="gtk-doc +introspection test" +IUSE="gtk-doc +introspection sendto test" RESTRICT="!test? ( test )" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" @@ -28,6 +28,7 @@ RDEPEND="${DEPEND} acct-group/plugdev virtual/udev >=net-wireless/bluez-5 + sendto? ( !net-wireless/gnome-bluetooth:2 ) " BDEPEND=" dev-libs/libxml2:2 @@ -56,22 +57,13 @@ pkg_setup() { src_configure() { local emesonargs=( - -Dsendto=true + $(meson_use sendto) $(meson_use gtk-doc gtk_doc) $(meson_use introspection) ) meson_src_configure } -src_install() { - meson_src_install - udev_dorules "${FILESDIR}"/61-${PN}.rules -} - pkg_postinst() { xdg_pkg_postinst - if ! has_version 'sys-apps/systemd[acl]' ; then - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to control bluetooth transmitter." - fi } diff --git a/net-wireless/gnome-bluetooth/metadata.xml b/net-wireless/gnome-bluetooth/metadata.xml index 7b343b06be8a..11abdacb27d2 100644 --- a/net-wireless/gnome-bluetooth/metadata.xml +++ b/net-wireless/gnome-bluetooth/metadata.xml @@ -5,4 +5,7 @@ <email>gnome@gentoo.org</email> <name>Gentoo GNOME Desktop</name> </maintainer> +<use> + <flag name="sendto">Build the bluetooth-sendto application to send files to various locations/devices</flag> +</use> </pkgmetadata> |