Merge updates from master

15 files changed, 150 insertions, 56 deletions

diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index adac49b05668..56e8252a7751 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -1,3 +1,3 @@
 DIST monit-5.17.1.tar.gz 1231823 SHA256 f71a22cfb6bd91ff46496e72e1d1b1021ecd651e7748131ce0f995cc37ff0b42 SHA512 e28534ce3a5a95eac70f05c34b5a8545a0eb925ac90f82f71bcea8f3568be45288ddbd196c2352a390820244143511ecf2e0de21cdcab1dd2f3e4788dad71015 WHIRLPOOL 9416020cecb49473299f0603448a79c0f3992bad995dbd78a282cf8440b9957edcefc419a56ed71f583efbce2d0ba50a338d2df5b736d9d32e0116ecc5bf5ef1
-DIST monit-5.18.tar.gz 1239752 SHA256 75ccb85fa2ac1f44c9c95c5a6b539a254b0a1d64e16a36ec9eeb867484a4fcaf SHA512 448f0d2cb0a18e6b4ead051918677414157f7feac5697888f667db4cf5411b922058a36fc57247c6b8ff9b6f23382305c8c69fc6ec1fcd247b01f4a8bccaa42c WHIRLPOOL 7eaa147be48aa8f38d3e11df6af65c68aa36f20bb868d619e573a13563a2f3e82efc170e5449785f93db1b56261a286422565455676f86e803612d10b8c87d24
 DIST monit-5.19.0.tar.gz 1260248 SHA256 befcd54365502bce4ffd6d1b0c345d5b689c9f7cb3a35a462ba7dcffcf6f62b8 SHA512 87bd21660c8ef1f1663abe24d5024c2f6d2d6a782a0a37432c5afff45d906ecf12d477569309a6be80c6bb855d04da5ac51818cdcc46542cdac2df88bad91517 WHIRLPOOL 0bd22cef1b42a31393af59284e5a3d08f6974fb6daf557f2dd27d31fecf0f8b1657d7050ce8cfea8d2c423a5a83f7dae8ec1af3f6eb7340abb16253d3d3e9b43
+DIST monit-5.20.0.tar.gz 1267991 SHA256 ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d SHA512 653cba9d63fad42acf8c27ee9c050d047fc78e0b7e8cdb0f3d0a533d5b5e01ccf1b82d443cb6518d286547087a021e37a59cbffedbb3daf49ff8f95e8c64b884 WHIRLPOOL 28f9fcfa86c346fb390654e4730cc52ce30b794b2dc1e02a484079b55a8bcb50d78a71e2e856f1ce1e161dc99bcd6913b4db92ed0deab64e969c5c6a464c584d
diff --git a/app-admin/monit/monit-5.18.ebuild b/app-admin/monit/monit-5.20.0.ebuild
index 369c57a797d1..369c57a797d1 100644
--- a/app-admin/monit/monit-5.18.ebuild
+++ b/app-admin/monit/monit-5.20.0.ebuild
diff --git a/app-admin/stow/stow-2.2.2.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
index 425c180c88ff..f0714cc61df9 100644
--- a/app-admin/stow/stow-2.2.2.ebuild
+++ b/app-admin/stow/stow-2.2.2-r1.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=6
 
+inherit perl-functions
+
 DESCRIPTION="GNU Stow is a symlink farm manager"
 HOMEPAGE="https://www.gnu.org/software/stow/"
 SRC_URI="mirror://gnu/stow/${P}.tar.gz"
@@ -18,4 +20,9 @@ DEPEND="dev-lang/perl
 		virtual/perl-Test-Harness
 		dev-perl/Test-Output
 	)"
-RDEPEND="dev-lang/perl"
+RDEPEND="dev-lang/perl:="
+
+src_configure() {
+	perl_set_version
+	econf "--with-pmdir=${VENDOR_LIB}"
+}
diff --git a/dev-perl/XML-SAX-Writer/Manifest b/dev-perl/XML-SAX-Writer/Manifest
index 89facd3ed5e3..5e36a013131f 100644
--- a/dev-perl/XML-SAX-Writer/Manifest
+++ b/dev-perl/XML-SAX-Writer/Manifest
@@ -1,2 +1 @@
-DIST XML-SAX-Writer-0.54.tar.gz 21399 SHA256 a1b4d959aed8f8337523c4cef4b431e56e619c795dc6f99a868548952101cf3d SHA512 c7c7dcf157b872b2f4c4dbe4119945e31fe4ffc1eaf7df68e19b0e892cba5ff1ea0b4213199fdeca2747ca75169d14a3811a90c16915c40454b3ef22b754cf27 WHIRLPOOL 853411b4a32f7f973e46542b6aa4e52de926e0947f65e6884617739156fe81a13fe87ae7571dc44b13e93335c0c2a9e09c7efb8990580b3f63e18ac59d04b7c7
 DIST XML-SAX-Writer-0.56.tar.gz 21484 SHA256 d073f7a25072c8150317b86b99d07031316a15bffab99e63e5afe591c8217d03 SHA512 af792d43394133adef608a80fcbaa0e24098e9b0408daac91aefb43735d20a27fcb003c90c95d1e472d2b951b64d5ce81ca9e1da956973eed1856f8b111cc866 WHIRLPOOL 9bb10032f899b5a6286990046591d44be4a820ad32a650c51bf4191b8628cabe5d555ffef54824f641f86b1c8291a25186b0d33c3f2c8b241ed4b80e798a6692
