Merge updates from master

9 files changed, 0 insertions, 59 deletions

diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
index 2ef9685d6f49..432eb99250c0 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,2 +1 @@
-DIST pydf_10.tar.gz 13430 SHA256 71be682c86a352afbafcf612cbc236f6f5810d80635685869a9c9b320203e241 SHA512 d8bf8a0a6e70fc02c5ff97844c224cc49036cc27bd01c50330dd3aa898e036d995952c8f83b84c3ccaa28753504fa1ef664f354190ffc127e67ea413ae90906b WHIRLPOOL 2bc7a137c600bf080052716b6a3e59546a2e79308810540472047471481d6a4174d8093b3ad15df8fe9d36d3c28b5c59ef48355bf7d74db8b2e00b27fa745677
 DIST pydf_12.tar.gz 14207 SHA256 860029145e42f3484fa647c42966c236d90cba0221681dbf5f48257b6c5b8c92 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0 WHIRLPOOL 0e5ac13af4ed1ecf8aa4b6c203fc7309032692c2b4dc1e029a4c8897d7430be58bf3ef7cea549e2432142586dc76b42fcb790a90cc9b61fe68ee860d720200b9
diff --git a/app-admin/pydf/metadata.xml b/app-admin/pydf/metadata.xml
index dd3ef91c68ee..097975e3adc2 100644
--- a/app-admin/pydf/metadata.xml
+++ b/app-admin/pydf/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/app-admin/pydf/pydf-10-r1.ebuild b/app-admin/pydf/pydf-10-r1.ebuild
deleted file mode 100644
index f63627c1acad..000000000000
--- a/app-admin/pydf/pydf-10-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 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} )
-inherit python-r1
-
-DESCRIPTION="Enhanced df with colors"
-HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"
-SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s:/etc/pydfrc:${EPREFIX}/etc/pydfrc:" pydf || die
-}
-
-src_install() {
-	python_foreach_impl python_doscript pydf
-	insinto /etc
-	doins pydfrc
-	doman pydf.1
-	dodoc README
-}
diff --git a/app-arch/lrzip/metadata.xml b/app-arch/lrzip/metadata.xml
index d058e2831bdc..f2cca87293a8 100644
--- a/app-arch/lrzip/metadata.xml
+++ b/app-arch/lrzip/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>yngwin@gentoo.org</email>
-  </maintainer>
   <longdescription>
     This is a compression program optimised for large files. The larger the
     file and the more memory you have, the better the compression advantage
diff --git a/app-arch/xar/metadata.xml b/app-arch/xar/metadata.xml
index 3f12544c133d..ec4b0dfe3fdf 100644
--- a/app-arch/xar/metadata.xml
+++ b/app-arch/xar/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>yngwin@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 	The XAR project aims to provide an easily extensible archive format.
     Important design decisions include an easily extensible XML table of
diff --git a/games-board/stockfish/metadata.xml b/games-board/stockfish/metadata.xml
index 29cc4835be07..cae58169f594 100644
--- a/games-board/stockfish/metadata.xml
+++ b/games-board/stockfish/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-  </maintainer>
   <use>
     <flag name="armv7">Build for armv7; enables PIE</flag>
     <flag name="general-32">Generic unoptimized 32-bits build</flag>
diff --git a/sys-kernel/ck-sources/metadata.xml b/sys-kernel/ck-sources/metadata.xml
index 090f5e276494..3357f8585a52 100644
--- a/sys-kernel/ck-sources/metadata.xml
+++ b/sys-kernel/ck-sources/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>yngwin@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="bfsonly">BFS by itself vs the full ck patchset</flag>
     <flag name="experimental">Allow experimental code. Can break or degrade
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index b93050a01ad2..30f3a7330e7a 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -5,11 +5,6 @@
 	<email>tetromino@gentoo.org</email>
 	<name>Alexandre Rostovtsev</name>
   </maintainer>
-  <maintainer type="person">
-    <email>yngwin@gentoo.org</email>
-    <name>Ben de Groot</name>
-	<description>Secondary maintainer (x11 team is primary)</description>
-  </maintainer>
   <maintainer type="project">
     <email>x11@gentoo.org</email>
     <name>X11</name>
diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml
index fc62d74940fd..add378847a17 100644
--- a/x11-misc/kaqaz/metadata.xml
+++ b/x11-misc/kaqaz/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>yngwin@gentoo.org</email>
-		<name>Ben de Groot</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>