Merge remote-tracking branch 'remotes/hydrapolic/filebeat'

Pull request: https://github.com/gentoo/gentoo/pull/508

8 files changed, 50 insertions, 133 deletions

diff --git a/app-admin/filebeat-bin/Manifest b/app-admin/filebeat-bin/Manifest
index 430abbc6f618..a5766ccab4ef 100644
--- a/app-admin/filebeat-bin/Manifest
+++ b/app-admin/filebeat-bin/Manifest
@@ -1,2 +1,2 @@
-DIST filebeat-1.0.0-i686.tar.gz 3069805 SHA256 f184fe7d5cd566bdf1a48f79cd52c0d3ef960782b2076e8df67836e0ed36dc37 SHA512 c4df33524249aef574f923c67be56e22f8eb24a51933178a90b080cc59aec772052c653bf551f198c08e63c7cb03fa9f346dc7c5cee31c586270c532655486df WHIRLPOOL e2be905de1aa0749bfb419bff50fc1952dc7dc5b2d127045709f08e6e6cb38faae1372d64515c4157949138cdbd10888aea0e0fe4e98f57d69a73873eb578483
-DIST filebeat-1.0.0-x86_64.tar.gz 3260387 SHA256 f0bcc2dc9ae720a672fe5f4b22c0d132f7131d4d07484f4100453c7122f0561a SHA512 823450554ec6d7ae43ff064e967ad8d5bef95077404738feac7f7ae5ef74000e051042ea3734423b883bab9102d90a4e707d9c0d03c88abe2f34862f02d01ed4 WHIRLPOOL 5a6b9b532d090a87724f17af3727cca772f48602c39cb9d82593f3c4f4ab722f295db647ba4d0152bf3baa41134b5561c2e9655a02d47c25e228af64122e3609
+DIST filebeat-1.0.1-i686.tar.gz 3073413 SHA256 a9ccf9a4f1d3e2c840ad153ae4594a4cabccaa53c178c3ad585590e10994d7b8 SHA512 164835cb4dd98b6e897e004fdc0c099022be8e83ced89a0dbbbec119f32eaaf9f6ed5eaec41d3c86d5722df662577d83b9623b057ac7913038b04ee344ae5a85 WHIRLPOOL 9983b74569ff303cdfcff8968a0a93dab34e1f9c3d184f89e88e066106cd94a687e07a94e3ba6ac6019d786cad50a07ec8052043a5bdd3cbc095eaae64c50c0f
+DIST filebeat-1.0.1-x86_64.tar.gz 3265179 SHA256 662bceca18eabf9c81681b790776398a78fdf36604b5d0edc8abedd28980de52 SHA512 5ec0a0371790a425fac67ddb164fc4b347eb79468f85b8a64d78491a478aacfc2d3eaad62f654847c7381d4dc3686075e428ecc2271f415aa1cc83b5c84e72b7 WHIRLPOOL 58c86a41cdd2543d8de82e0572af27adac7d44d09c7866c984616c7dcb296087eaa25f6c7de234f27ed25698bad9d18a444bfd89166c5a415457a2f473fa6263
diff --git a/app-admin/filebeat-bin/filebeat-bin-1.0.0.ebuild b/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild
index 96d830c7b279..96d830c7b279 100644
--- a/app-admin/filebeat-bin/filebeat-bin-1.0.0.ebuild
+++ b/app-admin/filebeat-bin/filebeat-bin-1.0.1.ebuild
diff --git a/app-misc/jq/jq-1.4-r1.ebuild b/app-misc/jq/jq-1.4-r1.ebuild
index 2e4fef43f730..e3458f2e74f6 100644
--- a/app-misc/jq/jq-1.4-r1.ebuild
+++ b/app-misc/jq/jq-1.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://stedolan.github.io/jq/download/source/${P}.tar.gz"
 
 LICENSE="MIT CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
 IUSE="static-libs test"
 
 DEPEND="sys-devel/bison
diff --git a/app-portage/maintainer-helper/maintainer-helper-0.1.2-r1.ebuild b/app-portage/maintainer-helper/maintainer-helper-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..ea049277e3d9
--- /dev/null
+++ b/app-portage/maintainer-helper/maintainer-helper-0.1.2-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="An application to help with ebuild maintenance"
+HOMEPAGE="https://dev.gentoo.org/~jokey/maintainer-helper"
+SRC_URI="https://dev.gentoo.org/~jokey/maintainer-helper/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-qt/qtgui:4
+	>=dev-python/PyQt4-4.2[X,${PYTHON_USEDEP}]
+	>=sys-apps/pkgcore-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/snakeoil-0.1_rc2[${PYTHON_USEDEP}]"
+
+python_postinst() {
+	elog "Currently gvim is hardcoded as editor, to change it, edit"
+	elog "$(python_get_sitedir)/maintainer_helper/backend/tasks.py"
+	elog "It will be a real setting in the next version"
+}
+
+pkg_postinst() { python_foreach_impl python_postinst; }
diff --git a/net-wireless/blueman/blueman-2.0-r1.ebuild b/net-wireless/blueman/blueman-2.0-r1.ebuild
deleted file mode 100644
index 22cc3b8048e4..000000000000
--- a/net-wireless/blueman/blueman-2.0-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="~ppc"
-else
-	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~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}/${P}-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/profiles/package.mask b/profiles/package.mask
index c92fd5996be5..fd7e54791651 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -51,11 +51,6 @@ games-fps/ut2004-ultraduel
 # Ebuild uninstallable #557090
 =app-crypt/gkeys-0.1-r1
 
-# Michał Górny <mgorny@gentoo.org> (18 Dec 2015)
-# Contains privilege escalation vulnerability that could be used to
-# execute random Python code passed via D-Bus as root. Bug #568644.
-<net-wireless/blueman-2.0.3
-
 # Michael Sterrett <mr_bones_@gentoo.org> (18 Dec 2015)
 # Unmaintained and no reason to use it or keep it around
 # when games-roguelike/rogue is a better choice.
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
index 053a68bd3fed..9fa1694f3a60 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
@@ -3,7 +3,8 @@
 # $Id$
 
 EAPI=4
-inherit gnome2-utils
+
+inherit flag-o-matic gnome2-utils
 
 DESCRIPTION="Hard disk drive health inspection tool"
 HOMEPAGE="http://gsmartcontrol.sourceforge.net/home/"
@@ -25,6 +26,10 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
 
+src_prepare() {
+	append-cxxflags -std=c++11
+}
+
 src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \
diff --git a/sys-apps/gsmartcontrol/metadata.xml b/sys-apps/gsmartcontrol/metadata.xml
index ca8078571df8..9d109ee85cd1 100644
--- a/sys-apps/gsmartcontrol/metadata.xml
+++ b/sys-apps/gsmartcontrol/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
-	<email>ssuominen@gentoo.org</email>
-</maintainer>
-<upstream>
-	<remote-id type='sourceforge'>gsmartcontrol</remote-id>
-</upstream>
+	<herd>base-system</herd>
+	<maintainer>
+		<email>ssuominen@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gsmartcontrol</remote-id>
+	</upstream>
 </pkgmetadata>