gentoo resync : 29.12.2022

3 files changed, 167 insertions, 14 deletions

diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 977e7f4d6f3e..7934f8043e8e 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,7 @@
 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
 EBUILD blueman-2.2.3-r2.ebuild 2971 BLAKE2B 16fb956ccc94c0b06d25309c9d040fc68a50a8ef0d990fe04be85f0f168243e803ebde4336d94ca2e33b92dddfb1236daf30eec82089918fce849edd23c67051 SHA512 980bfa2a3f77434c310907615fba64a4a83f5d5b28079f8e8a3fe4a9b77b23b73df97228b1012fe87b0ed6af960d1f83ce2227dccdb424d16a000d48075d7b8b
-EBUILD blueman-9999.ebuild 2970 BLAKE2B f3b366b000991df89f191c290c55ea3817f765d0c92df63b65813f0a1891cb3a9eec2d37af40e6ff3b53dba4083db9d4977da9c2a869a786219800d2cc791214 SHA512 3dc045260205dddfa04f54379386956b1f17659ec4670b8d3f1690e2c6546a695ef63455edf34088a9c0e2b61b3b2e9b7de95c58822af638470bc1e30a047e58
+EBUILD blueman-2.2.5.ebuild 2956 BLAKE2B 9f42425773862dada62e095243b308a65f397e952357042bf5f63695b6fac80c727c2532bb36906ef37b74fc34e59689995c0e1e00450b9d95fee67a6c62da38 SHA512 ce5457a1ef67d34f5db4401593ef10094cf25cf8924130feca63be4e3b396a4c3158ecd1824c8b7b7fc571085203db5a6f165b2dba339e921916cac065f0d384
+EBUILD blueman-9999.ebuild 2956 BLAKE2B 9f42425773862dada62e095243b308a65f397e952357042bf5f63695b6fac80c727c2532bb36906ef37b74fc34e59689995c0e1e00450b9d95fee67a6c62da38 SHA512 ce5457a1ef67d34f5db4401593ef10094cf25cf8924130feca63be4e3b396a4c3158ecd1824c8b7b7fc571085203db5a6f165b2dba339e921916cac065f0d384
 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
new file mode 100644
index 000000000000..14d5a18e335a
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.2.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools gnome2-utils linux-info python-single-r1 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="appindicator network nls policykit pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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}
+	$(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
+	)
+	appindicator? (
+		dev-libs/libappindicator:3[introspection]
+	)
+	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() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_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)
+		# thunar integration is a single data file with no extra deps
+		# so install it unconditionally
+		--enable-thunar-sendto
+	)
+	econf "${myconf[@]}"
+}
+
+src_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 090a7032ac19..14d5a18e335a 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
 
-PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
+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/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
+	SRC_URI="
+		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
+	"
 	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 # icons are GPL-2
@@ -23,6 +26,7 @@ fi
 LICENSE="GPL-3+ GPL-2"
 SLOT="0"
 IUSE="appindicator network nls policykit pulseaudio"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="
 	$(python_gen_cond_dep '
@@ -48,7 +52,9 @@ RDEPEND="${DEPEND}
 		x11-themes/faenza-icon-theme
 		x11-themes/mate-icon-theme
 	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	appindicator? (
+		dev-libs/libappindicator:3[introspection]
+	)
 	network? (
 		net-firewall/iptables
 		|| (
@@ -61,7 +67,9 @@ RDEPEND="${DEPEND}
 			>=net-misc/networkmanager-0.8
 		)
 	)
-	policykit? ( sys-auth/polkit )
+	policykit? (
+		sys-auth/polkit
+	)
 	pulseaudio? (
 		|| (
 			media-sound/pulseaudio-daemon[bluetooth]
@@ -72,12 +80,14 @@ RDEPEND="${DEPEND}
 	)
 "
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 pkg_pretend() {
 	if use network; then
-		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
-			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
+		local CONFIG_CHECK="
+			~BRIDGE
+			~IP_NF_IPTABLES
+			~IP_NF_NAT
+			~IP_NF_TARGET_MASQUERADE
+		"
 		check_extra_config
 	fi
 }
@@ -88,8 +98,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	# replace py-compile to fix py3
-	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
+	[[ ${PV} == 9999 ]] && eautoreconf
 }
 
 src_configure() {