gentoo resync : 09.12.2017

3 files changed, 8 insertions, 122 deletions

diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 929a74f30c41..ff00411d33d6 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,10 +1,8 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
 AUX blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch 8045 BLAKE2B 06877bed35a6917b2a2c79f360e9e45db815a01a0fc544582bd06307aa9a573f2437743000916cde864f846840649e6a91ff0a8b26ad97113801aeed16c5fbab SHA512 b06158f9a0958b22575600de700976f6e6bd68d703a8cfaa062a4be0f4c4a76dc1d2a5257f5ebc431b17e1b5bcdc0220260023558d4c850d2a45746887e3f651
-DIST blueman-2.0.3.tar.xz 1942832 SHA256 243605e4401c2d21f4706965ef100dac907658d480ace37cbdf863c1c8a45825 SHA512 aaa6bad3321102b09f1cf69f0a3bc7d848bb6674821aa3cb6848243efcd1c1a2b37e20118bf8368b22e32ed1066b57ff187d3a672f2e41122c82d6526bfc888a WHIRLPOOL 0e5ede56e64287e7d500a1836a3eea21efd4f6b1dedd9c5376179309279ecd3d7e84e622c2d167ec5eadc1801c83303c0f2a3988f9eca3422302344414e348d9
 DIST blueman-2.0.4.tar.xz 1951988 SHA256 e92dd9c27f75a1485b548f7a8b159946a4af154b90fb82f5a0f614b66a01430f SHA512 98dbe0ac706cf8d33ada6e520c0952fbb930aaa4ec62e35e989f60880287634c2ee947a47b4883063a0aabf27069210774432416278b190b1ca5e1c93d42f614 WHIRLPOOL 13bc27b281b0d17610ac974b46b6d4a290276aa3c8238e6768b763f998ec1bd34af4aa4ea199307ff2d50d4b886e1ea2931a6be6795e68e390d7df7548c48fc8
-DIST blueman-2.1.alpha1.tar.xz 1958092 SHA256 df48a28e68117065c00215b6a1060467c80f0cb5ddc2989ea4818c9e78d62909 SHA512 a9180e2cd9596c4e0bde497b0ddf62514dc232d944433f4ae365bc0249a2dd0524bdc9907fbffe604fcb7479fd7b504f304e53688cc552cf7c9184b94413784c WHIRLPOOL 2dc349e6f91db30f5d0c90dec5fdb5dfdcecaacfc2db6ea000726f17b52a01fd6813794cb83588e874eb15b542c8f2404aeb51e1deb97a31419f97750b55190b
-EBUILD blueman-2.0.3.ebuild 2678 BLAKE2B 3a00cf747ac9af382409e3851b709ad0cda15ac78e21c748122437f7e5cd068ba22a5eaa3fedba3b36c8ffebca243fd2b52fff2bd5c66cf7560425df70a17d37 SHA512 ce49cd6bae3593ff928d14c6b4c46ea55019cc42a6a95661b0f636dff2aca2d77a6b545d0f4ef481e3654988a8cc7b089f8ce266727703cd7cc0bb3ab07c70aa
+DIST blueman-2.1.alpha2.tar.xz 977344 BLAKE2B c5d3d0a96c1220596647ade310263342cdaaeef511a2fb36973d182025330a29b41fb805ce54e10a2f48c1c66312006858789233f8f0a93923952bb03ac32b19 SHA512 bde4922a93087d07fd99b165255ded8d9465866e62662f644beaafe363d5618a107abbd9d951cfbd034b02b6ece11fb8117efdd5d453632e4a2fea13d3825643
 EBUILD blueman-2.0.4.ebuild 2662 BLAKE2B c23bbad69c1e88f20c091f737f00805f0f5fe52a79bd4096b10c0042e506ca2387851b1371ca66ba7de6525281939bfc4ee8ed22488baeb06568c478de473cde SHA512 ca883b27311ad51dc851a9379827f7ef074793f8801cbc1fde5e9c606f1049425a5e58366a7a1746451b194bb9c8ce670f6862d32047847e9b48c81b460606ac
