gentoo resync : 16.04.2018

5 files changed, 2 insertions, 263 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 7145808fa326..a23fa0a2365c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 8f03f83e5442..30e0569d22d7 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -8,9 +8,7 @@ AUX bluez-plugdev.patch 469 BLAKE2B 611a9971e4614ab32ab62e8d2dc23e4a98b59c02ad83
 AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e5990750674cfdf6fd7395db3c0bf4520f4d81896d802cf62a25d1abbf46784f09c581a1fb0b72ef8a27131d4cf65d8 SHA512 a1af572809ec71a1796ec66fa1d2fcea6fb7624bdb9a629791707b182310bf41d1a109cc19e0fe034f4b4ae5e5816d809ece2eb4410e7f47827ec1b86c82b3a1
 AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd00a43d5ee7aca045fb566ab39638664bc37ec54c516aa327c6ba54b046ed18696cabf3228ad0e28588 SHA512 bcbb6a78c4c25ad797dc1d45180382909a052e9be32439eec85772082a01799f45181e8a90be89b952a68b7276f6ac1cef98fc3f4d0a5e5c8075089a29f3ddd1
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
-DIST bluez-5.48.tar.xz 1733952 BLAKE2B 0a68a1b790d752b02b8ab3d0eeaa9387c15851003a1d691cb476cef564c032498935997b84af4dd8bdb448dbe434eedecb982a9a867dd4dfa2ca0c8a23f371c3 SHA512 38cb20b8acee8adaab286a0b042efa770df367e7a69556117961fcc46d9e0a0e2a48059c7df9511bb00fe7fc37e916e34c928df9372b45051fcc57c8965b0bb7
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
-EBUILD bluez-5.48-r1.ebuild 7898 BLAKE2B 7d05df3d6161bb98d19c1a92a6709dc9174d0ef6378d74ebb33f79161e767600be63c5b3843a03b85f5d9d1321cc7464822aac9513e1d4dfab97b11e94cabc1a SHA512 3e8f5e729d9d23e3db6fb64e8d14509fe736fc88f43f9f8e8cbfe305fcf9230303688c829cc1c65918cb2f9fbceb4110a99bcee378d4dc9f410f1ae2386f5e2a
 EBUILD bluez-5.49.ebuild 7933 BLAKE2B bd60a8317552a51eeafb2b3542f3f1e7d5bc66bcfdeb49d1c2751b1f3408d4c29d5cc748e0fa8533588ad7e422094399c461ec2620a945461eb3d2fb513785cd SHA512 d19432063df4a414128d3fb95eb8669e485f0b6429380cb44c59f516fac0556fe03778512e409a9b86d522c7db08c843f1db2f0c9f6c55a5afcf71541278c244
 MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
