gentoo resync : 18.05.2019

3 files changed, 132 insertions, 7 deletions

diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 47e026f35b0c..e4c73e4b9555 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,6 +1,8 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.alpha3.tar.xz 977724 BLAKE2B a1b02956249c65bb9dc870f9585f917b17e99d570c2a3f05f505de9ea4ec004ff9ad5d88e958ec84566fdcf0f3fe6cf1965dcdc050241feedbd08fff98d18b22 SHA512 e2ad9aff87148e522705872829e9c4c78a1bfbe29e102b69b1f1f56348743343cb543eaac4c21e157aa579b76f023ca9164700a4a08848f55f17d025cead23a6
+DIST blueman-2.1.beta1.tar.xz 948440 BLAKE2B da1c6935b47b498d8fa2681c9672381bb6242f8fd752f28d2f2874dd4b602927044db1a291246dfd4c0931d934cc32b2516680cb963fec948fa9452d08d69671 SHA512 c7f04f6d65c9228660efc6e4d2e417eef8dd08f1f703a16270fc883f40be2b7d8f1d7e8728f3a0523b854bfef7fed18b58eb8cdae697d9890a76c220ee2b818b
 EBUILD blueman-2.1_alpha3-r1.ebuild 2777 BLAKE2B 70df84050526f06c2dd073c2b8ba1c78c1697265eb717ef386ce966242f35e960614688230fa95300a647f7d2c442cfb9ec5b606e6423781b48d1dc48a1fcd32 SHA512 3a706364e4fe49c0549ed4bbc1272d9162bc3adbbb229b55bb194e641cac09448ffb0bcec6b3e3033e16dba4fe0bb1919740028baac6a334aa7e25febf3bc988
 EBUILD blueman-2.1_alpha3.ebuild 2781 BLAKE2B 7b420137bcc1fad735b663528becccbb0cdd40002afb42b73b637875a1bb9afc8b5de8809b508202185fa578424f05acbf1ed77c82645a9648f39cd19e3949c2 SHA512 7331ed8531e9e027526ffcb5331a57912faadcaa949be4deda66f9e6647fc8fdee64989df9c9b7496ef2e7f482d7286a4af3945b671362084db95425fdc6ffe6
-EBUILD blueman-9999.ebuild 2754 BLAKE2B fca2da113cdc6804ab87a16530fe1b74faeca88245f4ca7de3bfd95d9ec173bccca2d1c48bf0ebf5ae0e611a7c348e7ad7ed92ab97fef37b32c88151197321d5 SHA512 2dfd76de8d90de7b26c10423b2841b37f47715c6df048e6ade812b452277d42a1dd4d58e93306576f65dacb1ca50dbd673cbc9073ee2311928b6cd2cfa1ac67f
+EBUILD blueman-2.1_beta1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
+EBUILD blueman-9999.ebuild 2757 BLAKE2B 30cb997a1c7473786e45728aa447c1c3b3329d8285033b26115bd29342b731201747ce80eb45004df82f5661fdc534c1ecb2ce37363ed5409500ad86bb604ed5 SHA512 02cb66900dddb5a3cecd25c24f20eef45daea1eae5f6fde4b44e17da5e795c530e6ed00c5a89a2ff7620409d152cccb752a6fef05668b8757e404e5ec04469e1
 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad
diff --git a/net-wireless/blueman/blueman-2.1_beta1.ebuild b/net-wireless/blueman/blueman-2.1_beta1.ebuild
new file mode 100644
index 000000000000..6f86023ac9c9
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.1_beta1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit 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 autotools git-r3
+	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~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"
+
+DEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=net-wireless/bluez-5:=
+	${PYTHON_DEPS}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	nls? ( dev-util/intltool sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	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[bluetooth] )
+	!net-wireless/gnome-bluetooth
+"
+
+S=${WORKDIR}/${P/_/.}
+
+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"
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--docdir=/usr/share/doc/${PF}
+		--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
+
+	rm "${D}"/$(python_get_sitedir)/*.la || 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 d7fc408394e5..685f3219bdb6 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit gnome2-utils linux-info python-single-r1 systemd
+inherit gnome2-utils linux-info python-single-r1 systemd xdg-utils
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
 HOMEPAGE="https://github.com/blueman-project/blueman"
@@ -18,7 +18,9 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
-LICENSE="GPL-3"
+# 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"
 
@@ -31,7 +33,6 @@ BDEPEND="
 	virtual/pkgconfig
 	nls? ( dev-util/intltool sys-devel/gettext )"
 RDEPEND="${DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	sys-apps/dbus
 	x11-libs/gtk+:3[introspection]
@@ -106,16 +107,15 @@ src_install() {
 		doins "${FILESDIR}/01-org.blueman.rules"
 	fi
 
-	python_fix_shebang "${D}"
 	rm "${D}"/$(python_get_sitedir)/*.la || die
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	gnome2_schemas_update
 }