-EBUILD blueman-2.1_alpha1.ebuild 2744 BLAKE2B caa5a3eae64338b3b8e4a6eff257317e37bcebbdb4ff241d5ca373243352a8444d1af43e97c5aef076d6e5604650c8b8b5d5d3952b0c4f67c3349e8a7f084128 SHA512 4262c87ee783fc95708eb49b8693a9c209d19db9e95a7ed7b819a6530643f83398fc5f566e0da243f797979c6eccfc3f4f5480d27fcaf00999f4aaa64b9810ca
+EBUILD blueman-2.1_alpha2.ebuild 2825 BLAKE2B 0c602df13a0bdf163663e07594cbc3c000eeab6272f4171150696672b63075e11e5a2b234d163e12f1fc9cbd6e6ddfed2ff4d561632244abe9f8ee884c20bdf8 SHA512 37f4607a84050867421f59d607317a0a177eb7ebf0bd78aa18e2b7f4764e2020d5ee5ecde216e24e079d1638e748e35cf639095f5d33f88052db65968af1345e
 EBUILD blueman-9999.ebuild 2794 BLAKE2B ae5b461f2496c980a1c8f5e7402ce1ed78938e87ab319e55c246f9e98bb207ecfeaa2aa7005842462afeb95568b9a32b34fedd6067c04baf2e9e40c92031c3ec SHA512 644085c9c9165d8a20a5c58c0da9cf8943dfebbf9fa549bc7949c43dfa7a9ebfa349fae619b13a0219f4c8fc1b145114328763c6d25662b0d4f4c174de484bb2
 MISC metadata.xml 775 BLAKE2B edd608622fe3e3f6a4a4be3e48081979ba90e418ece982d4da28daa4341c0f39709f44e9364e7d4d03a167fb9ba220d8f6888518ad8f3c3b6942ccab87ff6b95 SHA512 6b1a54f98af6d7efdcc5b8a6a6ff8dd0ae0c2ecf515292ec1fc2f02119e3478b5dcdec3adda6363d9dba52d98977e1d37066c34a9762529fd5d3ac92ac791b5f
diff --git a/net-wireless/blueman/blueman-2.0.3.ebuild b/net-wireless/blueman/blueman-2.0.3.ebuild
deleted file mode 100644
index 438f77190f56..000000000000
--- a/net-wireless/blueman/blueman-2.0.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2-utils linux-info python-single-r1
-
-DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks"
-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 thunar"
-
-COMMON_DEPEND="
-	dev-python/pygobject:3
-	>=net-wireless/bluez-4.61:=
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${COMMON_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/faenza-icon-theme
-		x11-themes/gnome-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? ( dev-libs/libappindicator:3[introspection] )
-	network? (
-		net-dns/avahi[autoipd]
-		net-firewall/iptables
-		sys-apps/net-tools
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? ( sys-auth/polkit )
-	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
-	thunar? ( xfce-base/thunar )
-"
-
-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"
-		linux-info_pkg_setup
-	fi
-}
-
-pkg_setup() {
-	pkg_pretend
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${PN}-2.0-set-codeset-for-gettext-to-UTF-8-always.patch"
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-runtime-deps-check \
-		--disable-static \
-		$(use_enable policykit polkit) \
-		$(use_enable nls) \
-		$(use_enable thunar thunar-sendto)
-}
-
-src_install() {
-	default
-
-	python_fix_shebang "${D}"
-	rm "${D}"/$(python_get_sitedir)/*.la || die
-
-	use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; }
-	use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-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_alpha1.ebuild b/net-wireless/blueman/blueman-2.1_alpha2.ebuild
index 130cc6444b24..91c37c77c4a0 100644
--- a/net-wireless/blueman/blueman-2.1_alpha1.ebuild
+++ b/net-wireless/blueman/blueman-2.1_alpha2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 inherit gnome2-utils linux-info python-single-r1 systemd
 
 DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
@@ -20,7 +20,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio thunar"
+IUSE="appindicator network nls policykit pulseaudio"
 
 COMMON_DEPEND="
 	dev-python/pygobject:3
@@ -37,6 +37,7 @@ RDEPEND="${COMMON_DEPEND}
 	x11-libs/gtk+:3[introspection]
 	x11-libs/libnotify[introspection]
 	|| (
+		x11-themes/adwaita-icon-theme
 		x11-themes/faenza-icon-theme
 		x11-themes/gnome-icon-theme
 		x11-themes/mate-icon-theme
@@ -53,7 +54,6 @@ RDEPEND="${COMMON_DEPEND}
 	)
 	policykit? ( sys-auth/polkit )
 	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
-	thunar? ( xfce-base/thunar )
 	!net-wireless/gnome-bluetooth
 "
 
@@ -90,7 +90,9 @@ src_configure() {
 		$(use_enable policykit polkit)
 		$(use_enable nls)
 		$(use_enable pulseaudio)
-		$(use_enable thunar thunar-sendto)
+		# thunar integration is a single data file with no extra deps
+		# so install it unconditionally
+		--enable-thunar-sendto
 	)
 	econf "${myconf[@]}"
 }