Merge updates from master

80 files changed, 565 insertions, 140 deletions

diff --git a/app-misc/todo/files/todo-2.10-fix-bash-completion.patch b/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
new file mode 100644
index 000000000000..7e6de2f10568
--- /dev/null
+++ b/app-misc/todo/files/todo-2.10-fix-bash-completion.patch
@@ -0,0 +1,12 @@
+--- ./todo_completion	2017-04-08 15:18:23.102736966 +0200
++++ ./todo_completion	2017-04-08 15:18:56.839725605 +0200
+@@ -85,6 +85,9 @@
+ }
+ complete -F _todo todo.sh
+ 
++# Gentoo bug 614400
++complete -F _todo todotxt
++
+ # If you define an alias (e.g. "t") to todo.sh, you need to explicitly enable
+ # completion for it, too:
+ #complete -F _todo t
diff --git a/app-misc/todo/todo-2.10-r1.ebuild b/app-misc/todo/todo-2.10-r1.ebuild
new file mode 100644
index 000000000000..5fa2cd242a92
--- /dev/null
+++ b/app-misc/todo/todo-2.10-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1
+
+DESCRIPTION="A CLI-based TODO list manager"
+HOMEPAGE="http://todotxt.com/"
+SRC_URI="https://github.com/ginatrapani/${PN}.txt-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-shells/bash"
+
+PATCHES=( "${FILESDIR}/${P}-fix-bash-completion.patch" )
+
+S="${WORKDIR}/${PN}.txt-cli-${PV}"
+
+DOCS=( README.textile CONTRIBUTING.md LICENSE todo.cfg )
+
+src_test() {
+	make test || die "tests failed"
+}
+
+src_install() {
+	dobin "${PN}.sh"
+	dosym "/usr/bin/${PN}.sh" "/usr/bin/${PN}txt"
+	newbashcomp "${PN}_completion" "${PN}.sh"
+	bashcomp_alias "${PN}.sh" "${PN}txt"
+	einstalldocs
+}
diff --git a/dev-db/postgis/postgis-2.3.2-r1.ebuild b/dev-db/postgis/postgis-2.3.2-r1.ebuild
index 9dff87e6120d..d2ef921ec507 100644
--- a/dev-db/postgis/postgis-2.3.2-r1.ebuild
+++ b/dev-db/postgis/postgis-2.3.2-r1.ebuild
@@ -124,9 +124,10 @@ src_install() {
 	emake -C topology DESTDIR="${D}" install
 	dobin ./utils/postgis_restore.pl
 
-	dodoc CREDITS TODO loader/README.* doc/*txt
+	DOCS=( CREDITS TODO loader/README.* doc/*txt )
+	use doc && local HTML_DOCS=( doc/html/{images,postgis.html,style.css} )
 
-	use doc && dohtml -r doc/html/*
+	einstalldocs
 
 	docinto topology
 	dodoc topology/{TODO,README}
diff --git a/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild b/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
index 2a0cf4e896a6..b66d19560331 100644
--- a/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-3.2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Haskell 98 bifunctors"
+DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
 HOMEPAGE="https://github.com/ekmett/bifunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild b/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
index ed9c5e77f8c6..d22c9bcd1cee 100644
--- a/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
+++ b/dev-haskell/bifunctors/bifunctors-5.4.1.ebuild
@@ -8,7 +8,7 @@ EAPI=6
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
-DESCRIPTION="Bifunctors"
+DESCRIPTION="Haskell 98 bifunctors, bifoldables and bitraversables"
 HOMEPAGE="https://github.com/ekmett/bifunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild b/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
index e5b348451378..51747e8f6015 100644
--- a/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
+++ b/dev-haskell/juicypixels/juicypixels-3.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ inherit haskell-cabal
 MY_PN="JuicyPixels"
 MY_P="${MY_PN}-${PV}"
 
-DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"
+DESCRIPTION="Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and others)"
 HOMEPAGE="https://github.com/Twinside/Juicy.Pixels"
 SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
 
diff --git a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild b/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
index 141d7595492b..c41a307767c9 100644
--- a/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
+++ b/dev-haskell/kan-extensions/kan-extensions-5.0.1.ebuild
@@ -8,7 +8,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"
+DESCRIPTION="Kan extensions, lifts, forms of the Yoneda lemma, and (co)density (co)monads"
 HOMEPAGE="https://github.com/ekmett/kan-extensions/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/profunctors/profunctors-4.0.4.ebuild b/dev-haskell/profunctors/profunctors-4.0.4.ebuild
index 15b6061a79af..1de24ff2411f 100644
--- a/dev-haskell/profunctors/profunctors-4.0.4.ebuild
+++ b/dev-haskell/profunctors/profunctors-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Profunctors haskell library"
+DESCRIPTION="Haskell 98 Profunctors"
 HOMEPAGE="https://github.com/ekmett/profunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/profunctors/profunctors-4.3.2.ebuild b/dev-haskell/profunctors/profunctors-4.3.2.ebuild
index 01ec6aee8f37..7edb586ae191 100644
--- a/dev-haskell/profunctors/profunctors-4.3.2.ebuild
+++ b/dev-haskell/profunctors/profunctors-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Profunctors haskell library"
+DESCRIPTION="Haskell 98 Profunctors"
 HOMEPAGE="https://github.com/ekmett/profunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/profunctors/profunctors-4.4.1.ebuild b/dev-haskell/profunctors/profunctors-4.4.1.ebuild
index 76ea138133c7..6b785e9654cb 100644
--- a/dev-haskell/profunctors/profunctors-4.4.1.ebuild
+++ b/dev-haskell/profunctors/profunctors-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Profunctors haskell library"
+DESCRIPTION="Haskell 98 Profunctors"
 HOMEPAGE="https://github.com/ekmett/profunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/profunctors/profunctors-5.1.2.ebuild b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
index f52649ef62b8..7abfa7beea16 100644
--- a/dev-haskell/profunctors/profunctors-5.1.2.ebuild
+++ b/dev-haskell/profunctors/profunctors-5.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Profunctors haskell library"
+DESCRIPTION="Haskell 98 Profunctors"
 HOMEPAGE="https://github.com/ekmett/profunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-haskell/profunctors/profunctors-5.2.ebuild b/dev-haskell/profunctors/profunctors-5.2.ebuild
index 2e0c0fb0da9c..44faee7cf0f8 100644
--- a/dev-haskell/profunctors/profunctors-5.2.ebuild
+++ b/dev-haskell/profunctors/profunctors-5.2.ebuild
@@ -8,7 +8,7 @@ EAPI=5
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
-DESCRIPTION="Profunctors"
+DESCRIPTION="Haskell 98 Profunctors"
 HOMEPAGE="https://github.com/ekmett/profunctors/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
index bfdbdfafdfa6..347d5d2bab3f 100644
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A collection of tasks (and at one point maybe types and other tools) for Apache Ant"
+DESCRIPTION="A collection of tasks for Apache Ant"
 HOMEPAGE="http://ant-contrib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
 LICENSE="Apache-2.0"
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
index 7aa5be49916a..d8bb1c4dbd34 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2
 
-DESCRIPTION="An easy-to-use Java logging toolkit designed for secure, performance-oriented logging"
+DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz"
 
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
index bcf9169c2a40..315f0a029bed 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit versionator eutils java-pkg-2 java-ant-2
 MY_PV="$(replace_all_version_separators _)"
 MY_PN="BrowserLauncher2"
 
-DESCRIPTION="BrowserLauncher2 is a library that facilitates opening a browser from a Java application"
+DESCRIPTION="A library that facilitates opening a browser from a Java application"
 HOMEPAGE="http://browserlaunch2.sourceforge.net/"
 SRC_URI="mirror://sourceforge/browserlaunch2/${MY_PN}-all-${MY_PV}.jar"
 
diff --git a/dev-java/classmate/classmate-0.9.0-r1.ebuild b/dev-java/classmate/classmate-0.9.0-r1.ebuild
index 69414a46c387..f6deb6b4e717 100644
--- a/dev-java/classmate/classmate-0.9.0-r1.ebuild
+++ b/dev-java/classmate/classmate-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-pkg-simple vcs-snapshot
 
-DESCRIPTION="Library for introspecting generic type information of types, member/static methods, fields"
+DESCRIPTION="Zero-dependency Java library for accurately introspecting type information"
 HOMEPAGE="https://github.com/cowtowncoder/java-classmate/"
 SRC_URI="https://github.com/cowtowncoder/java-classmate/archive/${P}.tar.gz"
 
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index edc57c6fcb2e..cba93118e2c7 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc examples source test"
 inherit eutils java-pkg-2 java-ant-2
 
 MY_P="${P}-src"
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects within the system"
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
 HOMEPAGE="http://commons.apache.org/digester/"
 SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index f50f842a84f7..e4adb2d2ba0d 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit eutils java-pkg-2 java-ant-2
 
 MY_P="${P}-src"
 
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects within the system"
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
 HOMEPAGE="http://commons.apache.org/digester/"
 SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
index ebdfc5a580c5..c818287d257f 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit eutils java-pkg-2 java-ant-2
 
 MY_P="${PN}3-${PV}-src"
 
-DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects within the system"
+DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
 HOMEPAGE="http://commons.apache.org/digester/"
 SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
index 039cb8b41afa..ee615f821310 100644
--- a/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
+++ b/dev-java/commons-fileupload/commons-fileupload-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit eutils java-pkg-2 java-ant-2
 
-DESCRIPTION="Add robust, high-performance, file upload capability to your servlets and web applications"
+DESCRIPTION="High-performance file upload capability to your servlets and web applications"
 HOMEPAGE="http://commons.apache.org/fileupload/"
 SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
 
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index 59a9f47dbd65..8bbedd3024a2 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2 eutils
 
 MY_P=${P}-src
-DESCRIPTION="Commons-IO contains utility classes, stream implementations, file filters, and endian classes"
+DESCRIPTION="Utility classes, stream implementations, file filters, and endian classes"
 HOMEPAGE="http://commons.apache.org/io/"
 SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
 
diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
index 09827babecab..024eb121b50e 100644
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2.ebuild
@@ -6,7 +6,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2 java-osgi
 
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries"
+DESCRIPTION="An ultra-thin bridge between different Java logging libraries"
 HOMEPAGE="http://commons.apache.org/logging/"
 SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
 
diff --git a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
index f15e3481432b..fd8f96b943c7 100644
--- a/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
+++ b/dev-java/cpptasks/cpptasks-1.0_beta5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source examples"
 
 inherit eutils java-pkg-2 java-ant-2
 
-DESCRIPTION="Ant-tasks to compile various source languages and produce executables, shared and static libraries"
+DESCRIPTION="Ant-tasks to compile various source languages and produce executables"
 HOMEPAGE="http://ant-contrib.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ant-contrib/ant-contrib/${P/_/-}/${P/_beta/b}.tar.gz"
 
diff --git a/dev-java/dynalang/dynalang-0.4-r1.ebuild b/dev-java/dynalang/dynalang-0.4-r1.ebuild
index f54476109572..4978742b5073 100644
--- a/dev-java/dynalang/dynalang-0.4-r1.ebuild
+++ b/dev-java/dynalang/dynalang-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-ant-2
 
 MY_P="${PN}-mop-${PV}"
 
-DESCRIPTION="Library for implementation of interoperable metaobject protocols for dynamic languages"
+DESCRIPTION="Libary of interoperable metaobject protocols for dynamic languages"
 HOMEPAGE="https://sourceforge.net/projects/dynalang/"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_P}.tgz"
 
diff --git a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
index 66c2c3b98b5a..de49d776a308 100644
--- a/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
+++ b/dev-java/easymock-classextension/easymock-classextension-3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 MY_PN=${PN/-}
 MY_P=${MY_PN}-${PV}
-DESCRIPTION="Provides Mock Objects for interfaces in JUnit tests by generating them on the fly"
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
 HOMEPAGE="http://www.easymock.org/"
 SRC_URI="mirror://sourceforge/easymock/EasyMock%20Class%20Extension/${PV}/${MY_P}.zip"
 
diff --git a/dev-java/easymock/easymock-3.3.1.ebuild b/dev-java/easymock/easymock-3.3.1.ebuild
index 21ada349be80..27e4b6061e14 100644
--- a/dev-java/easymock/easymock-3.3.1.ebuild
+++ b/dev-java/easymock/easymock-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc examples source"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Provides Mock Objects for interfaces in JUnit tests by generating them on the fly"
+DESCRIPTION="Mock Objects for interfaces in JUnit tests by generating them on the fly"
 HOMEPAGE="http://www.easymock.org/"
 SRC_URI="mirror://sourceforge/${PN}/EasyMock/${PV}/${P}.zip"
 
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
index 6022a5f62575..c2dd06855a54 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit java-pkg-2 prefix toolchain-funcs
 MY_PN="ecj"
 DMF="R-${PV}-201002111343"
 
-DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
 
diff --git a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
index 55c7dbb07f31..828b293af310 100644
--- a/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit java-pkg-2 prefix toolchain-funcs
 MY_PN="ecj"
 DMF="R-${PV}-201006080911"
 
-DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.zip"
 
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
index 81443014da8f..d29d172ca10f 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit java-pkg-2 prefix toolchain-funcs
 MY_PN="ecj"
 DMF="R-${PV}-201209141800"
 
-DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
diff --git a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
index 06713c71050b..9f3ec5665c73 100644
--- a/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
+++ b/dev-java/ecj-gcj/ecj-gcj-4.4.2.ebuild
@@ -8,7 +8,7 @@ inherit java-pkg-2 prefix toolchain-funcs
 MY_PN="ecj"
 DMF="R-${PV}-201502041700"
 
-DESCRIPTION="A subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
+DESCRIPTION="Subset of Eclipse Compiler for Java compiled by gcj, serving as javac in gcj-jdk"
 HOMEPAGE="http://www.eclipse.org/"
 SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
 
diff --git a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
index fa7d969540b4..3bb647c3d87f 100644
--- a/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
+++ b/dev-java/fastinfoset/fastinfoset-1.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 MY_PN="FastInfoset"
 
-DESCRIPTION="Fast Infoset specifies a standardized binary encoding for the XML Information Sets"
+DESCRIPTION="Specifies a standardized binary encoding for the XML Information Sets"
 HOMEPAGE="https://fi.java.net/"
 SRC_URI="http://search.maven.org/remotecontent?filepath=com/sun/xml/${PN}/${MY_PN}/${PV}/${MY_PN}-${PV}-sources.jar"
 
diff --git a/dev-java/itext/itext-2.1.5-r2.ebuild b/dev-java/itext/itext-2.1.5-r2.ebuild
index aaff82001bab..37eb1af5d233 100644
--- a/dev-java/itext/itext-2.1.5-r2.ebuild
+++ b/dev-java/itext/itext-2.1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -11,7 +11,7 @@ DISTFILE="${PN/it/iT}-src-${PV}.tar.gz"
 ASIANJAR="iTextAsian.jar"
 ASIANCMAPSJAR="iTextAsianCmaps.jar"
 
-DESCRIPTION="A Java library that generate documents in the Portable Document Format (PDF) and/or HTML"
+DESCRIPTION="Generate documents in the Portable Document Format (PDF) and/or HTML"
 HOMEPAGE="http://www.lowagie.com/iText/"
 SRC_URI="mirror://sourceforge/itext/${DISTFILE}
 	cjk? ( mirror://sourceforge/itext/${ASIANJAR}
diff --git a/dev-java/itext/itext-5.5.4-r2.ebuild b/dev-java/itext/itext-5.5.4-r2.ebuild
index 7066e9a8dcd2..42f755b32a85 100644
--- a/dev-java/itext/itext-5.5.4-r2.ebuild
+++ b/dev-java/itext/itext-5.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Java library that generate documents in the Portable Document Format (PDF) and/or HTML."
+DESCRIPTION="Generate documents in the Portable Document Format (PDF) and/or HTML"
 HOMEPAGE="http://itextpdf.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
diff --git a/dev-java/jansi/jansi-1.11-r1.ebuild b/dev-java/jansi/jansi-1.11-r1.ebuild
index a8a394864ae8..521a8813c78f 100644
--- a/dev-java/jansi/jansi-1.11-r1.ebuild
+++ b/dev-java/jansi/jansi-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="source test"
 
 inherit vcs-snapshot java-pkg-2 java-ant-2
 
-DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output"
+DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
 HOMEPAGE="http://jansi.fusesource.org/"
 SRC_URI="https://github.com/fusesource/${PN}/tarball/${PN}-project-${PV} -> ${P}.tar.gz"
 
diff --git a/dev-java/jansi/jansi-1.5-r1.ebuild b/dev-java/jansi/jansi-1.5-r1.ebuild
index 699a458fdfbe..3fdc5527a8dc 100644
--- a/dev-java/jansi/jansi-1.5-r1.ebuild
+++ b/dev-java/jansi/jansi-1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ JAVA_PKG_IUSE="source doc"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output"
+DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
 HOMEPAGE="http://jansi.fusesource.org/"
 SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
 
diff --git a/dev-java/jansi/jansi-1.5.ebuild b/dev-java/jansi/jansi-1.5.ebuild
index 1303c0cd1458..59aef5b8aae7 100644
--- a/dev-java/jansi/jansi-1.5.ebuild
+++ b/dev-java/jansi/jansi-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,7 +6,7 @@ JAVA_PKG_IUSE="source test doc"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Jansi is a small java library that allows you to use ANSI escape sequences in your console output"
+DESCRIPTION="A library that allows you to use ANSI escape sequences in your console output"
 HOMEPAGE="http://jansi.fusesource.org/"
 SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
 
diff --git a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
index 81a073ef7b56..8c31574bdf5e 100644
--- a/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
+++ b/dev-java/jboss-marshalling/jboss-marshalling-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 HOMEPAGE="http://jbossmarshalling.jboss.org/"
 SRC_URI="http://download.jboss.org/jbossmarshalling/jboss-marshalling-${PV}.CR9-sources.jar"
-DESCRIPTION="Alternative compatible serialization API that fixes many JDK serialization API problems"
+DESCRIPTION="Compatible alternative to the JDK serialization API"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-java/jcommon/jcommon-1.0.23.ebuild b/dev-java/jcommon/jcommon-1.0.23.ebuild
index ab28455c5212..208f734743d6 100644
--- a/dev-java/jcommon/jcommon-1.0.23.ebuild
+++ b/dev-java/jcommon/jcommon-1.0.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test"
 inherit java-pkg-2 java-ant-2 versionator
 
 MY_P=${PN}-$(replace_version_separator 3 -)
-DESCRIPTION="JCommon is a collection of useful classes used by JFreeChart, JFreeReport and other projects"
+DESCRIPTION="A collection of useful classes used by JFreeChart, JFreeReport and others"
 HOMEPAGE="http://www.jfree.org/jcommon"
 SRC_URI="mirror://sourceforge/jfreechart/${MY_P}.zip"
 
diff --git a/dev-java/jcs/jcs-2.0.ebuild b/dev-java/jcs/jcs-2.0.ebuild
index 0e10f7e1003b..f79f0dded211 100644
--- a/dev-java/jcs/jcs-2.0.ebuild
+++ b/dev-java/jcs/jcs-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2
 MY_P="commons-${PN}-dist-${PV}-beta-1-src"
 JCS_CORE="commons-${PN}-core"
 
-DESCRIPTION="JCS is a distributed caching system written in Java for server-side Java applications"
+DESCRIPTION="A distributed caching system for server-side Java applications"
 HOMEPAGE="http://commons.apache.org/jcs/"
 SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/commons/${PN}/source/commons-${PN}-dist-${PV}-beta-1-src.tar.gz"
 
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r5.ebuild
index e51381a57480..2aab642dca3e 100644
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="JDepend traverses Java class file directories and generates design quality metrics per package"
+DESCRIPTION="Traverses Java class file directories and generates design quality metrics"
 HOMEPAGE="http://www.clarkware.com/software/JDepend.html"
 SRC_URI="http://www.clarkware.com/software/${P}.zip"
 
diff --git a/dev-java/jisp/jisp-2.5.1-r3.ebuild b/dev-java/jisp/jisp-2.5.1-r3.ebuild
index c7d1c35ca3cf..6577ef618f4d 100644
--- a/dev-java/jisp/jisp-2.5.1-r3.ebuild
+++ b/dev-java/jisp/jisp-2.5.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple eutils
 
-DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine written in Pure Java"
+DESCRIPTION="Java Indexed Serialization Package: A small, embedded database engine"
 HOMEPAGE="http://www.coyotegulch.com/products/jisp/"
 
 # TODO contact upstream about hosting jisp-2.5 on their site.
diff --git a/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
index fa4541f84f2d..104f130ffd4f 100644
--- a/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
+++ b/dev-java/jreleaseinfo/jreleaseinfo-1.3.0-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Ant Task for build-time creation of Java source file with version, build number or other info"
-HOMEPAGE="http://${PN}.sourceforge.net/"
+DESCRIPTION="Ant Task for build-time creation of Java source file with version or other info"
+HOMEPAGE="http://jreleaseinfo.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/jvmstat/jvmstat-3.0.ebuild b/dev-java/jvmstat/jvmstat-3.0.ebuild
index 9ca317db9bdc..9e79f7c6a476 100644
--- a/dev-java/jvmstat/jvmstat-3.0.ebuild
+++ b/dev-java/jvmstat/jvmstat-3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit java-pkg-2 versionator
 
 MY_PV=$(replace_version_separator 1 '_')
-DESCRIPTION="Monitoring APIs and tools for monitoring the performance of the JVM in production environments"
+DESCRIPTION="Monitoring APIs and tools for monitoring the performance of the JVM"
 HOMEPAGE="http://java.sun.com/performance/jvmstat/"
 SRC_URI="jvmstat-${MY_PV}.zip"
 
diff --git a/dev-java/lucene/lucene-3.5.0.ebuild b/dev-java/lucene/lucene-3.5.0.ebuild
index 85cc9362c52a..0a804109766c 100644
--- a/dev-java/lucene/lucene-3.5.0.ebuild
+++ b/dev-java/lucene/lucene-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -9,8 +9,7 @@ JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="High-performance, full-featured text search engine library
-written entirely in Java"
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
 HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2.ebuild
index ecdf10a6fac8..a760e4fc1978 100644
--- a/dev-java/lucene/lucene-3.6.2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -9,8 +9,7 @@ JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="High-performance, full-featured text search engine library
-written entirely in Java"
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
 HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
 LICENSE="Apache-2.0"
diff --git a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
index 29d94eb20569..a58472f400d9 100644
--- a/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
+++ b/dev-java/lzmajio/lzmajio-0.95-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-pkg-simple
 
-DESCRIPTION="Implementations of LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
+DESCRIPTION="LzmaInputStream/LzmaOutputStream interacting with underlying LZMA en-/decoders"
 HOMEPAGE="http://contrapunctus.net/league/haques/lzmajio/"
 SRC_URI="http://comsci.liu.edu/~league/dist/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
diff --git a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
index e025d3c7ba4d..53243b83e508 100644
--- a/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
+++ b/dev-java/nailgun/nailgun-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="a client, protocol, and server for running Java apps without incurring the JVM startup overhead"
+DESCRIPTION="A client, protocol and server for running without incurring JVM startup overhead"
 HOMEPAGE="http://martiansoftware.com/nailgun/index.html"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
 
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
index 5815d2967900..44d1a7d3625f 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2
 
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+DESCRIPTION="Async event-driven framework for high performance network applications"
 HOMEPAGE="http://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
diff --git a/dev-java/netty-common/netty-common-4.0.21.ebuild b/dev-java/netty-common/netty-common-4.0.21.ebuild
index 9c01ccf4c53f..188eed46074b 100644
--- a/dev-java/netty-common/netty-common-4.0.21.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-pkg-simple
 
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+DESCRIPTION="Async event-driven framework for high performance network applications"
 HOMEPAGE="http://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
diff --git a/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
index de1a597cf723..d026de50d1c4 100644
--- a/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2
 
 MY_PN="netty"
 MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Async event-driven framework for rapid development of high performance network applications"
+DESCRIPTION="Async event-driven framework for high performance network applications"
 HOMEPAGE="http://netty.io/"
 SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_P}.Final.tar.gz"
 
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
index 563f4fdaf798..b0cee2e06355 100644
--- a/dev-java/prefuse/prefuse-20071021_beta.ebuild
+++ b/dev-java/prefuse/prefuse-20071021_beta.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ inherit java-pkg-2 java-ant-2
 
 MY_PV=${PV/_beta/}
 MY_P=${PN}-beta-${MY_PV}
-DESCRIPTION="UI toolkit for building highly interactive visualizations of structured and unstructured data"
+DESCRIPTION="UI toolkit for building highly interactive visualizations of un-/structured data"
 SRC_URI="mirror://sourceforge/prefuse/${MY_P}.zip"
 HOMEPAGE="http://prefuse.org"
 LICENSE="BSD"
diff --git a/dev-java/rome/rome-0.9-r2.ebuild b/dev-java/rome/rome-0.9-r2.ebuild
index bdeb19f9bd88..bcd44fc160d4 100644
--- a/dev-java/rome/rome-0.9-r2.ebuild
+++ b/dev-java/rome/rome-0.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="Open source Atom/RSS Java utilities that make it easy to work in Java with most syndication formats"
+DESCRIPTION="Java framework for RSS and Atom feeds"
 HOMEPAGE="https://java.net/projects/rome"
 SRC_URI="https://rome.dev.java.net/source/browse/*checkout*/rome/www/dist/${P}-src.zip"
 LICENSE="Apache-2.0"
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
index 1c913ecc1d14..952d9e55d464 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2 eutils
 
-DESCRIPTION="A WBEM services client that includes an IETF RFC 2614 compliant SLP client for CIM service discovery"
+DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
 HOMEPAGE="http://sblim.wiki.sourceforge.net/CimClient"
 SRC_URI="mirror://sourceforge/sblim/${PN}2-${PV}-src.zip"
 
diff --git a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
index 458a49941128..93c55739e841 100644
--- a/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
+++ b/dev-java/sblim-cim-client/sblim-cim-client-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A WBEM services client that includes an IETF RFC 2614 compliant SLP client for CIM service discovery"
+DESCRIPTION="A WBEM services client that includes an SLP client for CIM service discovery"
 HOMEPAGE="http://sblim.wiki.sourceforge.net/CimClient"
 SRC_URI="mirror://sourceforge/sblim/${PN}2-${PV}-src.zip"
 
diff --git a/dev-java/spring-aop/spring-aop-3.2.4.ebuild b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
index f4a57be18c20..66f482a9c876 100644
--- a/dev-java/spring-aop/spring-aop-3.2.4.ebuild
+++ b/dev-java/spring-aop/spring-aop-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A comprehensive programming and configuration model for modern Java-based enterprise applications"
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
 HOMEPAGE="http://www.springsource.org/spring-framework"
 SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
 		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
diff --git a/dev-java/spring-beans/spring-beans-3.2.4.ebuild b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
index 466cd5490056..faa27415ff95 100644
--- a/dev-java/spring-beans/spring-beans-3.2.4.ebuild
+++ b/dev-java/spring-beans/spring-beans-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A comprehensive programming and configuration model for modern Java-based enterprise applications"
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
 HOMEPAGE="http://www.springsource.org/spring-framework"
 SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
 		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
diff --git a/dev-java/spring-core/spring-core-3.2.4.ebuild b/dev-java/spring-core/spring-core-3.2.4.ebuild
index fdf900c684cf..6d952cd9bc70 100644
--- a/dev-java/spring-core/spring-core-3.2.4.ebuild
+++ b/dev-java/spring-core/spring-core-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ WANT_ANT_TASKS="dev-java/jarjar:1 dev-java/ant-junit:0"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A comprehensive programming and configuration model for modern enterprise applications"
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
 HOMEPAGE="http://www.springsource.org/spring-framework"
 SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
 		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
diff --git a/dev-java/spring-expression/spring-expression-3.2.4.ebuild b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
index 2d366ebdddd9..28c4fb285110 100644
--- a/dev-java/spring-expression/spring-expression-3.2.4.ebuild
+++ b/dev-java/spring-expression/spring-expression-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A comprehensive programming and configuration model for modern Java-based enterprise applications"
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
 HOMEPAGE="http://www.springsource.org/spring-framework"
 SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
 		https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
diff --git a/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
index f72e963f9e7c..5e393cf162e4 100644
--- a/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
+++ b/dev-java/spring-instrument/spring-instrument-3.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A comprehensive programming and configuration model for modern Java-based enterprise applications"
+DESCRIPTION="A comprehensive programming and configuration model for enterprise applications"
 HOMEPAGE="http://www.springsource.org/spring-framework"
 SRC_URI="https://github.com/SpringSource/spring-framework/archive/v${PV}.RELEASE.tar.gz -> spring-framework-${PV}.tar.gz
 	https://dev.gentoo.org/~ercpe/distfiles/dev-java/spring-framework/spring-framework-${PV}-buildscripts.tar.bz2"
diff --git a/dev-java/stax/stax-1.2.0.ebuild b/dev-java/stax/stax-1.2.0.ebuild
index bbe00fb8a693..3e2a0d3857f9 100644
--- a/dev-java/stax/stax-1.2.0.ebuild
+++ b/dev-java/stax/stax-1.2.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="A standard XML processing API that allows you to stream XML data from and to your application"
+DESCRIPTION="A standard XML processing API that allows you to stream XML data"
 HOMEPAGE="http://stax.codehaus.org/"
 SRC_URI="http://dist.codehaus.org/${PN}/distributions/${PN}-src-${PV}.zip"
 
diff --git a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
index d6a1f17070fe..4966ca743969 100644
--- a/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
+++ b/dev-java/sun-jmx/sun-jmx-1.2.1-r3.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc examples"
 inherit java-pkg-2
 
 MY_P=jmx-${PV//./_}
-DESCRIPTION="Java Management Extensions for managing and monitoring devices, applications, and services"
+DESCRIPTION="Java Management Extensions for managing and monitoring"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/tech/javamanagement-140525.html"
 SRC_URI="${MY_P}-ri.zip"
 
diff --git a/dev-java/xalan/xalan-2.7.2.ebuild b/dev-java/xalan/xalan-2.7.2.ebuild
index f3784c03970d..f0dcb822cd5c 100644
--- a/dev-java/xalan/xalan-2.7.2.ebuild
+++ b/dev-java/xalan/xalan-2.7.2.ebuild
@@ -17,7 +17,7 @@ MY_P="${MY_PN}_${MY_PV}"
 SRC_DIST="${MY_P}-src.tar.gz"
 BIN_DIST="${MY_P}-bin.zip"
 
-DESCRIPTION="Apache's XSLT processor for transforming XML documents into HTML, text, or other XML document types"
+DESCRIPTION="Transforming XML documents into HTML, text, or other XML document types"
 HOMEPAGE="http://xalan.apache.org/"
 SRC_URI="mirror://apache/${PN}/${MY_PN}/source/${SRC_DIST}
 	doc? ( mirror://apache/${PN}/${MY_PN}/binaries/${BIN_DIST} )"
diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild b/dev-java/xerces/xerces-2.11.0-r1.ebuild
index 54739f5f82e1..ba148040517c 100644
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils versionator java-pkg-2 java-ant-2
 
 DIST_PN="Xerces-J"
 SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
 HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
 SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
index d0881708a70a..005197c35e05 100644
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ b/dev-java/xerces/xerces-2.11.0.ebuild
@@ -9,7 +9,7 @@ inherit eutils versionator java-pkg-2 java-ant-2
 
 DIST_PN="Xerces-J"
 SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family"
+DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
 HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
 SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
 
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
index c19fdaa61e34..3fc2c0064d0b 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.3.04.ebuild
@@ -5,7 +5,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP"
+DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
 HOMEPAGE="http://xml.apache.org/commons/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 # upstream source tar.gz is missing build.xml and other stuff, so we get it like this
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
index 8e5aeae38d73..5ac7fc5228ee 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="An Apache-hosted set of externally-defined standards interfaces, namely DOM, SAX, and JAXP"
+DESCRIPTION="Externally-defined set of standard interfaces, namely DOM, SAX, and JAXP"
 HOMEPAGE="http://xml.apache.org/commons/"
 SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
 # upstream source tar.gz is missing build.xml and other stuff, so we get it like this
diff --git a/dev-lang/confluence/confluence-0.10.6.ebuild b/dev-lang/confluence/confluence-0.10.6.ebuild
index 4fe4a15e4dbb..2743ff5f6152 100644
--- a/dev-lang/confluence/confluence-0.10.6.ebuild
+++ b/dev-lang/confluence/confluence-0.10.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
 
 inherit eutils
 
-DESCRIPTION="Functional programming language for reactive system design (digital logic, hard-real-time software)"
+DESCRIPTION="Functional programming language for reactive system design"
 HOMEPAGE="http://www.funhdl.org/wiki/doku.php?id=confluence"
 SRC_URI="http://www.funhdl.org/download/${P}.tar.gz"
 
diff --git a/dev-lang/erlang/erlang-17.5.ebuild b/dev-lang/erlang/erlang-17.5.ebuild
index 5e377fa13a8b..f2c7821224ef 100644
--- a/dev-lang/erlang/erlang-17.5.ebuild
+++ b/dev-lang/erlang/erlang-17.5.ebuild
@@ -9,7 +9,7 @@ inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionato
 # NOTE: If you need symlinks for binaries please tell maintainers or
 # open up a bug to let it be created.
 
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
+DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
 HOMEPAGE="http://www.erlang.org/"
 SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
 	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
diff --git a/dev-lang/gprolog/gprolog-1.4.4.ebuild b/dev-lang/gprolog/gprolog-1.4.4.ebuild
index e121637f98a5..7116f2c8c4db 100644
--- a/dev-lang/gprolog/gprolog-1.4.4.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
 inherit eutils flag-o-matic multilib
 
-DESCRIPTION="GNU Prolog is a native Prolog compiler with constraint solving over finite domains (FD)"
+DESCRIPTION="A native Prolog compiler with constraint solving over finite domains (FD)"
 HOMEPAGE="http://www.gprolog.org/"
 SRC_URI="mirror://gnu/gprolog/${P}.tar.gz"
 S="${WORKDIR}"/${P}
diff --git a/dev-lang/parrot/parrot-7.1.0.ebuild b/dev-lang/parrot/parrot-7.1.0.ebuild
index e4ac48c365be..21858f8b882d 100644
--- a/dev-lang/parrot/parrot-7.1.0.ebuild
+++ b/dev-lang/parrot/parrot-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils multilib
 # weird failures
 RESTRICT="test"
 
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
 HOMEPAGE="http://www.parrot.org/"
 SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
 
diff --git a/dev-lang/parrot/parrot-7.11.0.ebuild b/dev-lang/parrot/parrot-7.11.0.ebuild
index 8c805442553c..e81e39db8695 100644
--- a/dev-lang/parrot/parrot-7.11.0.ebuild
+++ b/dev-lang/parrot/parrot-7.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils multilib
 # weird failures
 RESTRICT="test"
 
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
 HOMEPAGE="http://www.parrot.org/"
 SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
 
diff --git a/dev-lang/parrot/parrot-7.5.0.ebuild b/dev-lang/parrot/parrot-7.5.0.ebuild
index 8c805442553c..e81e39db8695 100644
--- a/dev-lang/parrot/parrot-7.5.0.ebuild
+++ b/dev-lang/parrot/parrot-7.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils multilib
 # weird failures
 RESTRICT="test"
 
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
 HOMEPAGE="http://www.parrot.org/"
 SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
 
diff --git a/dev-lang/parrot/parrot-8.1.0.ebuild b/dev-lang/parrot/parrot-8.1.0.ebuild
index 8c805442553c..e81e39db8695 100644
--- a/dev-lang/parrot/parrot-8.1.0.ebuild
+++ b/dev-lang/parrot/parrot-8.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ inherit eutils multilib
 # weird failures
 RESTRICT="test"
 
-DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+DESCRIPTION="Virtual machine designed to compile and execute bytecode for dynamic languages"
 HOMEPAGE="http://www.parrot.org/"
 SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/all/${PV}/${P}.tar.gz"
 
diff --git a/dev-python/pyptlib/pyptlib-0.0.6.ebuild b/dev-python/pyptlib/pyptlib-0.0.6.ebuild
index d45e10a0fb2d..a5195aa22f60 100644
--- a/dev-python/pyptlib/pyptlib-0.0.6.ebuild
+++ b/dev-python/pyptlib/pyptlib-0.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
 IUSE="doc examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e65a3628ff22..755456d09c48 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,2 +1,3 @@
 DIST webkitgtk-2.14.5.tar.xz 13956352 SHA256 3ca8f1c33a9b43d6c753dcac1c0788656930e06382b10fdf5c2805ea8f96369f SHA512 3351d9b05458434835fa2db050c34906649c3b1222d7936d123306634a46e35e8cc3aa1bb7512b103af1996fce722254692826b6f695e32ae176032dc8c94e1c WHIRLPOOL 011745e5e1f8926b28b34ac797480b3c79ccfcf09d844d076d8cf3087959013f39f359d7a7ef06a8e95ca7e04d28284ff4901e483180d2a41b4b05568b658e74
+DIST webkitgtk-2.16.1.tar.xz 14675996 SHA256 eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945 SHA512 4b8de15644d0d0f9814c674020cbbab8628347915b8010977dbe2365ce276ea05b3bf86171400ae8eb5bfdebbadcfabd1efce34a177b5c82aa765bd3351e7010 WHIRLPOOL c9deacbd229804aaaba88f9fcabdcde1a460430bb60258dfc8d7393723401d7e74d645ba8bf2dcf60e87c30739e45558b747911a4671a8950efe271cb7b86586
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
diff --git a/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch b/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch
new file mode 100644
index 000000000000..506696fcc7a9
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.16.1-avoid-perl-ithreads.patch
@@ -0,0 +1,88 @@
+From 1ac17bea2273df0dfec21897b00efb8351648e1b Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sun, 9 Apr 2017 04:10:52 +1200
+Subject: Remove need for threaded perl at expense of being single-threaded
+
+This could theoretically be implemented with forks, but I opted not
+to because its too hard, and the platform specifics are too messy.
+
+This could theoretically also have support for automatic detection
+as to which strategy to use based on OS/availability, but the
+implementation details of that are too much for my pateience today.
+
+In an ideal world, this file would support:
+
+1. Single threaded builds for spartans
+2. Forked builds for people who are on linux but don't want to rebuild
+   their perl just to have threads ( which produce negligible benefit
+   and measurable performance penalties to all code )
+3. Threaded builds for people who are on windows where forks may not
+   be entirely sane.
+
+But #1 is good enough atm.
+
+This is important for Gentoo, because end users decide on their own
+choices with regards to threading support for perl, and threading
+support is off by default due to the performance issues mentioned in #2
+in conjunction with the fact that "threads" is officially discouraged
+by Perl Upstream.
+
+And as Gentoo users have to have a system Perl to compile WebkitGTK,
+this means installing WebkitGTK requires rebuilding their system Perl
+with threads.
+
+And this *also* means that all packages presently compiled against Perl
+become broken, because non-threaded perl and threaded perl are not ABI
+compatible with each other, and this can scale into hundreds of
+packages and significant transient breakage.
+
+This ends up in practice being *far* *worse* in terms of time wasted
+than the mediocre time inefficiency created by needing a single
+threaded build.
+---
+ Source/WebCore/bindings/scripts/generate-bindings-all.pl | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/Source/WebCore/bindings/scripts/generate-bindings-all.pl b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
+index 37b27cc74..b3a378df0 100755
+--- a/Source/WebCore/bindings/scripts/generate-bindings-all.pl
++++ b/Source/WebCore/bindings/scripts/generate-bindings-all.pl
+@@ -32,9 +32,6 @@ use File::Basename;
+ use File::Spec;
+ use File::Find;
+ use Getopt::Long;
+-use threads;
+-use threads::shared;
+-use Thread::Queue;
+ 
+ my $perl = $^X;
+ my $scriptDir = $FindBin::Bin;
+@@ -121,13 +118,11 @@ my @idlFilesToUpdate = grep &{sub {
+                 implicitDependencies($depFile));
+     needsUpdate(\@output, \@deps);
+ }}, @idlFiles;
+-my $queue = Thread::Queue->new(@idlFilesToUpdate);
+-my $abort :shared = 0;
+-my $totalCount = @idlFilesToUpdate;
+-my $currentCount :shared = 0;
+ 
+-my @threadPool = map { threads->create(\&worker) } (1 .. $numOfJobs);
+-$_->join for @threadPool;
++my $abort = 0;
++my $totalCount = @idlFilesToUpdate;
++my $currentCount = 0;
++worker();
+ exit $abort;
+ 
+ sub needsUpdate
+@@ -158,7 +153,7 @@ sub mtime
+ }
+ 
+ sub worker {
+-    while (my $file = $queue->dequeue_nb()) {
++    while (my $file = shift @idlFilesToUpdate) {
+         last if $abort;
+         eval {
+             $currentCount++;
+-- 
+2.12.2
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
new file mode 100644
index 000000000000..704307fbecb7
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.16.1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+CMAKE_MAKEFILE_GENERATOR="ninja"
+PYTHON_COMPAT=( python2_7 )
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
+
+# webgl needs gstreamer, bug #560612
+REQUIRED_USE="
+	geolocation? ( introspection )
+	gles2? ( egl )
+	introspection? ( gstreamer )
+	nsplugin? ( X )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	webgl? ( gstreamer )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+RDEPEND="
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.36:2
+	dev-libs/hyphen
+	>=dev-libs/icu-3.8.1-r1:=
+	>=dev-libs/libxml2-2.8:2
+	>=dev-libs/libxslt-1.1.7
+	>=media-libs/fontconfig-2.8:1.0
+	>=media-libs/freetype-2.4.2:2
+	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
+	>=media-libs/libpng-1.4:0=
+	media-libs/libwebp:=
+	dev-libs/libgcrypt:0=
+	>=net-libs/libsoup-2.42:2.4[introspection?]
+	>=x11-libs/cairo-1.10.2:=
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	>=x11-libs/pango-1.30.0
+	virtual/jpeg:0=
+
+	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
+	egl? ( media-libs/mesa[egl] )
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gnome-keyring? ( app-crypt/libsecret )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2.3:1.0
+		>=media-libs/gst-plugins-base-1.2.3:1.0
+		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
+	libnotify? ( x11-libs/libnotify )
+	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
+	opengl? ( virtual/opengl
+		x11-libs/cairo[opengl] )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
+	webgl? (
+		x11-libs/cairo[opengl]
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+	X? (
+		x11-libs/cairo[X]
+		>=x11-libs/gtk+-3.14:3[X]
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+		x11-libs/libXt )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=dev-lang/perl-5.10
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	dev-lang/perl
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	geolocation? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+PATCHES=(
+	# https://bugs.gentoo.org/show_bug.cgi?id=555504
+	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=564352
+	# https://bugs.webkit.org/show_bug.cgi?id=167283
+	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
+
+	# Avoid perl[ithreads] build time requirement as that would be very very messy
+	"${FILESDIR}"/${PV}-avoid-perl-ithreads.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++11 ; then
+			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
+		fi
+
+		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
+			die 'The active compiler needs to be gcc 4.9 (or newer)'
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+
+	# We try to use gold when possible for this package
+#	if ! tc-ld-is-gold ; then
+#		append-ldflags "-Wl,--reduce-memory-overheads"
+#	fi
+
+	# older glibc needs this for INTPTR_MAX, bug #533976
+	if has_version "<sys-libs/glibc-2.18" ; then
+		append-cppflags "-D__STDC_LIMIT_MACROS"
+	fi
+
+	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	local ruby_interpreter=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
+	else
+		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# FTL_JIT requires llvm
+	#
+	# opengl needs to be explicetly handled, bug #576634
+
+	local opengl_enabled
+	if use opengl || use gles2; then
+		opengl_enabled=ON
+	else
+		opengl_enabled=OFF
+	fi
+
+	# support for webgl (aka 2d-canvas accelerating)
+	local canvas_enabled
+	if use webgl && ! use gles2 ; then
+		canvas_enabled=ON
+	else
+		canvas_enabled=OFF
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_GTKDOC=$(usex doc)
+		-DENABLE_GEOLOCATION=$(usex geolocation)
+		$(cmake-utils_use_find_package gles2 OpenGLES2)
+		-DENABLE_GLES2=$(usex gles2)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JIT=$(usex jit)
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_WEBGL=$(usex webgl)
+		$(cmake-utils_use_find_package egl EGL)
+		$(cmake-utils_use_find_package opengl OpenGL)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DENABLE_OPENGL=${opengl_enabled}
+		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
+		-DCMAKE_BUILD_TYPE=Release
+		-DPORT=GTK
+		${ruby_interpreter}
+	)
+
+	# Allow it to use GOLD when possible as it has all the magic to
+	# detect when to use it and using gold for this concrete package has
+	# multiple advantages and is also the upstream default, bug #585788
+#	if tc-ld-is-gold ; then
+#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
+#	else
+#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
+#	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_test() {
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
+	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
+}
diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.11.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.11.ebuild
index 9f54305f00da..bb304485f875 100644
--- a/net-proxy/obfsproxy/obfsproxy-0.2.11.ebuild
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
 
 DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )
 
diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.12.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.12.ebuild
index 9f54305f00da..bb304485f875 100644
--- a/net-proxy/obfsproxy/obfsproxy-0.2.12.ebuild
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
 
 DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )
 
diff --git a/net-proxy/obfsproxy/obfsproxy-0.2.13.ebuild b/net-proxy/obfsproxy/obfsproxy-0.2.13.ebuild
index 9f54305f00da..bb304485f875 100644
--- a/net-proxy/obfsproxy/obfsproxy-0.2.13.ebuild
+++ b/net-proxy/obfsproxy/obfsproxy-0.2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~x86"
 
 DOCS=( ChangeLog INSTALL README TODO doc/HOWTO.txt )