gentoo auto-resync : 17:07:2022 - 20:32:17

4 files changed, 158 insertions, 16 deletions

diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 7934f8043e8e..1f1df1c23eda 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,7 +1,9 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.2.3.tar.xz 1587268 BLAKE2B b3a2d275904959437a47eec32b16f9ebd945bf49705d4f4752d9bfa40d7764b73d373225875773491432cf5b72319eba51a7206cccf10dcf6033a98f584a0504 SHA512 ccaf624bdea116c70b375ae62c1b477452207e8df0fa0941b0e80ac9fa9fbf760fa0bd0db1e7dc1e63f6010323c4b0bb228e315a0cb8f6a4283cd9da6cfa012b
 DIST blueman-2.2.5.tar.xz 1575260 BLAKE2B 9e26b3406114b1dd3257bcfd0850bf16385ac3eb2fcd89097e3a0464099b7c64eb4cf1f5cd7630a8387fd258b4b0bf8bc52f01c5da480e543bd11346995392c2 SHA512 265a9286ac943a41f78b587a93e8759ca87b49fcda5a7b34ce520d9e0aee8e6335a1219f46d1c3d9bd3f07be15913b5c4bc101daaa5e9e5b380703733c021a35
+DIST blueman-2.3.1.tar.xz 1606200 BLAKE2B 6f4528e827824884c763da81aff9642e442c3b8e465f9c2dfae9e63de409956e946ba3f939a64ae68f0d05df11e49927daab2af189e8605ccc5e4897ca8fb7ab SHA512 04adbb3eff4571cf105cad2769d7ad8e4055112a7e1b3c1152b300e72534621647cc6a0f284915cc2d3c642b8c1acf825c8c9a0227dbb617fa9071a534f0562c
 EBUILD blueman-2.2.3-r2.ebuild 2971 BLAKE2B 16fb956ccc94c0b06d25309c9d040fc68a50a8ef0d990fe04be85f0f168243e803ebde4336d94ca2e33b92dddfb1236daf30eec82089918fce849edd23c67051 SHA512 980bfa2a3f77434c310907615fba64a4a83f5d5b28079f8e8a3fe4a9b77b23b73df97228b1012fe87b0ed6af960d1f83ce2227dccdb424d16a000d48075d7b8b
-EBUILD blueman-2.2.5.ebuild 2956 BLAKE2B 9f42425773862dada62e095243b308a65f397e952357042bf5f63695b6fac80c727c2532bb36906ef37b74fc34e59689995c0e1e00450b9d95fee67a6c62da38 SHA512 ce5457a1ef67d34f5db4401593ef10094cf25cf8924130feca63be4e3b396a4c3158ecd1824c8b7b7fc571085203db5a6f165b2dba339e921916cac065f0d384
-EBUILD blueman-9999.ebuild 2956 BLAKE2B 9f42425773862dada62e095243b308a65f397e952357042bf5f63695b6fac80c727c2532bb36906ef37b74fc34e59689995c0e1e00450b9d95fee67a6c62da38 SHA512 ce5457a1ef67d34f5db4401593ef10094cf25cf8924130feca63be4e3b396a4c3158ecd1824c8b7b7fc571085203db5a6f165b2dba339e921916cac065f0d384
+EBUILD blueman-2.2.5.ebuild 2954 BLAKE2B 5b3c1e8624fe55138325970709bc4f8d19135bea90d4980ddb1a2f3ff2bb59ec33a65ed43d54ef46fb14d9cbf2778c85f6df91494ac6a76b52227abb1f66363b SHA512 f7024e1802d92968a6d281101745982ff430c045eb210e7713fa10a2459dc8c64db61714a6bd5547436c0882c78465efc45366b3e67a51b0cf35634462d4039e
+EBUILD blueman-2.3.1.ebuild 2867 BLAKE2B 5ebc07d899283a1f1edc790d84e3dec287e8985e6b812f62953cbc8187671b455a681603c66797a212111904a8b95614c27527e34a37a442449766c5c6761477 SHA512 5da4c9f67588ff4847c7efb52874c551dfaecc5cfb6c33ddd880c3aff13f3f0ca1f5a3acbf6426134e6cd944c786438ed6e327a7c46a1d2fecab8c55a3583889
+EBUILD blueman-9999.ebuild 2867 BLAKE2B 5ebc07d899283a1f1edc790d84e3dec287e8985e6b812f62953cbc8187671b455a681603c66797a212111904a8b95614c27527e34a37a442449766c5c6761477 SHA512 5da4c9f67588ff4847c7efb52874c551dfaecc5cfb6c33ddd880c3aff13f3f0ca1f5a3acbf6426134e6cd944c786438ed6e327a7c46a1d2fecab8c55a3583889
 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817