diff --git a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.540.0.ebuild b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.540.0.ebuild
deleted file mode 100644
index b2eed38be7e0..000000000000
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.540.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PERIGRIN
-MODULE_VERSION=0.54
-inherit perl-module
-
-DESCRIPTION="SAX2 Writer"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-perl/XML-Filter-BufferText
-	dev-perl/XML-SAX
-	>=dev-perl/XML-NamespaceSupport-1.04
-	>=dev-libs/libxml2-2.4.1"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
index e4af39551782..7d04a94f8df7 100644
--- a/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
+++ b/dev-perl/XML-SAX-Writer/XML-SAX-Writer-0.560.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="SAX2 Writer"
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-perl/XML-Filter-BufferText
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 817638dc0de4..f76f1a7ea596 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -253,6 +253,7 @@ _git-r3_env_setup() {
 
 	local esc_pn livevar
 	esc_pn=${PN//[-+]/_}
+	[[ ${esc_pn} == [0-9]* ]] && esc_pn=_${esc_pn}
 
 	livevar=${esc_pn}_LIVE_REPO
 	EGIT_REPO_URI=${!livevar-${EGIT_REPO_URI}}
diff --git a/games-action/minetest/metadata.xml b/games-action/minetest/metadata.xml
index 68f3b1db69e6..4eeaf53fc44d 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maddin081591@gmail.com</email>
-		<name>Martin-Kevin Neumann</name>
-		<description>Proxy maintainer, CC him on bugs</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Minetest is an infinite-world block sandbox game and a game
 		engine, inspired by InfiniMiner, Minecraft and the like. It has
diff --git a/games-action/minetest_game/metadata.xml b/games-action/minetest_game/metadata.xml
index 8ec83ec47639..5fb34f81c2fc 100644
--- a/games-action/minetest_game/metadata.xml
+++ b/games-action/minetest_game/metadata.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maddin081591@gmail.com</email>
-		<name>Martin-Kevin Neumann</name>
-		<description>Proxy maintainer, CC him on bugs</description>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/minetest/minetest_game/issues</bugs-to>
 		<remote-id type="github">minetest/minetest_game</remote-id>
diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
index 8621bda711d6..4fc6761281d1 100644
--- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
+++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
+RESTRICT="mirror"
+
 RDEPEND="
 	dev-lang/perl
 	dev-perl/IO-Socket-SSL
diff --git a/profiles/package.mask b/profiles/package.mask
index ce8c5a486a59..cd1e995ba5c1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -605,7 +605,7 @@ dev-lang/python:3.3
 
 # Christian Tietz <christian.tietz@mailbox.org> (23 Aug 2016)
 # Depends on masked xfce-base/exo-0.11.1
-=xfce-extra/xfce4-whiskermenu-plugin-2.0.1
+>=xfce-extra/xfce4-whiskermenu-plugin-2.0.1
 
 # Brian Evans <grknight@gentoo.org> (22 Aug 2016)
 # PHP 5.5 has reached end of life and will no longer receive security updates.
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index 65dd85634dd1..d6844cb503da 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,4 +1,6 @@
 DIST xfce4-whiskermenu-plugin-1.5.0-src.tar.bz2 145549 SHA256 da82bdbc899a9935b560323aac9037d44f37fb110509b80ec293196722671851 SHA512 2cfbade2926fc7ff936ae2d5be2ef1d6a49e9ffc79fc9d9b78ba75070b70e7978ce4ae20df08b7d1089f016741231be029f92cd4b53cbaf7dfec08c97ad60028 WHIRLPOOL fc6e9a32e6fc6e0a8127b214899c743712503fff0a117e993b3c8049004b75519690948e4bf664a6200ae54e29c1cd70ab919dfd5953acee02e11aa77537768d
 DIST xfce4-whiskermenu-plugin-1.5.3.tar.gz 155395 SHA256 12a54f1086ba4edad3c0837bc3cbc8da35ff45dc6c5973f92d6ebe9ac4a2e03e SHA512 974a206456a334253c1c03ef7932f1836427a771faec92daf0b766878b95e61eea4b29545c96c14fdafd3af0b3b4bf07127e48b973fb8aa809397eb22712362b WHIRLPOOL d03f87167639c1493e45eea2a10c01a9880e1822ad54cb9414d5637998e53c99d01c03b4469ef345572173170ed7b64d41b5ade075b56d757df572d20db177cd
 DIST xfce4-whiskermenu-plugin-1.6.0.tar.gz 157826 SHA256 fc16998418aa402713c9f60ff2dab15301ba6028c119c688fc082bb8e5b3a981 SHA512 8515f6decc99aa534653350838b1ffc74c1dd72de9940dfdc631097f666b32f827b1f33527729dccfe70b3de5e6b6c3aad010e8abcced18881f3589a6c860975 WHIRLPOOL 336949750e039537b807db1da0294e280c542e217145f1802896abfeb8230384b9d1167a1b09ee5b97f35ce5e30f5224ccca784ea20ba3f795206074feb61cff
+DIST xfce4-whiskermenu-plugin-1.6.1.tar.gz 158656 SHA256 574aa7a38248930c94589ed12b5f4fe4161a8210165957ef7b12f8c46aa10978 SHA512 fa0a06c5776a1e6c35dd2c2ba6c4b914cf23cfb98cd22b82dbb1ad8c29b4dc26e72de727e36c5be0ae252c78557ef233213d8afa9503978dd07f7b4fb9305062 WHIRLPOOL 8840b92bca2f633c7875861d8443935398c27069d991da4953c27e65350e52ff5dfea9bdb7f0a08afd47f5ab0eadf897fd4f9c16125bae723f95df2abe9a8c97
 DIST xfce4-whiskermenu-plugin-2.0.1.tar.gz 160323 SHA256 a52d7af8f8cbd318209223a1643487deea60d90bed9404f47a9090e5757d162a SHA512 c02eedbf71df16132448bf78fcc885603cbe0d06b8c3cd0b259ca992273ab85297dd9041fd28f973b1e5e29b3d8033063efb5c69f6ace6b0e76c2f6dbcae1e10 WHIRLPOOL f2bd464e27dc81e546ebcb36d4428f0834fd13ddf2017fc2d3c141f1046656d959c6e707ef76e8275c9abb652fe479b49c83d69f8de03a94c858c31a3e237b9f
+DIST xfce4-whiskermenu-plugin-2.0.2.tar.gz 161333 SHA256 e052524b0ac3348a5e8b4c0e7418ca1c19987339e56131fc8bf92cd1633299a1 SHA512 aac26e9bd45524799a0ee63f835df6a72e262c41b6de3ace419bf1372f89abd02a3dcd2b5e669cd8155a0f76ee86b28a0e8a8ce9e14594e5b57a274d3a1420d7 WHIRLPOOL 7fd00892237a297176055ae664b460f0270188afb358d1572cd2f78db5d8c10d8ebb1948c66f0067368067141242878e6d81644f949b5811424841e0a070f2cb
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml b/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
index 6c18f61c3984..3e5c56c6166f 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
+++ b/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
@@ -42,14 +42,8 @@
 			<email>graeme@gottcode.org</email>
 			<name>Graeme Gott</name>
 		</maintainer>
-		<bugs-to>
-			https://github.com/gottcode/xfce4-whiskermenu-plugin/issues?labels=bug&amp;state=open
-		</bugs-to>
-		<changelog>
-			http://gottcode.org/xfce4-whiskermenu-plugin/#releasenotes
-		</changelog>
-		<remote-id type="github">
-			gottcode/xfce4-whiskermenu-plugin
-		</remote-id>
+		<bugs-to>https://github.com/gottcode/xfce4-whiskermenu-plugin/issues?labels=bug&amp;state=open</bugs-to>
+		<changelog>https://gottcode.org/xfce4-whiskermenu-plugin/#releasenotes</changelog>
+		<remote-id type="github">gottcode/xfce4-whiskermenu-plugin</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.1.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.1.ebuild
new file mode 100644
index 000000000000..61628617175b
--- /dev/null
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Alternate application launcher for Xfce"
+HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
+SRC_URI="https://github.com/gottcode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/libintl:=
+	x11-libs/gtk+:2=
+	xfce-base/exo:=
+	xfce-base/garcon:=
+	xfce-base/libxfce4ui:=
+	xfce-base/libxfce4util:=
+	xfce-base/xfce4-panel:="
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	local i
+	cd po || die
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in *.po ; do
+			einfo "removing ${i%.po} linguas"
+			has ${i%.po} ${LINGUAS} || { rm ${i} || die ; }
+		done
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AS_NEEDED=OFF
+		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
+		-DENABLE_DEVELOPER_MODE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.0.2.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.0.2.ebuild
new file mode 100644
index 000000000000..d3a1734c177f
--- /dev/null
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Alternate application launcher for Xfce"
+HOMEPAGE="https://gottcode.org/xfce4-whiskermenu-plugin"
+SRC_URI="https://github.com/gottcode/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/libintl:=
+	x11-libs/gtk+:3=
+	>=xfce-base/exo-0.11.0:=
+	xfce-base/garcon:=
+	xfce-base/libxfce4ui:=
+	xfce-base/libxfce4util:=
+	xfce-base/xfce4-panel:="
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	local i
+	cd po || die
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		for i in *.po ; do
+			einfo "removing ${i%.po} linguas"
+			has ${i%.po} ${LINGUAS} || { rm ${i} || die ; }
+		done
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_AS_NEEDED=OFF
+		-DENABLE_LINKER_OPTIMIZED_HASH_TABLES=OFF
+		-DENABLE_DEVELOPER_MODE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}