Merge updates from master

21 files changed, 104 insertions, 476 deletions

diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 2647fd70775d..6b3841522a0e 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,3 +1,2 @@
-DIST pyzor-0.5.0.tar.bz2 40654 SHA256 2bf3df9e916861063a73f7b46cb8b27bac6f661fce1362803de9e7921fc155ba SHA512 048c81e373be217808f4e4e8f6adbc1b464891b725b3004031dfa7a82abe234b080c3a87bc9ad61ee1df2bfb78ed0ee78565b49843f09243f72b6315df6877a1 WHIRLPOOL 966090015bfe93d4ef059a1186e97705807769f9341e94a2f5d9c223540effac04209a32cad850c6f405225c00aea55bdf7ac5a6a98e0927824d641ee61e5c80
 DIST pyzor-0.7.0.tar.bz2 78555 SHA256 6d9ca62bd4aa9a0210adb9d4c8ff2b38bb2cd051f1517ce29e88d7fbe4b1026d SHA512 40026fc0276b4cf60fe7dfe30e2d4d4d1f220cf860b8aaef9d983e632a7d87bc8deb3430ded7520a69269ef56550117735a6e3c8d046d4cad7066f8597ead3cd WHIRLPOOL dd8466477e38362fa0a64ec66822ae3820c22f8ae13b40002145b1e688d17c17edfb800eb44679ff961e74b667daa43ef09d8eadb92f683c9e73c9b00fad23b9
 DIST pyzor-1.0.0.tar.gz 126276 SHA256 548bc461c01e790cf8db1f26d9f66b281f3aa3cf5f5a6fd647071360ed663ef1 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a WHIRLPOOL ad92ca30c116b1c22cc49b5643ecb03880ef1911d7f2a59cf9b655ccd5fa5167e0ccdb890d92754ed1b1c0730785c186f6615c569b6bbbc36aed26e2423037b1