diff --git a/net-wireless/bluez/bluez-5.48-r1.ebuild b/net-wireless/bluez/bluez-5.48-r1.ebuild
deleted file mode 100644
index dc9296bd955b..000000000000
--- a/net-wireless/bluez/bluez-5.48-r1.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools ltprune multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
-IUSE="alsa cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
-
-# Since this release all remaining extra-tools need readline support, but this could
-# change in the future, hence, this REQUIRED_USE constraint could be dropped
-# again in the future.
-REQUIRED_USE="
-	extra-tools? ( deprecated readline )
-	test? ( ${PYTHON_REQUIRED_USE} )
-	test-programs? ( ${PYTHON_REQUIRED_USE} )
-	user-session? ( systemd )
-"
-
-CDEPEND="
-	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.6:=[user-session=]
-	>=sys-apps/hwids-20121202.2
-	alsa? ( media-libs/alsa-lib )
-	cups? ( net-print/cups:= )
-	mesh? (
-		dev-libs/json-c:=
-		sys-libs/readline:0= )
-	obex? ( dev-libs/libical:= )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd )
-	udev? ( >=virtual/udev-172 )
-"
-TEST_DEPS="${PYTHON_DEPS}
-	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? (	${TEST_DEPS} )
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-bluetooth )
-	test-programs? ( ${TEST_DEPS} )
-"
-DOC_CONTENTS="
-	If you want to control your bluetooth devices as a non-root user,
-	please remember to add you to plugdev group.
-"
-
-PATCHES=(
-	# Use static group "plugdev" to not force people to become root for
-	# controlling the devices.
-	"${FILESDIR}"/bluez-plugdev.patch
-
-	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
-	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
-	"${FILESDIR}"/bluez-udevadm-path.patch
-
-	# build: Quote systemd variable names, bug #527432
-	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
-	"${FILESDIR}"/bluez-5.39-systemd-quote.patch
-
-	# Fedora patches
-	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
-	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
-
-	# ???
-	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
-)
-
-pkg_setup() {
-	enewgroup plugdev
-
-	if use test || use test-programs; then
-		python-single-r1_pkg_setup
-	fi
-
-	if ! use udev; then
-		ewarn
-		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
-		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
-		ewarn "and hid2hci will not be available."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
-	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
-			Makefile.{in,tools} || die
-	fi
-
-	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
-	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# readline is automagic when client is enabled
-		# --enable-client always needs readline, bug #504038
-		# --enable-mesh is handled in the same way
-		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
-		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
-	)
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# deps not used for the library
-			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
-		)
-	fi
-
-	# btpclient disabled because we don't have ell library in the tree
-	econf \
-		--localstatedir=/var \
-		--disable-android \
-		--disable-btpclient \
-		--enable-datafiles \
-		--enable-experimental \
-		--enable-optimization \
-		$(use_enable debug) \
-		--enable-pie \
-		--enable-threads \
-		--enable-library \
-		--enable-tools \
-		--enable-manpages \
-		--enable-monitor \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(multilib_native_use_enable alsa midi) \
-		$(multilib_native_use_enable cups) \
-		$(multilib_native_use_enable deprecated) \
-		$(multilib_native_use_enable experimental) \
-		$(multilib_native_use_enable mesh) \
-		$(multilib_native_use_enable obex) \
-		$(multilib_native_use_enable readline client) \
-		$(multilib_native_use_enable systemd) \
-		$(multilib_native_use_enable test-programs test) \
-		$(multilib_native_use_enable udev) \
-		$(multilib_native_use_enable udev sixaxis)
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		default
-	else
-		emake -f Makefile -f - libs \
-			<<<'libs: $(lib_LTLIBRARIES)'
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-
-		# Only install extra-tools when relevant USE flag is enabled
-		if use extra-tools; then
-			ewarn "Upstream doesn't support using this tools and their bugs are"
-			ewarn "likely to be ignored forever, also that tools can break"
-			ewarn "without previous announcement."
-			ewarn "Upstream also states all this tools are not really needed,"
-			ewarn "then, if you still need to rely on them, you must ask them"
-			ewarn "to either install that tool by default or add the needed"
-			ewarn "functionality to the existing 'official' tools."
-			ewarn "Please report this issues to:"
-			ewarn "http://www.bluez.org/development/lists/"
-
-			# Upstream doesn't install this, bug #524640
-			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-			# gatttool is only built with readline, bug #530776
-			dobin attrib/gatttool
-			dobin tools/btmgmt
-		fi
-
-		# Unittests are not that useful once installed, so make them optional
-		if use test-programs; then
-			# example-gatt-client is the only one needing
-			# python3, the others are python2 only. Remove
-			# until we see how to pull in python2 and python3
-			# for runtime
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
-			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
-			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
-			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
-				dosym "${i}" /usr/bin/bluez-"${i##*/}"
-			done
-		fi
-	else
-		emake DESTDIR="${D}" \
-			install-includeHEADERS \
-			install-libLTLIBRARIES \
-			install-pkgconfigDATA
-	fi
-}
-
-multilib_src_install_all() {
-	# We need to ensure obexd can be spawned automatically by systemd
-	# when user-session is enabled:
-	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
-	# https://bugs.gentoo.org/show_bug.cgi?id=577842
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
-	# https://bugs.archlinux.org/task/45816
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
-	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
-
-	prune_libtool_files --modules
-
-	keepdir /var/lib/bluetooth
-
-	# Upstream don't want people to play with them
-	# But we keep installing them due to 'historical' reasons
-	insinto /etc/bluetooth
-	local d
-	for d in input network; do
-		doins profiles/${d}/${d}.conf
-	done
-	doins src/main.conf
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
-
-	einstalldocs
-	use doc && dodoc doc/*.txt
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	use udev && udev_reload
-	systemd_reenable bluetooth.service
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-}
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index bb106c33aebd..a6880a6e5617 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -2,6 +2,6 @@ AUX kismet-2016.07.1-ruby-fixes.patch 1808 BLAKE2B e66937e71488affc6b3fe377ec27e
 AUX kismet.confd 403 BLAKE2B 2c286c0731489fd069f6fd5e0bd2ff92d16bac89175ebeffcb4f313553043475d030b88de1c580244767f40b60a4d8d70eb25180463b24b84b9ea7064cff742d SHA512 232801f085980d464df831af8c73fa9c4274b44dd45118938cdf9048e0d54cdcc386aec6749e7a1b2c00b73739ab8bb51ff5dadf8cc1866ce2207e28c4e25b71
 AUX kismet.initd 629 BLAKE2B 5dd54d0f05c65d65682be73f15388e82dc45881d4704b04835e36f587956a0953d822557bb0baf685846a0d2bfd90db0995793f6d46a2adc5aa07dbc525df846 SHA512 864f79715b35595a19f370c2382c3a3383d06245cca7a65b88a35b9ceafb2f4953044e6b3c5c71748ed68d890043ab69a2c47d630c14c51542ba3f86699a11db
 DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e1158357c602fa807d712870543a7fade25077f449c07c023ad1d2150870352aa754484846d8c2a0d9f027113bb57c1fc SHA512 88891a0cd5ef94a4815d259e433f946f52552c125e05a5d8ac447d04e6090f2bd92f8bd8573440f0dfe446b29233bef81d9889e53170757ad0116ddfc2cb8416
-EBUILD kismet-2016.07.1-r1.ebuild 4189 BLAKE2B bb4be04a32e3da480ca5e8f285ef03b51273f68f58d7cffc28b9ac68aa2948ab41cfc1161bbe059222d3594eecc15c30bccab48f471c7842a625b385214bf936 SHA512 b391f26359d799adf64ce9e79a66d8676840897d749775df33291ce728772e86adaed3e673bd44d18dccc2537a6e720afd41f5fd8512a1f1e3bdbe138fe0e706
+EBUILD kismet-2016.07.1-r1.ebuild 4190 BLAKE2B ef050f41fda06b2130d4483948d84bbf5a22b9197225f86a7ef1c20fcc05cc67b5dc94b85ca26b7b5c30c3afdd0645c7e1e8e2479305fdd967326eebe0d9685f SHA512 b0f441d0ac5082c4f2ffef6334934afd9e596e112b46349e0c7912c834e4d671f1986cfcd4a20387e00d5561dd926ebe0c2eb8ecbf9b27caff7b32e5c12c0255
 EBUILD kismet-9999.ebuild 4829 BLAKE2B 3672aedbaa2a4e420cdc52fa95858c59ac1d6a1031b4c1b739f3f477731ec45a9803766d03a85a257c0bcf92daf48faa0c2e3eb4e8a936b4c5ba3e95f7f5a9aa SHA512 a876b8afc036bcee7dca283c91df99d2363f2116667b8084c15f5f0676ee523dda55b97450eeb1cf8b401d82f8f28da1695c8dfb490fca10c41efac17a99fde7
 MISC metadata.xml 1159 BLAKE2B 2e72c1c62f31b52445c83b6b0d7695c7f1231de69fbe865e123a18dc0030a0f57586b058a7e738d561f48413e8a6ff0e8ac73428de2c41688e5baa1e4c255af1 SHA512 cf7c0f4c38f0a5e7b9c51c9fc98f5dd49e51159986443687a81d486c8805aea069168832f406a16b36dc6342be063fdbcade74685273fcdd2111ea9a616437d7
diff --git a/net-wireless/kismet/kismet-2016.07.1-r1.ebuild b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
index 791333603768..f7b8ac21f4d7 100644
--- a/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
+++ b/net-wireless/kismet/kismet-2016.07.1-r1.ebuild
@@ -10,7 +10,7 @@ MY_P=${MY_P/./-R}
 S=${WORKDIR}/${MY_P}
 
 SRC_URI="http://www.kismetwireless.net/code/${MY_P}.tar.xz"
-KEYWORDS="amd64 arm arm64 ~ppc x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc x86"
 
 DESCRIPTION="IEEE 802.11 wireless LAN sniffer"
 HOMEPAGE="http://www.kismetwireless.net/"