Merge updates from master

7 files changed, 106 insertions, 13 deletions

diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index ae3e90ffe0ec..7d510408a044 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
-    <email>net-mail@gentoo.org</email>
-    <name>Net-Mail</name>
-  </maintainer>
-  <maintainer type="project">
     <email>antivirus@gentoo.org</email>
     <name>Gentoo Antivirus Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>net-mail@gentoo.org</email>
+    <name>Net-Mail</name>
+  </maintainer>
   <use>
     <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
     <flag name="metadata-analysis-api">Enables collection of file property metadata using ClamAV API for analysis by ClamAV bytecode programs.</flag>
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 4db7be410e4a..5ee50e8d2c12 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -2,3 +2,4 @@ DIST libevdev-1.3.tar.xz 392744 SHA256 265411ce79a592b3074e9d07fb97d462745d0c7ef
 DIST libevdev-1.4.4.tar.xz 409856 SHA256 ed9979369b6a6e28f5897d099538549ecffb2b7c00c1b717eb77c31d85bc45a9 SHA512 5170ce3e99588b3ce2f9d3580b2d2087b527eaf258ab69a9e8620e2c336d9fa54c36f75ba4b68a61b5ecd7c8123bb9adf538ba882ed353df08a54cd68906e210 WHIRLPOOL 6812c199e03e0eab750c83603d8f9dcc8d5b917d7b0cc2942317fff75083d91b0601401c5e5fddc4d64066c44a4d7de210f994fc01f79f7ce884fdf039b9e1c5
 DIST libevdev-1.4.5.tar.xz 409756 SHA256 e91c58ca86e0631186798449e0a78c65474ff562081d968ba0521f76c8c2ca1d SHA512 086762a8bca049e9a5b88a8829b0175c0c908d893a286a2a75cc99921c5536ab2a0330ac26823e5154ef18336c48ad47f44784c3c2f91caa7f64bf46330e2808 WHIRLPOOL 1ff48b955e28f75efd90c5f68e9b1df16969582a86a71cd10903eeaa7aa0aeb2000b1af4725f669db18c16cd2951919f59c4fd820a417479a68bf05be618c0c8
 DIST libevdev-1.4.6.tar.xz 410224 SHA256 7b2ae1a0c7f9f7a96198ddc8fd167f090f233d6cbd8168b847e4f968445132d3 SHA512 7c2250ed87a352e5ce8503ff4ea7cac29e45bdfbde6e3443dd091ebfe139cb7a2b4be5e16d1aa1bf7e0e0550c16eb1d0038992645bf0bef5528f2dca4a8f0290 WHIRLPOOL a3df849cf24730ec401f6794e25c1a9e00c27d80f7cb468c55a3c8d09c0a7d504a8f1331837998df1c89fd84d4cd1e0d59581106e8ace2b4d0de486a0c2182d6
