gentoo resync : 28.04.2019

4 files changed, 137 insertions, 13 deletions

diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index b51285e8a51c..47e026f35b0c 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,5 +1,6 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 DIST blueman-2.1.alpha3.tar.xz 977724 BLAKE2B a1b02956249c65bb9dc870f9585f917b17e99d570c2a3f05f505de9ea4ec004ff9ad5d88e958ec84566fdcf0f3fe6cf1965dcdc050241feedbd08fff98d18b22 SHA512 e2ad9aff87148e522705872829e9c4c78a1bfbe29e102b69b1f1f56348743343cb543eaac4c21e157aa579b76f023ca9164700a4a08848f55f17d025cead23a6
-EBUILD blueman-2.1_alpha3.ebuild 2785 BLAKE2B 8a35b7340dfeb9674e85779a5a5a889530b42a878a3c566717bb9502df1bc6eb947eaa38b2e25d6c1b3e3ad179030eb860b90a2972d9b8c70ea7e3b778da7f44 SHA512 085da03a8375815c0e6085e9799c71d0066e2de0afb36dd4f5e79eaee2e3f63c6120538594742cd4c269bfab843c2c96e84b7799014e51a7d98d788fb1b2ad95
-EBUILD blueman-9999.ebuild 2754 BLAKE2B 8fc46c72adbe3b42c2a470fc008d9f9c1c8d768eb282044ee75536aee8dc33336bde23dec439cf24f4d7f46dd43a6d3dce61cb83f4d058b439f8eae3fc0ec23e SHA512 a95f90357111e98aa0bea3674404192bd713d051441aaa725d60d090bb3eb0c399bba4dd867c724946821946ffd2240fe37b62b203d47d35befab499ac8d1e94
+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
 MISC metadata.xml 688 BLAKE2B 60db2d7f9a0b7a9cb49845de2720dd1ef20fe18b3c85a0b95387aa8b3e801aa9edc2ab0e66b69c2d27ca148d1358ae347ceb81cc5a94def15fe7b7966424f35b SHA512 372797b89a2f56312d68bd0719af15c273fdb15a90172d2752ea22f5404d3e054075fd5d1edb08b280d842dcee6b52e2cdf5b18b296b230b6e4a76d4c6fe0bad
diff --git a/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild b/net-wireless/blueman/blueman-2.1_alpha3-r1.ebuild
new file mode 100644
index 000000000000..80488b8450b1
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.1_alpha3-r1.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
+
+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
+
+LICENSE="GPL-3"
+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/dbus-python[${PYTHON_USEDEP}]
+	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
+
+	python_fix_shebang "${D}"
+	rm "${D}"/$(python_get_sitedir)/*.la || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-wireless/blueman/blueman-2.1_alpha3.ebuild b/net-wireless/blueman/blueman-2.1_alpha3.ebuild
index 9862609801e7..faa16e7c5d55 100644
--- a/net-wireless/blueman/blueman-2.1_alpha3.ebuild
+++ b/net-wireless/blueman/blueman-2.1_alpha3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 inherit gnome2-utils linux-info python-single-r1 systemd
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index c05adb445a66..d7fc408394e5 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit gnome2-utils linux-info python-single-r1 systemd
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 fi
 
@@ -22,15 +22,15 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="appindicator network nls policykit pulseaudio"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=net-wireless/bluez-5:=
 	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	sys-apps/dbus
@@ -65,12 +65,11 @@ pkg_pretend() {
 	if use network; then
 		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
 			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
-		linux-info_pkg_setup
+		check_extra_config
 	fi
 }
 
 pkg_setup() {
-	pkg_pretend
 	python-single-r1_pkg_setup
 }
 
@@ -86,6 +85,7 @@ src_configure() {
 		--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)