diff --git a/dev-python/pyzor/files/pyzor-0.5.0-python26_warnings.patch b/dev-python/pyzor/files/pyzor-0.5.0-python26_warnings.patch
deleted file mode 100644
index 671b994b3a2f..000000000000
--- a/dev-python/pyzor/files/pyzor-0.5.0-python26_warnings.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-# Description: Fix python2.6 deprecation warnings
-# Origin: Ubuntu
-# Author: Alessio Treglia <quadrispro@ubuntu.com>
-# Bug-Ubuntu: https://bugs.launchpad.net/bugs/394775
-diff -Nur -x '*.orig' -x '*~' pyzor-0.5.0/lib/pyzor/client.py pyzor-0.5.0.new/lib/pyzor/client.py
---- pyzor-0.5.0/lib/pyzor/client.py	2009-04-29 22:53:50.000000000 +0200
-+++ pyzor-0.5.0.new/lib/pyzor/client.py	2009-08-01 12:27:55.749263645 +0200
-@@ -10,7 +10,7 @@
- import tempfile
- import mimetools
- import multifile
--import sha
-+import hashlib
- 
- import pyzor
- from pyzor import *
-@@ -402,12 +402,12 @@
-         del p2
- 
-         saltfile = open(randfile)
--        salt = saltfile.read(sha.digest_size)
-+        salt = saltfile.read(hashlib.sha1().digest_size)
-         del saltfile
- 
--        salt_digest = sha.new(salt)
-+        salt_digest = hashlib.sha1(salt)
- 
--        pass_digest = sha.new()
-+        pass_digest = hashlib.sha1()
-         pass_digest.update(salt_digest.digest())
-         pass_digest.update(p1)
-         sys.stdout.write("salt,key:\n")
-@@ -498,7 +498,7 @@
-         if len(offsets) == 0:
-             return
- 
--        self._digest = sha.new()
-+        self._digest = hashlib.sha1()
- 
-         if len(offsets) <= self.atomic_num_lines:
-             self.handle_atomic(fp)
-diff -Nur -x '*.orig' -x '*~' pyzor-0.5.0/lib/pyzor/__init__.py pyzor-0.5.0.new/lib/pyzor/__init__.py
---- pyzor-0.5.0/lib/pyzor/__init__.py	2009-04-29 22:53:50.000000000 +0200
-+++ pyzor-0.5.0.new/lib/pyzor/__init__.py	2009-08-01 12:28:20.268413580 +0200
-@@ -8,7 +8,7 @@
- import os.path
- import re
- import sys
--import sha
-+import hashlib
- import tempfile
- import random
- import ConfigParser
-@@ -114,7 +114,7 @@
- 
- class DataDigest(str):
-     # hex output doubles digest size
--    value_size = sha.digest_size * 2
-+    value_size = hashlib.sha1().digest_size * 2
- 
-     def __init__(self, value):
-         if len(value) != self.value_size:
-@@ -285,7 +285,7 @@
-         """returns a digest object"""
-         typecheck(msg, Message)
- 
--        return sha.new(str(msg))
-+        return hashlib.sha1(str(msg))
- 
-     hash_msg = staticmethod(hash_msg)
- 
-@@ -295,7 +295,7 @@
-         typecheck(key, long)
-         typecheck(user, Username)
- 
--        return sha.new("%s:%x" % (Username, key)).hexdigest().lower()
-+        return hashlib.sha1("%s:%x" % (Username, key)).hexdigest().lower()
- 
-     hash_key = staticmethod(hash_key)
- 
-@@ -316,7 +316,7 @@
- 
-         h_msg = self.hash_msg(msg)
- 
--        return sha.new("%s:%d:%s" % (h_msg.digest(), ts, hashed_key)).hexdigest().lower()
-+        return hashlib.sha1("%s:%d:%s" % (h_msg.digest(), ts, hashed_key)).hexdigest().lower()
- 
-     sign_msg = classmethod(sign_msg)
- 
diff --git a/dev-python/pyzor/files/pyzord_getopt.patch b/dev-python/pyzor/files/pyzord_getopt.patch
deleted file mode 100644
index 42b6fe4339f6..000000000000
--- a/dev-python/pyzor/files/pyzord_getopt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/pyzord.orig	2002-09-08 06:33:44.000000000 +0300
-+++ scripts/pyzord	2007-07-06 01:31:06.000000000 +0300
-@@ -52,7 +52,11 @@
- # functions above, run below
- 
- debug = 0
--(options, args) = getopt.getopt(sys.argv[1:], 'dh:', ['homedir='])
-+try:
-+    (options, args) = getopt.getopt(sys.argv[1:], 'hd', ['help','homedir='])
-+except getopt.GetoptError, err:
-+    print str(err)
-+    usage()
- if len(args) != 0:
-     usage()
- 
-@@ -61,7 +65,7 @@
- for (o, v) in options:
-     if o == '-d':
-         debug = 1
--    elif o == '-h':
-+    elif o in ('-h', '--help'):
-         usage()
-     elif o == '--homedir':
-         specified_homedir = v
diff --git a/dev-python/pyzor/pyzor-0.5.0-r2.ebuild b/dev-python/pyzor/pyzor-0.5.0-r2.ebuild
deleted file mode 100644
index bc8c5e836217..000000000000
--- a/dev-python/pyzor/pyzor-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="gdbm"
-PYTHON_USE_WITH_OPT="pyzord"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="A distributed, collaborative spam detection and filtering network"
-HOMEPAGE="http://pyzor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="pyzord"
-
-DEPEND=""
-RDEPEND=""
-
-DOCS="THANKS UPGRADING"
-
-src_prepare() {
-	epatch "${FILESDIR}/pyzord_getopt.patch"
-	epatch "${FILESDIR}/${P}-python26_warnings.patch"
-
-	# rfc822BodyCleanerTest doesn't work fine.
-	# Remove it until it's fixed.
-	sed -i \
-		-e '/rfc822BodyCleanerTest/,/self\.assertEqual/d' \
-		unittests.py || die "sed in unittest.py failed"
-}
-
-src_test() {
-	testing() {
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" unittests.py
-	}
-	python_execute_function testing
-}
-
-src_install () {
-	distutils_src_install
-
-	dohtml docs/usage.html
-	rm -rf "${ED}usr/share/doc/pyzor"
-
-	if use pyzord; then
-		dodir /usr/sbin
-		mv "${ED}"usr/bin/pyzord* "${ED}usr/sbin"
-	else
-		rm "${ED}"usr/bin/pyzord*
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	if use pyzord; then
-		ewarn "/usr/bin/pyzord has been moved to /usr/sbin"
-	fi
-}
diff --git a/dev-vcs/bzr/bzr-2.5.1.ebuild b/dev-vcs/bzr/bzr-2.5.1.ebuild
deleted file mode 100644
index 0a82112c1b8d..000000000000
--- a/dev-vcs/bzr/bzr-2.5.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="threads ssl"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.* 2.7-pypy-*"
-
-inherit bash-completion-r1 distutils eutils versionator
-
-MY_P=${PN}-${PV}
-SERIES=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bazaar is a next generation distributed version control system"
-HOMEPAGE="http://bazaar-vcs.org/"
-#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
-SRC_URI="https://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="curl doc +sftp test"
-
-RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree )
-	curl? ( dev-python/pycurl )
-	sftp? ( dev-python/paramiko )"
-
-DEPEND="test? (
-		${RDEPEND}
-		>=dev-python/pyftpdlib-0.7.0
-		dev-python/subunit
-		>=dev-python/testtools-0.9.5
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="doc/*.txt"
-PYTHON_MODNAME="bzrlib"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Don't regenerate .c files from .pyx when pyrex is found.
-	epatch "${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch"
-
-	epatch "${FILESDIR}/${P}-sphinx-test-failures.patch"
-}
-
-src_test() {
-	# Some tests expect the usual pyc compiling behaviour.
-	python_enable_pyc
-
-	# Define tests which are known to fail below.
-	local skip_tests="("
-	# https://bugs.launchpad.net/bzr/+bug/850676
-	skip_tests+="per_transport.TransportTests.test_unicode_paths.*"
-	skip_tests+=")"
-	if [[ -n ${skip_tests} ]]; then
-		einfo "Skipping tests known to fail: ${skip_tests}"
-	fi
-
-	testing() {
-		LC_ALL="C" "$(PYTHON)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
-	}
-	python_execute_function testing
-
-	# Just to make sure we don't hit any errors on later stages.
-	python_disable_pyc
-}
-
-src_install() {
-	distutils_src_install --install-data "${EPREFIX}/usr/share"
-
-	if use doc; then
-		docinto developers
-		dodoc -r doc/developers/* || die
-		for doc in mini-tutorial tutorials user-{guide,reference}; do
-			docinto ${doc}
-			dodoc -r doc/en/${doc}/* || die
-		done
-	fi
-
-	dobashcomp contrib/bash/bzr || die
-}
diff --git a/dev-vcs/qbzr/Manifest b/dev-vcs/qbzr/Manifest
index ea7b4687ff6f..bd2d00cff485 100644
--- a/dev-vcs/qbzr/Manifest
+++ b/dev-vcs/qbzr/Manifest
@@ -1,2 +1 @@
-DIST qbzr-0.23.0.tar.gz 808036 SHA256 7e66f2cdb3b38e83ecb99ae2934fe42e9c137273a06d54f66aa76da8a06bef58 SHA512 c1f26ef0db8db48e5b05cb6164bac08f33746983df85dba9e359a78dffbf05f18f67788f0d0e7b42deb530cf5a31cd9284752946ee00731c1e7559a0dcc4a071 WHIRLPOOL f925a7d49fc6f8702a921731090abd44192ab88a9a1c28d1e37d7ea94fc1550a13c0c7204f0328225bd71c481653afd7846e2b92401e2de246f7b2753baffa81
 DIST qbzr-0.23.1.tar.gz 817769 SHA256 3211adef11c975dfbb6c80285651e2e6f3bfa99f1baa1a95371e8490ea8ff441 SHA512 05d05c2cf5e94d4a58d88d04bd3dd4ff13d977126d728683273990801733bc0dfb07388838e466117961a83c6e08454b7a8bdaca975ca19f7ecff729d97b4bd2 WHIRLPOOL 359f23ccaee972652c535ca238e7ee1a6781b5bc348aa291105bc1bb1211c98b2ebdf78d81d89659d6ff8c523ee3fcea9102a3a83f18c3e0a5b677b304a739b2
diff --git a/dev-vcs/qbzr/qbzr-0.23.0.ebuild b/dev-vcs/qbzr/qbzr-0.23.0.ebuild
deleted file mode 100644
index c26d7f7ab694..000000000000
--- a/dev-vcs/qbzr/qbzr-0.23.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils versionator
-
-DESCRIPTION="Qt frontend for Bazaar"
-HOMEPAGE="https://launchpad.net/qbzr"
-SRC_URI="https://edge.launchpad.net/qbzr/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-# bzr version comes from NEWS file. It's lowest version required for some
-# features to work.
-DEPEND=">=dev-vcs/bzr-2.5
-		>=dev-python/PyQt4-4.1[X]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-DOCS="AUTHORS.txt NEWS.txt README.txt TODO.txt"
-PYTHON_MODNAME="bzrlib/plugins/qbzr"
-
-src_test() {
-	elog "It's impossible to run tests at this point. If you wish to run tests"
-	elog "after installation of ${PN} execute:"
-	elog " $ bzr selftest -s bzrlib.plugins.qbzr"
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	elog
-	elog "To enable spellchecking in qcommit, please, install >=dev-python/pyenchant-1.5.0"
-	elog " # emerge -a >=dev-python/pyenchant-1.5.0"
-	elog "To enable syntax highlighting, please, install dev-python/pygments"
-	elog " # emerge -a dev-python/pygments"
-}
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index f8ea81b5ac87..1b49f66f5f00 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -153,8 +153,9 @@ fi
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The tag name or commit identifier to check out. If unset, newest
-# commit from the branch will be used. If set, EGIT_BRANCH will
-# be ignored.
+# commit from the branch will be used. Note that if set to a commit
+# not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which
+# the commit is available.
 #
 # It can be overriden via env using ${PN}_LIVE_COMMIT variable.
 
@@ -162,7 +163,8 @@ fi
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # Attempt to check out the repository state for the specified timestamp.
-# The date should be in format understood by 'git rev-list'.
+# The date should be in format understood by 'git rev-list'. The commits
+# on EGIT_BRANCH will be considered.
 #
 # The eclass will select the last commit with commit date preceding
 # the specified date. When merge commits are found, only first parents
diff --git a/kde-frameworks/kpeople/kpeople-5.32.0.ebuild b/kde-frameworks/kpeople/kpeople-5.32.0.ebuild
index 53de778c7e3b..535579b77d11 100644
--- a/kde-frameworks/kpeople/kpeople-5.32.0.ebuild
+++ b/kde-frameworks/kpeople/kpeople-5.32.0.ebuild
@@ -29,3 +29,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!net-libs/kpeople:5
 "
+
+src_test() {
+	# bug: 612504
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/licenses/Xerox b/licenses/Xerox
new file mode 100644
index 000000000000..9460a3262acd
--- /dev/null
+++ b/licenses/Xerox
@@ -0,0 +1,39 @@
+IMPORTANT PLEASE READ CAREFULLY BEFORE USING THIS PRODUCT:  THIS SOFTWARE LICENSE AGREEMENT ("Agreement") CONTAINS THE LICENSE TERMS AND CONDITIONS FOR THE XEROX SOFTWARE AND RELATED DOCUMENTATION (collectively "Software").
+
+IF YOU DOWNLOAD, INSTALL OR USE THE SOFTWARE, YOU AGREE TO BE LEGALLY BOUND BY THE FOLLOWING TERMS AND CONDITIONS.  IF YOU DO NOT ACCEPT THESE LICENSE TERMS YOU MAY NOT DOWNLOAD, INSTALL OR USE THE SOFTWARE AND YOU MUST DELETE ANY SOFTWARE FILES ACCESSED BY YOU OR A THIRD PARTY ON YOUR BEHALF FROM ANY AND ALL COMPUTER MEMORY INTO WHICH SUCH SOFTWARE HAS BEEN LOADED OR STORED.
+
+When used in this agreement the term "Xerox" shall mean Xerox Corporation, its operating companies, subsidiaries and affiliates.
+
+If you are installing the Software on behalf of the end user you must agree that you are acting as an agent of the end user customer before proceeding.  As agent for the end user you hereby agree that you have either; 1) read and agree to the terms of this Agreement as authorized by the end user, or 2) you have made the end user aware of the license terms and the end user has explicitly accepted them.
+
+1.  LICENSE GRANT.
+a.  Xerox grants to you a non-exclusive, non-transferable license to use the Software on the Xerox-brand equipment ("Equipment") on which it was delivered or, if delivered separately, on a single item of equipment.  You have no other rights to the Software and may not: (1) distribute, copy, modify, create derivatives of, decompile, or reverse engineer Software; (2) activate Software delivered in an inactivated state; or (3) allow others to engage in same.  You may make archival or back-up copies of the Software, provided each copy contains all of the copyright and other proprietary notices contained on the original Software and such copies and is used only for back-up purposes.  Title to, and all intellectual property rights in, Software will reside solely with Xerox and/or its licensors who will be considered third-party beneficiaries of this Agreement with rights of enforcement.
+b.  Software may include or incorporate software provided by Microsoft Corporation ("Microsoft Software").  In addition to all other terms and conditions of this Agreement, the following applies to Your installation and use of Microsoft Software.  You may not: (i) sell, lease, loan, sublicense, or use the Microsoft Software for commercial software hosting services; (ii) publish any benchmark results for the Microsoft Software; (iii) work around any technical limitations in the  Microsoft Software; or (iv) separate components of the Microsoft Software and install them on different pieces of equipment.
+
+2.  THIRD PARTY SOFTWARE.  The Software may include code developed by one or more third parties ("Third Party Software").  Some Third Party Software may be subject to other terms and conditions that may be found in an open source software disclosure package provided with the Software or available for download with the product documentation.  Notwithstanding the terms and conditions of this Agreement, the Third Party Software is licensed to you subject to the terms and conditions of the software license agreement identified in the open source software disclosure.  If the third party terms and conditions include licenses that provide for the availability of source code (such as the GNU General Public License), the open source software disclosure or the media on which the Software may be delivered will contain the source code or provide instructions where a copy of such source code can be obtained.
+
+3.  DISCLAIMER OF WARRANTY.
+a.	YOU ACKNOWLEDGE AND AGREE THAT THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND BY XEROX OR ITS LICENSORS.  XEROX AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, WHETHER CREATED BY STATUTE OR OTHERWISE, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY OR NON-INFRINGEMENT OF THIRD-PARTY RIGHTS.  XEROX AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL MEET YOUR PARTICULAR REQUIREMENTS, THAT IT WILL OPERATE UNINTERRUPTED OR ERROR FREE, OR THAT DEFECTS IN THE SOFTWARE CAN OR WILL BE CORRECTED.  ALL WARRANTIES AND REPRESENTATIONS MADE BY PERSONS OTHER THAN XEROX, INCLUDING, BUT NOT LIMITED TO, YOUR AUTHORIZED SERVICE PROVIDER, DISTRIBUTORS, DEALERS, CONCESSIONAIRES AND OTHER RESELLERS OF XEROX, ARE ALSO DISCLAIMED.  THE WARRANTY DISCLAIMERS SET FORTH HEREIN MAY NOT APPLY IN CERTAIN JURISDICTIONS, IN WHICH CASE THE WARRANTEES HEREUNDER SHALL BE THE MINIMUM REQUIRED BY LAW.
+b.	Software may contain, or be modified to contain, computer code capable of automatically disabling proper operation or functioning of Software and/or the system upon which it is installed.  Such disabling code may be activated (a) if Xerox is denied access to the Software and/or the system as provided herein, (b) you otherwise breach any term of this Agreement, or (c) such license is terminated or expires.
+
+4.  INDEMNIFICATION.  Xerox will pay any settlement agreed to by Xerox or any final judgment for, any claim that Software infringes a third party's valid United States patent or copyright, provided that you promptly notify Xerox in writing of any alleged infringement, allow Xerox to direct the defense, and fully cooperate with Xerox.  Xerox is not responsible for any non-Xerox litigation expenses or settlements unless Xerox agrees to them in writing.  To avoid infringement, even if not alleged, Xerox may, at its option, and at no charge to you, either obtain a license, provide a replacement for the Software or remove or request that you remove the Software.  Xerox's obligations under this section are further conditioned on you immediately removing and ceasing use of the Software in the event that Xerox requests that you remove the Software and/or provides a replacement.  Xerox will not be liable for any infringement-related liability outside the scope of this section, including, without limitation, infringement based upon the Software being modified to your specifications or due to the Software being used in combination with equipment, software or supplies not provided by Xerox.
+
+5.  LIMITATION OF LIABILITY.  Notwithstanding any damages that you might incur, the entire liability of Xerox and its licensors under this Agreement and your exclusive remedy will be limited to the greater of the amount actually paid by you for the Software or U.S. $10.00.  IN NO EVENT WILL XEROX OR ITS LICENSORS BE LIABLE TO YOU FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCUDING BUT NOT LIMITED TO DAMAGES RELATED TO DATA LOSS, LOST PROFITS OR BUSINESS INTERRUPTION) IN ANY WAY ARISING OUT OF OR RELATING TO THE SUBJECT MATTER OF THIS AGREEMENT, EVEN IF XEROX OR ITS LICENSORS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND EVEN IF THE ABOVE REMEDY FAILS OF ITS ESSENTIAL PURPOSE.  THE LIMITATIONS OF LIABILITY SET FORTH HEREIN MAY NOT APPLY IN CERTAIN JURISDICTIONS AND THUS MAY NOT APPLY TO YOU; IN SUCH CASES, XEROX'S AND ITS LICENSORS' LIABILITY HEREUNDER SHALL BE THE MINIMUM REQUIRED BY LAW.
+
+6.  TERMINATION.  Xerox may terminate your license for the Software (i) immediately if you no longer use or possess the equipment with which the Software was provided or are a lessor of the equipment with which the Software was provided and your first lessee no longer uses or possesses it, (ii) upon the termination of any agreement under which you have rented or leased the equipment with which the Software was provided, or (iii) immediately in the event of a breach by you.  If terminated as provided above, you shall return to Xerox all copies of the Software, and remove same from all equipment into which such Software may have been loaded by you.
+
+7.  The Software is provided with Restricted Rights.  You agree to meet all requirements necessary to ensure that the Federal Government will honor such rights.  Disclosure, use or reproduction of the Software and accompanying documentation are subject to restrictions set forth in the Commercial Computer-Restricted Rights clause at Federal Acquisition Regulation 52.227-19, when applicable, or in the Department of Defense Federal Acquisition Regulations Supplement 252.227-7013.
+
+8.  SEVERABLILITY.  If any provision of this Agreement is held invalid by any law, rule, order or regulation of any government, or by the final determination of any state or federal court, such invalidity will not affect the enforceability of any other provisions not held to be invalid. In the event any provision hereof is declared by competent authority to be invalid, illegal or unenforceable under any applicable law, to the extent permissible under applicable law, any such invalid, illegal or unenforceable provision shall be deemed amended lawfully to conform to the intent of the Parties.
+
+9.  NO WAIVER.  Any delay or omission by either party to exercise any right or remedy under this Agreement will not be construed to be a waiver of any such right or remedy or any other right or remedy.  All of the rights of either party under this Agreement will be cumulative and may be exercised separately or concurrently.
+
+10.  GOVERNING LAW.  This Agreement shall be construed in accordance with the laws of the State of New York, without regard to its choice of laws provisions, and disputes shall be adjudicated or otherwise decided in the forums therefor located in the State of New York.  The United Nation Convention on Contracts for International Sales of Goods shall not apply to this Agreement.  Local law may require that certain laws of your country of residence apply to some sections of this Agreement, including but not limited to, requiring this Agreement to be governed by the laws of your country of residence.
+
+11.  EXPORT.  You will not export or re-export the Software without appropriate United States or foreign government licenses or for any purpose prohibited by any applicable export control laws.
+
+12.  ENTIRE AGREEMENT.  This Agreement constitutes the entire agreement between the parties in connection with the subject matter hereof, and supersedes all prior agreements, understandings, negotiations and discussions, whether oral or written, between the parties.  No amendment to or modification of this Agreement will be binding unless it is in writing and signed by a duly authorized representative of each of the parties.
+
+13.  REMOTE SERVICES. Certain models of Equipment are supported and serviced using data that is automatically collected by Xerox or transmitted to or from Xerox by the Equipment connected to Customer's network ("Remote Data") via electronic transmission to a secure off-site location ("Remote Data Access"). Remote Data Access also enables Xerox to transmit to Customer Releases for Software and to remotely diagnose and modify Equipment to repair and correct malfunctions. Examples of Remote Data include product registration, meter read, supply level, Equipment configuration and settings, software version, and problem/fault code data. Remote Data may be used by Xerox for billing, report generation, supplies replenishment, support services, recommending additional products and services, and product improvement/development purposes. Remote Data will be transmitted to and from Customer in a secure manner specified by Xerox. Remote Data Access will not allow Xerox to read, view or download the content of any Customer documents or other information residing on or passing through the Equipment or Customer's information management systems. Customer grants the right to Xerox, without charge, to conduct Remote Data Access for the purposes described above. Upon Xerox's request, Customer will provide contact information for Equipment such as name and address of Customer contact and IP and physical addresses/locations of Equipment. Customer will enable Remote Data Access via a method prescribed by Xerox, and Customer will provide reasonable assistance to allow Xerox to provide Remote Data Access. Unless Xerox deems Equipment incapable of Remote Data Access, Customer will ensure that Remote Data Access is maintained at all times maintenance or support services are being provided.
+
+14.  DIAGNOSTIC SOFTWARE.   Software used to evaluate or maintain Xerox equipment ("Diagnostic Software") may be embedded in, reside on, or may be loaded onto Xerox equipment. The Diagnostic Software and method of entry or access to it constitute valuable trade secrets of Xerox. Title to Diagnostic Software shall at all times remain solely with Xerox and/or its licensors. You agree that (a) your acquisition of the equipment does not grant you a license or right to use Diagnostic Software in any manner, and (b) that unless separately licensed by Xerox to do so, you will not access, use, reproduce, distribute, or disclose Diagnostic Software for any purpose (or allow third parties to do so). You agree at all times to allow Xerox to access, monitor, and otherwise take steps to prevent unauthorized use or reproduction of Diagnostic Software and to remove or disable Diagnostic Software.
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 5a47fe539f00..16e020eb6161 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -1,2 +1,3 @@
 DIST pnmixer-0.6_pre20111213.tar.xz 131328 SHA256 aa42180145aa56639440168935a8b16c576e6e49db0bbe2955b79a890437f013 SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4 WHIRLPOOL 1fe36a5ea212447212bbd9b6b4efee22e1f75fbb0f2c0548447c0987664d94524e306e2942f6e96c6f10cf6bf15abc35df6b7953d63ef8ec2241eef3d627c16d
 DIST pnmixer-0.7.1_rc1.tar.gz 234636 SHA256 eb9d617476291423adf90dccb8b99fdb0fc6321720bcbc44082fcfd2d143dffc SHA512 778ba6abd7efacfb1a49ad67f4370113d37b1b78bf0e73c26141edf56fce94dca2426919e54068b1c648f912bc2a6d30ac3a7c5bb620bc0d33e5af8e1ef6dabc WHIRLPOOL b3d1c45fae5cffbcabf02a225feae778b0de02aa137716e42fa5de1f1e697d22a759b03a08b3e45453097e6eaa0c612c6df47f241c4835a823f9ce5b5cd186c2
+DIST pnmixer-0.7.1_rc2.tar.gz 234921 SHA256 a0beadbad159e8451689e8753481764375fbcb4c8ff01f45b81204a033fc92c1 SHA512 e35de36967145765a909ddea384497ebc348d19a293c0764d9d5697d1a0fcab1404ad06cb728d7af58190984bfd935902696a02cb311c0a00bb0da740adaa3fd WHIRLPOOL ce163c857ea28a3f7879853069c321824a7c02f90f32e9503e7cf82cc6f8353e932faf0227435ea528178e0f05151430d45388c2f5b507275fc9903ba1912ff7
diff --git a/media-sound/pnmixer/pnmixer-0.7.1_rc2.ebuild b/media-sound/pnmixer/pnmixer-0.7.1_rc2.ebuild
new file mode 100644
index 000000000000..82a15fc35dd5
--- /dev/null
+++ b/media-sound/pnmixer/pnmixer-0.7.1_rc2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Volume mixer for the system tray"
+HOMEPAGE="https://github.com/nicklan/pnmixer"
+SRC_URI="https://github.com/nicklan/pnmixer/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-3.12:3
+	x11-libs/libX11
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${PV/_rc/-rc}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_LIBNOTIFY="$(usex libnotify)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/orbited/Manifest b/net-misc/orbited/Manifest
deleted file mode 100644
index c4fbcc995e06..000000000000
--- a/net-misc/orbited/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST orbited-0.7.10.tar.gz 168647 SHA256 71e7627a485fbb6184bb0b4c894ee4dcc74cc970d04888f908d0ca2dec69332d SHA512 6783bbe687a5191f773e723f068651a6cd55baa39a825dfa16e27b3c51a39f32dcef04f61b2b58756514ee99e39c1cbe450ae24e5d3835e95ace9b59403b9376 WHIRLPOOL 588ede0193a2e6f04453568974a6ec59216f2b6fbd625dc3e7c134131c10ec2e5901f5136f20ea6d683504593c2e6ce432501953714f82b8533f7708ff1434d5
diff --git a/net-misc/orbited/files/orbited.cfg b/net-misc/orbited/files/orbited.cfg
deleted file mode 100644
index 5379c47999e0..000000000000
--- a/net-misc/orbited/files/orbited.cfg
+++ /dev/null
@@ -1,42 +0,0 @@
-# Example Orbited Configuration file
-
-[global]
-reactor=select
-# reactor=kqueue
-# reactor=epoll
-session.ping_interval = 40
-session.ping_timeout = 30
-# once the sockets are open, orbited will drop its privileges to this user.
-user=orbited
-
-[listen]
-http://:8000
-#stomp://:61613
-# uncomment to enable SSL on port 8043 using given .key and .crt files
-#https://:8043
-#
-#[ssl]
-#key=orbited.key
-#crt=orbited.crt
-
-[static]
-
-[access]
-localhost:8000 -> irc.freenode.net:6667
-* -> localhost:4747
-#* -> localhost:61613
-
-[logging]
-debug=STDERR,debug.log
-info=STDERR,info.log
-access=STDERR,info.log
-warn=STDERR,error.log
-error=STDERR,error.log
-
-#Don't enable debug by default
-enabled.default=info,access,warn,error
-
-# Turn debug on for the "Proxy" logger
-[loggers]
-#Proxy=debug,info,access,warn,error
-
diff --git a/net-misc/orbited/files/orbited.init b/net-misc/orbited/files/orbited.init
deleted file mode 100644
index 09cce6b454ef..000000000000
--- a/net-misc/orbited/files/orbited.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-	use dns
-}
-
-checkconfig() {
-	if [ ! -f "/etc/orbited.cfg" ] ; then
-		eerror "No /etc/orbited.cfg file exists!"
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting orbited..."
-	/usr/bin/orbited --config=/etc/orbited.cfg >/dev/null 2>&1 &
-	pid=$!
-	echo $pid > /var/run/orbited.pid
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping orbited..."
-	start-stop-daemon --stop --quiet --pidfile=/var/run/orbited.pid --retry 20
-	eend $?
-}
-
diff --git a/net-misc/orbited/metadata.xml b/net-misc/orbited/metadata.xml
deleted file mode 100644
index 1bda22449e9f..000000000000
--- a/net-misc/orbited/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="pypi">orbited</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/orbited/orbited-0.7.10-r1.ebuild b/net-misc/orbited/orbited-0.7.10-r1.ebuild
deleted file mode 100644
index 24d034a60048..000000000000
--- a/net-misc/orbited/orbited-0.7.10-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-DESCRIPTION="Real-time communication for the browser"
-HOMEPAGE="http://orbited.org"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/demjson
-	>=dev-python/morbid-0.8.4
-	dev-python/stomper
-	dev-python/twisted-core
-	dev-python/twisted-web"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	distutils_src_install
-	insinto /etc
-	doins "${FILESDIR}/orbited.cfg" || die
-	newinitd "${FILESDIR}/orbited.init" orbited || die
-}
diff --git a/net-misc/orbited/orbited-0.7.10-r3.ebuild b/net-misc/orbited/orbited-0.7.10-r3.ebuild
deleted file mode 100644
index 1dc48b378fdd..000000000000
--- a/net-misc/orbited/orbited-0.7.10-r3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Real-time communication for the browser."
-HOMEPAGE="http://orbited.org"
-SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/demjson[${PYTHON_USEDEP}]
-	>=dev-python/morbid-0.8.4[${PYTHON_USEDEP}]
-	dev-python/stomper[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	distutils-r1_src_install
-	insinto /etc
-	doins "${FILESDIR}/orbited.cfg"
-	newinitd "${FILESDIR}/orbited.init" orbited
-}
diff --git a/net-print/xerox-drivers/xerox-drivers-0_p20080123.ebuild b/net-print/xerox-drivers/xerox-drivers-0_p20080123.ebuild
index ce64657fccf6..f0568f08794c 100644
--- a/net-print/xerox-drivers/xerox-drivers-0_p20080123.ebuild
+++ b/net-print/xerox-drivers/xerox-drivers-0_p20080123.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -8,11 +8,14 @@ MY_PN="LinuxCupsPrinterPkg"
 DESCRIPTION="PPD files of XEROX printers (CopyCentre, DocuPrint, Phaser, WorkCentre) for CUPS printing system"
 HOMEPAGE="http://www.support.xerox.com/go/getfile.asp?objid=61334&prodID=6180"
 SRC_URI="http://download.support.xerox.com/pub/drivers/DocuColor_2006/drivers/unix/en/${MY_PN}.tar.gz"
-LICENSE="public-domain"
+
+LICENSE="Xerox"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
+RESTRICT="bindist fetch"
+
 DEPEND=""
 RDEPEND="net-print/cups"
 
diff --git a/profiles/license_groups b/profiles/license_groups
index 8e9ad6acb651..36ef128af286 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 dotnet-eula ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome googleearth Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER CROSSOVER-2 CYANA DOOM3 dotnet-eula ETQW FAH-EULA-2009 FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome googleearth Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MSjdbcEULA40 MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs skype-4.0.0.7-copyright spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant Xerox
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index ad88255e2ad5..647fe7aea4ab 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -271,11 +271,6 @@ games-puzzle/kiki
 # Bug#609668. Removal in 30 days.
 dev-libs/engine_pkcs11
 
-# Michał Górny <mgorny@gentoo.org> (17 Feb 2017)
-# Reported to be broken. Last real upstream activity in 2011 with
-# a quick hack-fix in 2013. Removal in 30 days. Bug #591506.
-net-misc/orbited
-
 # Mart Raudsepp <leio@gentoo.org> (16 Feb 2017)
 # Old gstreamer 0.10 version, which is security vulnerable.
 # Use gstreamer:1.0 with media-plugins/gst-plugins-libav