+DIST libevdev-1.5.1.tar.xz 397652 SHA256 17630821a57e6e3f02e01ade836f24068df9bd530067091152b0d468c3a86f40 SHA512 71f6f860618e19d7bea01afe1dcdf4ba295e979fecd32c08888db5adf4300e8fc7eedc6df53dc3398dc49d69c8e144020daa6bdc6fd080e956af31f6d39189a7 WHIRLPOOL a6d9bccf4cb5a37f4e012b3874d5b4918dad348d538c92b64e529d6ccd1b1f95f49245060f7b537468e315b2cfd5e61cd52d845a55e98a5750f995213e178340
diff --git a/dev-libs/libevdev/libevdev-1.5.1.ebuild b/dev-libs/libevdev/libevdev-1.5.1.ebuild
new file mode 100644
index 000000000000..c602e238d483
--- /dev/null
+++ b/dev-libs/libevdev/libevdev-1.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit python-any-r1 xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}.git"
+
+DESCRIPTION="Handler library for evdev events"
+
+if [[ ${PV} == 9999* ]] ; then
+	SRC_URI=""
+else
+	SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+fi
+
+RESTRICT="test" # Tests need to run as root.
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
diff --git a/dev-python/path-and-address/metadata.xml b/dev-python/path-and-address/metadata.xml
index 097975e3adc2..3743220e59f3 100644
--- a/dev-python/path-and-address/metadata.xml
+++ b/dev-python/path-and-address/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass
index d65f6243f29a..48106d20d93e 100644
--- a/eclass/vdr-plugin-2.eclass
+++ b/eclass/vdr-plugin-2.eclass
@@ -612,15 +612,14 @@ vdr-plugin-2_src_install() {
 	create_header_checksum_file ${vdr_plugin_list}
 	create_plugindb_file ${vdr_plugin_list}
 
-	local commondoc=( README* HISTORY CHANGELOG )
-	for docfile in "${commondoc[@]}"; do
-		if [[ ${EAPI} == "6" ]]; then
-			local DOCS="${DOCS} ${docfile}"
-			[[ -f ${docfile} ]] && einstalldocs "${DOCS[@]}"
-		else
-			[[ -f ${docfile} ]] && dodoc ${docfile}
-		fi
-	done
+	if [[ ${EAPI} != [45] ]]; then
+		einstalldocs
+	else
+		local docfile
+			for docfile in README* HISTORY CHANGELOG; do
+				[[ -f ${docfile} ]] && dodoc ${docfile}
+			done
+	fi
 
 	# if VDR_CONFD_FILE is empty and ${FILESDIR}/confd exists take it
 	[[ -z ${VDR_CONFD_FILE} ]] && [[ -e ${FILESDIR}/confd ]] && VDR_CONFD_FILE=${FILESDIR}/confd
diff --git a/x11-proto/xcb-proto/Manifest b/x11-proto/xcb-proto/Manifest
index 4cbae9fe4d0c..bbe0606a4818 100644
--- a/x11-proto/xcb-proto/Manifest
+++ b/x11-proto/xcb-proto/Manifest
@@ -1,4 +1,5 @@
 DIST xcb-proto-1.10.tar.bz2 138834 SHA256 7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05 SHA512 b979d6432dcb58b5040a460ecb5285c67d288203768e2b6d032acac6593219dda9f29ae95920bc10b1d9451d928e3295f49d8e457b2bfb69d06481219745c6de WHIRLPOOL aa6905d8d402a5900c37ea411a3818820ec19c90250eb8e86b93e901e0a81f102216e7f2603a851365305c07630c91356b0e827ec85359da9eb8d66c73186830
 DIST xcb-proto-1.11.tar.bz2 139213 SHA256 b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e SHA512 13c228d974f99e2f17a7352629b85c76674e395567474997015941780df123f9c809a76935242aaf31b7836b0478bd557e3cc9161dd4880b4fb8eb576216dbc1 WHIRLPOOL 61bac70a6e2945f881460838352190f77550e647531c5076bf926193490cf38e1e97c879a3da95f1253d5783a54a33ccc91afe39badb27a93150eee5660bd5cc
+DIST xcb-proto-1.12.tar.bz2 153890 SHA256 5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906 SHA512 1f427eaf223971b25b56c9f641350e03f5ebeb17a1fc212ce2a0c892de7aba7e53d5e3958b073a122bb344c387c0ff394cf96f542ff046f33de4e1cd27fb9e5c WHIRLPOOL b9189567c3abeb5a3a3a2a4d32ae5c72070601b6c68ff2b06d09be03bd83889f3dd9b499e0eb1bfb0687b74d726a7c825706cf5e7d874b77a7b9b473c9b660df
 DIST xcb-proto-1.8.tar.bz2 125072 SHA256 233d16c7a019235b3092111e7c11429119357eb13754a607b75eea04453121b0 SHA512 181fee36ab4c842b8b3eaa244ff94c31be2488cb24bdb82cc23082b229d1994746c00307dc0a37d00ae0b7c92f804f90f1ad9ba29f4d5134c5c64a4f23c696ab WHIRLPOOL 3d0b394428544660b82b3984a7c707e93987e686678b737fb396404a20f0d8e78e6deae564925bffe917f6a3b573bff936647f2cf9fde80b9c4469dcb2cd6cf0
 DIST xcb-proto-1.9.tar.bz2 136421 SHA256 895afe21793e6e26c5ce999b1900c02a5984c201d96d55cc42c182d3c3bde43c SHA512 063e08e51893302b160f7cbfe75e2319c6c0c7172cae3d1bbda4cb69695e47ce4938ea18679d36eda436bab7ee1cc288e62381d7d6115892e35626bb6ca2607d WHIRLPOOL 60cea257c17bb6d953f7435340cca2102c116ea71b6cdd71773274926e1442b7d72ed36d2cd915ae8b8b4033c6a6f7e8d1d3fae6a80eeb08f9f88ad6815d9b15
diff --git a/x11-proto/xcb-proto/xcb-proto-1.12.ebuild b/x11-proto/xcb-proto/xcb-proto-1.12.ebuild
new file mode 100644
index 000000000000..9b40e83a2c31
--- /dev/null
+++ b/x11-proto/xcb-proto/xcb-proto-1.12.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+XORG_MULTILIB=yes
+
+inherit python-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings protocol headers"
+HOMEPAGE="https://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/proto"
+[[ ${PV} != 9999* ]] && \
+	SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/libxml2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	python_setup
+	xorg-2_src_configure
+}
+
+multilib_src_configure() {
+	autotools-utils_src_configure
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_configure
+	fi
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_compile -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
+}
+
+src_install() {
+	xorg-2_src_install
+
+	# pkg-config file hardcodes python sitedir, bug 486512
+	sed -i -e '/pythondir/s:=.*$:=/dev/null:' \
+		"${ED}"/usr/lib*/pkgconfig/xcb-proto.pc || die
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		python_foreach_impl autotools-utils_src_install -C xcbgen \
+			top_builddir="${BUILD_DIR}"
+	fi
+}