gentoo auto-resync : 01:08:2022 - 15:15:48

3 files changed, 167 insertions, 4 deletions

diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 49dc62a25253..46dd0ca0afe3 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.5.tar.xz 1575260 BLAKE2B 9e26b3406114b1dd3257bcfd0850bf16385ac3eb2fcd89097e3a0464099b7c64eb4cf1f5cd7630a8387fd258b4b0bf8bc52f01c5da480e543bd11346995392c2 SHA512 265a9286ac943a41f78b587a93e8759ca87b49fcda5a7b34ce520d9e0aee8e6335a1219f46d1c3d9bd3f07be15913b5c4bc101daaa5e9e5b380703733c021a35
 DIST blueman-2.3.1.tar.xz 1606200 BLAKE2B 6f4528e827824884c763da81aff9642e442c3b8e465f9c2dfae9e63de409956e946ba3f939a64ae68f0d05df11e49927daab2af189e8605ccc5e4897ca8fb7ab SHA512 04adbb3eff4571cf105cad2769d7ad8e4055112a7e1b3c1152b300e72534621647cc6a0f284915cc2d3c642b8c1acf825c8c9a0227dbb617fa9071a534f0562c
+DIST blueman-2.3.2.tar.xz 1575412 BLAKE2B 25fbed432e103a46840dc10d73bce4e8e7a5e7ea623dbb3a50c420d166af7eb0eff046d0fd9986869055fbb4c3f8563920fb840f8f74f37a05b6680434f13dc5 SHA512 13760def19951bcb4582dbe142259256826a0f50e6c34e56c61c6f890f4e2e08085733f2480ad4c95ee52ec616cbb7ddd3a946634f042d80692cd37b57207cc0
 EBUILD blueman-2.2.5.ebuild 2950 BLAKE2B 8071f39d07ae5cdaadb1ad6816f59b1ba7edf44ba948c6e7023e9ff1dc1a9142599f8444e030d7ea2a6f9b09040d4183a80c03cb80f227e63efdeb6a51537a12 SHA512 f1944cae88a696507860c57208e13a1fb4c08c635136748d746cabd3b9779a5adb887db2d1df4e976e94ae0b474de05eecaca5c775d83c96e4a77218eaf75aad
 EBUILD blueman-2.3.1.ebuild 2867 BLAKE2B 5ebc07d899283a1f1edc790d84e3dec287e8985e6b812f62953cbc8187671b455a681603c66797a212111904a8b95614c27527e34a37a442449766c5c6761477 SHA512 5da4c9f67588ff4847c7efb52874c551dfaecc5cfb6c33ddd880c3aff13f3f0ca1f5a3acbf6426134e6cd944c786438ed6e327a7c46a1d2fecab8c55a3583889
-EBUILD blueman-9999.ebuild 2867 BLAKE2B 5ebc07d899283a1f1edc790d84e3dec287e8985e6b812f62953cbc8187671b455a681603c66797a212111904a8b95614c27527e34a37a442449766c5c6761477 SHA512 5da4c9f67588ff4847c7efb52874c551dfaecc5cfb6c33ddd880c3aff13f3f0ca1f5a3acbf6426134e6cd944c786438ed6e327a7c46a1d2fecab8c55a3583889
+EBUILD blueman-2.3.2.ebuild 3069 BLAKE2B 45c7b2dc10908899363bc411e962b91ba391b5132cd91f2a9674e6cd8938e0c2c32a23509a6eea69a9b11eca214d2f045419a0dc48529cdd4ee088ad778397fa SHA512 410774e3ab743a99229f13f2e3aef1065602a81953d6ab51558a502be156774209c2845d99fe740fd8d26f8a882720f63dae6614b6476553f2be2a718d515456
+EBUILD blueman-9999.ebuild 3069 BLAKE2B 45c7b2dc10908899363bc411e962b91ba391b5132cd91f2a9674e6cd8938e0c2c32a23509a6eea69a9b11eca214d2f045419a0dc48529cdd4ee088ad778397fa SHA512 410774e3ab743a99229f13f2e3aef1065602a81953d6ab51558a502be156774209c2845d99fe740fd8d26f8a882720f63dae6614b6476553f2be2a718d515456
 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817
diff --git a/net-wireless/blueman/blueman-2.3.2.ebuild b/net-wireless/blueman/blueman-2.3.2.ebuild
new file mode 100644
index 000000000000..453fb6b604da
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.3.2.ebuild
@@ -0,0 +1,151 @@
+# 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 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 autotools 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[introspection]
+		)
+	)
+	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_compile() {
+	default
+}
+
+python_test() {
+	# import tests are not very valuable and fail if /dev/rfkill
+	# does not exist
+	"${EPYTHON}" -m unittest -v test/test_gobject.py || die
+}
+
+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 dbedcfc7eae6..453fb6b604da 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -7,13 +7,13 @@ DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=no
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
+inherit 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
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
 else
 	SRC_URI="
@@ -64,7 +64,7 @@ RDEPEND="
 		|| (
 			net-dns/dnsmasq
 			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
+			>=net-misc/networkmanager-0.8[introspection]
 		)
 	)
 	policykit? (
@@ -118,6 +118,16 @@ python_configure() {
 	econf "${myconf[@]}"
 }
 
+python_compile() {
+	default
+}
+
+python_test() {
+	# import tests are not very valuable and fail if /dev/rfkill
+	# does not exist
+	"${EPYTHON}" -m unittest -v test/test_gobject.py || die
+}
+
 python_install() {
 	default