diff --git a/net-wireless/blueman/blueman-2.2.5.ebuild b/net-wireless/blueman/blueman-2.2.5.ebuild
index 14d5a18e335a..884b158be40b 100644
--- a/net-wireless/blueman/blueman-2.2.5.ebuild
+++ b/net-wireless/blueman/blueman-2.2.5.ebuild
@@ -18,7 +18,7 @@ else
 		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
 	"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 # icons are GPL-2
diff --git a/net-wireless/blueman/blueman-2.3.1.ebuild b/net-wireless/blueman/blueman-2.3.1.ebuild
new file mode 100644
index 000000000000..dbedcfc7eae6
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.3.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=no
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
+
+DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
+HOMEPAGE="https://github.com/blueman-project/blueman/"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
+else
+	SRC_URI="
+		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
+	"
+	S=${WORKDIR}/${P/_/.}
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+# icons are GPL-2
+# source files are mixed GPL-3+ and GPL-2+
+LICENSE="GPL-3+ GPL-2"
+SLOT="0"
+IUSE="network nls policykit pulseaudio"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	>=net-wireless/bluez-5:=
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	')
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/pycairo[${PYTHON_USEDEP}]
+	')
+	sys-apps/dbus
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	|| (
+		x11-themes/adwaita-icon-theme
+		x11-themes/faenza-icon-theme
+		x11-themes/mate-icon-theme
+	)
+	network? (
+		net-firewall/iptables
+		|| (
+			sys-apps/net-tools
+			sys-apps/iproute2
+		)
+		|| (
+			net-dns/dnsmasq
+			net-misc/dhcp
+			>=net-misc/networkmanager-0.8
+		)
+	)
+	policykit? (
+		sys-auth/polkit
+	)
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio-daemon[bluetooth]
+			media-video/pipewire[bluetooth]
+			<media-sound/pulseaudio-15.99.1[bluetooth]
+			media-sound/pulseaudio-modules-bt
+		)
+	)
+"
+
+pkg_pretend() {
+	if use network; then
+		local CONFIG_CHECK="
+			~BRIDGE
+			~IP_NF_IPTABLES
+			~IP_NF_NAT
+			~IP_NF_TARGET_MASQUERADE
+		"
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	[[ ${PV} == 9999 ]] && eautoreconf
+	distutils-r1_src_prepare
+}
+
+python_configure() {
+	local myconf=(
+		--disable-runtime-deps-check
+		--disable-static
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
+		$(use_enable policykit polkit)
+		$(use_enable nls)
+		$(use_enable pulseaudio)
+		# thunar integration is a single data file with no extra deps
+		# so install it unconditionally
+		--enable-thunar-sendto
+	)
+	econf "${myconf[@]}"
+}
+
+python_install() {
+	default
+
+	if use policykit; then
+		# Allow users in plugdev group to modify connections
+		insinto /usr/share/polkit-1/rules.d
+		doins "${FILESDIR}/01-org.blueman.rules"
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 14d5a18e335a..dbedcfc7eae6 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -3,9 +3,11 @@
 
 EAPI=8
 
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=no
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
+inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
 HOMEPAGE="https://github.com/blueman-project/blueman/"
@@ -25,22 +27,23 @@ fi
 # source files are mixed GPL-3+ and GPL-2+
 LICENSE="GPL-3+ GPL-2"
 SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="network nls policykit pulseaudio"
 
 DEPEND="
 	$(python_gen_cond_dep '
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
+"
 BDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/cython[${PYTHON_USEDEP}]
 	')
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${DEPEND}
 	$(python_gen_cond_dep '
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	')
@@ -52,9 +55,6 @@ RDEPEND="${DEPEND}
 		x11-themes/faenza-icon-theme
 		x11-themes/mate-icon-theme
 	)
-	appindicator? (
-		dev-libs/libappindicator:3[introspection]
-	)
 	network? (
 		net-firewall/iptables
 		|| (
@@ -97,18 +97,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
 	[[ ${PV} == 9999 ]] && eautoreconf
+	distutils-r1_src_prepare
 }
 
-src_configure() {
+python_configure() {
 	local myconf=(
 		--disable-runtime-deps-check
 		--disable-static
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-systemduserunitdir="$(systemd_get_userunitdir)"
 		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable appindicator)
 		$(use_enable policykit polkit)
 		$(use_enable nls)
 		$(use_enable pulseaudio)
@@ -119,7 +118,7 @@ src_configure() {
 	econf "${myconf[@]}"
 }
 
-src_install() {
+python_install() {
 	default
 
 	if use policykit; then