diff --git a/app-arch/unrar/unrar-5.3.11.ebuild b/app-arch/unrar/unrar-5.3.11.ebuild
index c3f2ff65a235..50a619213178 100644
--- a/app-arch/unrar/unrar-5.3.11.ebuild
+++ b/app-arch/unrar/unrar-5.3.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~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 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-forensics/chkrootkit/chkrootkit-0.50.ebuild b/app-forensics/chkrootkit/chkrootkit-0.50.ebuild
index d7a1a9f22971..9e39e661803b 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.50.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.50.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="+cron"
RDEPEND="cron? ( virtual/cron )"
diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild
index 22b5004a174a..493cc50c828a 100644
--- a/dev-db/mariadb/mariadb-10.0.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.25.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
PATCHES=(
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild
index dace3dc96388..25ef8b8c2010 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild
index b3d29e3f6ad2..f9c37ba874a1 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.5.1.ebuild
index 9aa46b3f7e18..cae4bbda60d8 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.5.5.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.5.5.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index fb5f7307a761..9aee87fc3187 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,19 +4,19 @@ DIST git-2.6.6.tar.xz 3822260 SHA256 8d53410d60f9c36b0f34c125076634d068c8d812f41
DIST git-2.7.3-00-9831e92bfa833ee9c0ce464bbc2f941ae6c2698d-lose-name-path.patch 28198 SHA256 b6bf7d67b9cc4d34550a10933af63b665b136b869dbbe23ad3ece0d463f027f9 SHA512 3fd64b0d6b53d5b08b791195e6edc162db682fc8a1bafc04aab7a7a4e61e2db4b3b84d9f769e0d7756da2739bdd900e30a233c228706c39817e42e309c36684c WHIRLPOOL 7e1d9337d46222ea4ae2164429a6a220adb0f763bdde6722c0f2adf79789e092f5cfb74b932597b8d3971af4fc27dede1fea51b9cb72b44ec8e30bd78bdaaa8d
DIST git-2.7.3.tar.xz 3909636 SHA256 89c467912d4740da2b40288f956251f0a1e276e28eecd28a6d776067103629b6 SHA512 f7acbf52d12f39d323bd90a82c7135aa2aacf2661f7087c71b41dbfbec688342e0a2fc061fc0f216848a538a0dbc4fce68e24ea2a26e747f5eb92f763fa5bc72 WHIRLPOOL 5cc261749f91c2e0b0509d2fac1bc7426b3ddcc37e859d4f524838e1dd471071ad430886751933bae57aafc20bdcf3f9a43f4c018cc9c89610134a5203b22447
DIST git-2.7.4.tar.xz 3909636 SHA256 dee574defbe05ec7356a0842ddbda51315926f2fa7e39c2539f2c3dcc52e457b SHA512 82a646140834e909bf1748a017e86f37f0711c759fe0a6ad03529beb57c79742cb7bf77c2dba29ccd84fcf3d5f18ad9c85c00f002d3b257be42e058750423da7 WHIRLPOOL 74532038b6ba95a5354f43ebad00a9c159c495d46e7dc1b8a2a59f5a86e149538190d9800144a719dcc00e28cfea1039cd5dbfb67fd5aac5e7d0998d3231bae3
-DIST git-2.8.1.tar.xz 3970056 SHA256 e6626b43ba4bc63ad4918df4c275f50bd7f8af2ab54bde60496ad75e91e927fc SHA512 67846ac7815a08b79c67007af411220ec96d5f54c77dcec602f602b87ae50c590d743fe35e6cfb67196ab28a892c383c21b57d4a3dfab30a2bf67ca29f848c3c WHIRLPOOL 6c348360d8f04797bb78a9a694ffbe30eb9d691645aa33a59fab53825f6b7a6c62415fb52b64d19cb189ccbe4a6d4593e779f5721484921a760872abf1b19d70
DIST git-2.8.2.tar.xz 3972444 SHA256 ec0283d78a0f1c8408c5fd43610697b953fbaafe4077bb1e41446a9ee3a2f83d SHA512 61c77138c9f29068fc639292f1d4a0119c065aa1267b9e615f90466a15ab5a23e8c1e04fb1032df0a3a5862ec1335d526927a54c02a19efe77267595f7d1cd85 WHIRLPOOL 540d4bafbe7bdf6af8089825ec80d4397eba5d2f651cf20c32457e2d214572779fdbb42921ef7f50a03fa4f0e2bd761a2c2d34642a56f058ef63624573d1d81e
+DIST git-2.8.3.tar.xz 3979536 SHA256 7d8e6c274a88b4a73b3c98c70d3438ec12871300ce8bb4ca179ea19fcf74aa91 SHA512 747b6927700ab47648746f61984588a040ec0bda6db218e1c0a86cb443846fc3efd4875758bab9b1004d6239f285ce546f7df0b9d189177d77b0f8ba62776ad2 WHIRLPOOL fe4c6eb3fc038ed1a7c0b21f1accdf954240abc72760b54d36c472730153ea0cf5da2694929c973e19a2edd654ad6cc0d62ccff5a48d2877bc001b802fef58a4
DIST git-htmldocs-2.4.11.tar.xz 997132 SHA256 2764af41b319f4d11b29832de4bd05392f2887d9a1d3c56c864fb081920eac97 SHA512 d5d2abae9cc303fe8ebeb72ae7078d44db94610d549ca03afffcbbef8b611efda662677423d9ff97a0c7a2384bbd4c3468b01a2ecd7b68f4fdc89e62ad688eb4 WHIRLPOOL 66cd4fc754be7c103ca58a030d4799ba988792419a426e85a39805172e6329ec617b3561696dc74be36801cca0b17a26102a194a1a58d6c7b9ee1ab17752c4a6
DIST git-htmldocs-2.5.5.tar.xz 1010216 SHA256 15de2f234cf419496399f7ad396709544d62537488a8e5200e6e34b0f1a685e7 SHA512 265ddf3835352f85eb2e2ee983eb8aaf37bc7b151968866bdb8b9bb6782cdb72dbd1fefe5d7f694a6825954d49bcf4c799e8bcb4e3b25e3f228f6f97f041fd9b WHIRLPOOL 90da44c0bdb6f9ff428d1673289e612936ed5f26110cd13d155c8cbef8433b13bd8b15cea88f967224a699e4c3a6ac41d70b67be1b25c4d35989879626eb10ad
DIST git-htmldocs-2.6.6.tar.xz 1021856 SHA256 897fb0bc7e2eb67a4b582c963f337fda3a6ad2b23bca55e27f23f7d15bad7c5d SHA512 85dcd8514e1ba2cb591512a0003aedf25eafbf185ba1eed01f8adfd9eb467d29b17108e6b087183004004ab17301316d403cd6762619ac2a030a565ea5c776b3 WHIRLPOOL 3cd964f1d0164db98e97e0097813a620911adadd9c50837e23a5ca79eb0f2d988aa68317b5b79fa7b052900564657c36d050e75841a1018d5ff12e1299c01dc6
DIST git-htmldocs-2.7.3.tar.xz 1031848 SHA256 f71f5e8e1a6103e83ea794f367bc419a1d14ba0f79ebacdc81b3b9430714adea SHA512 50de5d9d3c0f6d874a6a4bc3b247a1795b1bcf154a276b546f88c3b5f5fb2eb27212d207a4bb50c04cba36d8537853afd25816addfb87c9a50e18528d93586fe WHIRLPOOL 057d9bebfe51c29a0a7f689baa9873cb6a54feb1d2869c541396902b160379c9220c5de79a4cb59c6e804e5c7557c0fd141b89621b97d3b495dc6e0a77c67a9f
DIST git-htmldocs-2.7.4.tar.xz 1032428 SHA256 3fae21e2e68104621ea1405be73192b46bf3ef29bbc248a81b1e7e6fcf5acfad SHA512 f05b7b8a4dd4abe23f7e51982e9c33026aa31610ac8640028aeae6b310b70b764aee9a81fa702ed0712ccf1b7ad897e06163eb5c5246c14f6cce7c5f4e462682 WHIRLPOOL 87fc486d182a4b72fd906105fefcc53b722c4ae6832b290cd6f759ac1eca7ebfbbe7c0e72c1d7b5ef3581d19d7576f1d0387d6e5b0a33d960d57f59ee61a7869
-DIST git-htmldocs-2.8.1.tar.xz 1039208 SHA256 0ef312091a6bc8938d3742be4e95510483a1700ccaeda6e85615f3d7c88d89a8 SHA512 eb4f9f975f5257c53a60618ade7350d73df8c5d55a4d7f46458d02c1eae5e1351de2d75c96b4e4ae089533910f362e7d15074df7675bc44087d6e80a53f134cb WHIRLPOOL 3f41834f1644fc426ac75c8437a7dce4bff1b9cd1b0a9038199c97285c6c0cd60fe858ad948645e0c8a6dd5e582a24bc9ee9188a3b9abdc660b2ed15acb1b343
DIST git-htmldocs-2.8.2.tar.xz 1040552 SHA256 28260088b325a75c66ae6333849f138c098ebb07fcfe78ca398e16f87811e29b SHA512 17d35c55b8100ca02e3822da31c14ac8aa46da1770dcc8c97faa7859349ccad8380a99a887237f249c4e7028cfe116dfb3afc5c46f454f6803d45bfc5223fac3 WHIRLPOOL 2bd5bda5a40903f0189623ca3f5b8fc6157deedb91ba86675ffc9ad342fbbc1279bc64b05f25523cb797c0a05d12316409e9f081f75875954cf2808fdf20050b
+DIST git-htmldocs-2.8.3.tar.xz 1041036 SHA256 df9aa1f374ca49dd65f47a8bb1498c11567d963e30cf00e097aa89c495d3ccde SHA512 5df5b991091d2c04f96a6236905fea7cc2ec9ddb7b86a4b298f65f69219101273121e4585fc36cd86a595d3b3b29de3afc7d2815e643b88040e5c7406fa440bb WHIRLPOOL 84b45804240e3aa5e427fc03983ef22e911021b2dc7303ba7326d64290d38f54111992c02b978c29c338154dd29d70b0ae62d1ab8e90eb542ba9ea9100235cec
DIST git-manpages-2.4.11.tar.xz 373956 SHA256 0a1fff7650e635339f92985a47198f5f6664eda1c233c3cf48e92f22c3735db2 SHA512 78226baf1c8be28c456a84b06f403af9b918cd3e46218917cce18b3b9ce494600bf00014b818ca0dff9f675aca8b17cd9f7893c7063e218d719a9567e81d9040 WHIRLPOOL f8883ca7d327c378937f62287cbb515b5271cb8aeda18d32135f1c7ea71c9f39282fe55b191476f046de4815a994e4f6f98696d9353f0bfcca7994101398786c
DIST git-manpages-2.5.5.tar.xz 378304 SHA256 41b66002436add0781618764c3f0c8222bac7d8a636f1d7e2994480b22369930 SHA512 bebcc04fa54080316d01f1bd1ba7b91a1712e6c6a6f95306d9f079cf5858cf0fb2ccea24c606153e9adb99e956c5dbae5a5c7a7a0ed8c643efdf5a5db599cda1 WHIRLPOOL e72873d3f1a404a311e643d89cf65996d884e794e468417272cdda494ef621f0ebf875faa17433e443fcece54608c59a3c094372101bf4342fadcf8395dabce8
DIST git-manpages-2.6.6.tar.xz 381588 SHA256 0f64c1db015e3c74e56eef646a9fdd456cf043cae54714f404ad9b35ddb537a0 SHA512 bd8573f58bd988f78978041b88643e6d0af99ae0df4be6ec80db7de6e042970a23d9a153e84ddb8ffc538724b1482ff6dac7594462e28073067f54d040fdddfd WHIRLPOOL 3e8af6df1b96e3211c5799ace846dab331f30c1133c1d093e344b4576d8f588631e29187909b600112a9f7b42a0de63f56cec953e0d162cc49c2b6efeef0db53
DIST git-manpages-2.7.3.tar.xz 384544 SHA256 9f088427c61a9e0a840007c7f50fc6f7caba36ac8c403460c49210983090496d SHA512 883441df049bfaf0f22cf9d17041125dc9c8f0e7d94efa7a4188a68c2242d1b4c3d34fd3bd3ecdd2af905ee2f8fb5fefd0ce6328dd76c665f7ec20e3b9c87d1b WHIRLPOOL 7ee013444665366ecb8f3df507a3c5af8a9f48d3185783a94db827b192c32ac6998157eb42bcbfe397f96d452451b2416c32e2dffbabc71062422e7c5e25c184
DIST git-manpages-2.7.4.tar.xz 384460 SHA256 d04fd81ab8aa32efbe54acd27ab5c88ef4ab615313e4cdfa793dd0065899ce25 SHA512 1af6f0d9fc3945a5a215092caabd0963f3eaa35c5f3b0270861b625bf7bd88e4fdea9b3e50ce1b10c79a12ee2b06b203fab4aa9d566560535c1decf7b2d987cd WHIRLPOOL 38306b6e198336dd3c75a9fd032b636e0e43a3b75eba2746d2d42c3752cf7405b1f8572199748509974d68bfc77c74fbea52626884f9b509d8b593cefce4aad5
-DIST git-manpages-2.8.1.tar.xz 386748 SHA256 e7a02f82971f6c0242ce66c9d4708a3ed2449a5b8ecc72fc39d9bad10b4e359d SHA512 cd2c5a1c4cdfefa84060e076ca7dc2f09287096dead8e38a3475c39db885ca7da3f6adb3da3289d603b27d6e9cf2e278064b2d9589e92053d905cd5a85a6370b WHIRLPOOL 360ac75bad6893368c399c75375fc3f2459eb4513e47c578c88b90839a4beda8d336db9d3973cdc60d6530cf99ef214657e0d1ea96c4209c170841a5ed712727
DIST git-manpages-2.8.2.tar.xz 386764 SHA256 9edff3393b7d388a148a4c21fe4ebfb18fe3a2b96ba149d882184f20a6478998 SHA512 586fc17a1ee563d257773dce65f85dbbd6aef11ac6d67173ffc5fb145da29e24b31018c36e253c48a389f3ae9305c63d1ca9b677e48db5ed0f80a4676bcc3c63 WHIRLPOOL 803201675e7bbccb7a492ff29cdfb5d707afe8be1d3f5f2248aaa559e59be012c5e646ee7a2f6bd45d8c0ed22dbea76954f07bfb71c04fa988e11803e732427a
+DIST git-manpages-2.8.3.tar.xz 386856 SHA256 9d25e10c2bc327fdc59820bb00075799487095059d652fb32fea1cdb3a898bc6 SHA512 539f7ac635bccf89c95ce3b7e79b72ad90bde4c48e6945b786d6a8d58485eb197d3505a4da574501768d98cce4d7d5bdf00f98baaf9e0658ed54dc49b032b43b WHIRLPOOL 24e16311a558019bce3007ad0cf3d42ea10762b8355e431216c59284a845d7d064ad51b94971d964ff0db84c6c766393d3feb81e14a07f10a97c4cbfe7f19b92
diff --git a/dev-vcs/git/git-2.8.2.ebuild b/dev-vcs/git/git-2.8.2.ebuild
deleted file mode 100644
index b34fa021ab84..000000000000
--- a/dev-vcs/git/git-2.8.2.ebuild
+++ /dev/null
@@ -1,682 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-# See https://git-scm.com/docs/gitworkflows#_graduation
-# In order of stability:
-# 9999-r0: maint
-# 9999-r1: master
-# 9999-r2: next
-# 9999-r3: pu
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_BRANCH=pu
-PLOCALES="bg ca de fr is it ko pt_PT ru sv vi zh_CN"
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
- SRC_URI_SUFFIX="xz"
- SRC_URI_GOOG="https://git-core.googlecode.com/files"
- SRC_URI_KORG="mirror://kernel/software/scm/git"
- SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- doc? (
- ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- sys-libs/zlib
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl:=[-build(-)] )
- tk? ( dev-lang/tk:0= )
- curl? (
- net-misc/curl
- webdav? ( dev-libs/expat )
- )
- emacs? ( virtual/emacs )
- gnome-keyring? ( gnome-base/libgnome-keyring )"
-
-RDEPEND="${CDEPEND}
- gpg? ( app-crypt/gnupg )
- mediawiki? (
- dev-perl/DateTime-Format-ISO8601
- dev-perl/HTML-Tree
- dev-perl/MediaWiki-API
- )
- perl? ( dev-perl/Error
- dev-perl/Net-SMTP-SSL
- dev-perl/Authen-SASL
- cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
- cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
- subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
- )
- python? ( gtk?
- (
- >=dev-python/pygtk-2.8[${PYTHON_USEDEP}]
- >=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
- )
- ${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-# .txt/asciidoc --(asciidoc)---------> .xml/docbook
-# .xml/docbook --(docbook2texi.pl)--> .texi
-# .texi --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
- doc? (
- app-text/asciidoc
- app-text/docbook2X
- sys-apps/texinfo
- app-text/xmlto
- )
- nls? ( sys-devel/gettext )
- test? ( app-crypt/gnupg )"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
- DEPEND="${DEPEND}
- app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
- cgi? ( perl )
- cvs? ( perl )
- mediawiki? ( perl )
- mediawiki-experimental? ( mediawiki )
- subversion? ( perl )
- webdav? ( curl )
- gtk? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
- # bug #350330 - automagic CVS when we don't want it is bad.
- "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
- # install mediawiki perl modules also in vendor_dir
- # hack, needs better upstream solution
- "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
- "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
- # Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
- "${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
- if use subversion && has_version "dev-vcs/subversion[dso]"; then
- ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
- ewarn "with USE=dso, there may be weird crashes in git-svn. You"
- ewarn "have been warned."
- fi
- if use python ; then
- python-single-r1_pkg_setup
- fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
- local myopts
-
- if use blksha1 ; then
- myopts+=" BLK_SHA1=YesPlease"
- elif use ppcsha1 ; then
- myopts+=" PPC_SHA1=YesPlease"
- fi
-
- if use curl ; then
- use webdav || myopts+=" NO_EXPAT=YesPlease"
- else
- myopts+=" NO_CURL=YesPlease"
- fi
-
- # broken assumptions, because of broken build system ...
- myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
- myopts+=" INSTALL=install TAR=tar"
- myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
- myopts+=" SANE_TOOL_PATH="
- myopts+=" OLD_ICONV="
- myopts+=" NO_EXTERNAL_GREP="
-
- # For svn-fe
- extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
- # can't define this to null, since the entire makefile depends on it
- sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
- use iconv \
- || myopts+=" NO_ICONV=YesPlease"
- use nls \
- || myopts+=" NO_GETTEXT=YesPlease"
- use tk \
- || myopts+=" NO_TCLTK=YesPlease"
- use pcre \
- && myopts+=" USE_LIBPCRE=yes" \
- && extlibs+=" -lpcre"
- use perl \
- && myopts+=" INSTALLDIRS=vendor" \
- || myopts+=" NO_PERL=YesPlease"
- use python \
- || myopts+=" NO_PYTHON=YesPlease"
- use subversion \
- || myopts+=" NO_SVN_TESTS=YesPlease"
- use threads \
- && myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
- || myopts+=" NO_PTHREADS=YesPlease"
- use cvs \
- || myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-# if [[ ${CHOST} == *-mint* ]] ; then
-# myopts+=" NO_MMAP=YesPlease"
-# myopts+=" NO_IPV6=YesPlease"
-# myopts+=" NO_STRLCPY=YesPlease"
-# myopts+=" NO_MEMMEM=YesPlease"
-# myopts+=" NO_MKDTEMP=YesPlease"
-# myopts+=" NO_MKSTEMPS=YesPlease"
-# fi
- if [[ ${CHOST} == ia64-*-hpux* ]]; then
- myopts+=" NO_NSEC=YesPlease"
- fi
- if [[ ${CHOST} == *-*-aix* ]]; then
- myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
- fi
- if [[ ${CHOST} == *-solaris* ]]; then
- myopts+=" NEEDS_LIBICONV=YesPlease"
- myopts+=" HAVE_CLOCK_MONOTONIC=1"
- myopts+=" HAVE_GETDELIM=1"
- fi
-
- has_version '>=app-text/asciidoc-8.0' \
- && myopts+=" ASCIIDOC8=YesPlease"
- myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
- # Bug 290465:
- # builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
- [[ "${CHOST}" == *-uclibc* ]] && \
- myopts+=" NO_NSEC=YesPlease"
-
- export MY_MAKEOPTS="${myopts}"
- export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- use doc && \
- cd "${S}"/Documentation && \
- unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
- cd "${S}"
- else
- git-r3_src_unpack
- cd "${S}"
- #cp "${FILESDIR}"/GIT-VERSION-GEN .
- fi
-
-}
-
-src_prepare() {
- # add experimental patches to improve mediawiki support
- # see patches for origin
- if use mediawiki-experimental ; then
- PATCHES+=(
- "${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
- "${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
- "${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
- )
- fi
-
- default
-
- sed -i \
- -e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
- -e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
- -e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
- -e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
- -e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- -e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
- Makefile contrib/svn-fe/Makefile || die "sed failed"
-
- # Never install the private copy of Error.pm (bug #296310)
- sed -i \
- -e '/private-Error.pm/s,^,#,' \
- perl/Makefile.PL
-
- # Fix docbook2texi command
- sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
- Documentation/Makefile || die "sed failed"
-
- # Fix git-subtree missing DESTDIR
- sed -i \
- -e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
- -e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g' \
- contrib/subtree/Makefile
-}
-
-git_emake() {
- # bug #326625: PERL_PATH, PERL_MM_OPT
- # bug #320647: PYTHON_PATH
- PYTHON_PATH=""
- use python && PYTHON_PATH="${PYTHON}"
- emake ${MY_MAKEOPTS} \
- DESTDIR="${D}" \
- OPTCFLAGS="${CFLAGS}" \
- OPTLDFLAGS="${LDFLAGS}" \
- OPTCC="$(tc-getCC)" \
- OPTAR="$(tc-getAR)" \
- prefix="${EPREFIX}"/usr \
- htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
- sysconfdir="${EPREFIX}"/etc \
- PYTHON_PATH="${PYTHON_PATH}" \
- PERL_MM_OPT="" \
- GIT_TEST_OPTS="--no-color" \
- V=1 \
- "$@"
- # This is the fix for bug #326625, but it also causes breakage, see bug
- # #352693.
- # PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
- exportmakeopts
-}
-
-src_compile() {
- if use perl ; then
- git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
- git_emake perl/perl.mak || die "emake perl/perl.mak failed"
- fi
- git_emake || die "emake failed"
-
- if use emacs ; then
- elisp-compile contrib/emacs/git{,-blame}.el
- fi
-
- if use perl && use cgi ; then
- git_emake \
- gitweb \
- || die "emake gitweb (cgi) failed"
- fi
-
- if [[ ${CHOST} == *-darwin* ]]; then
- cd "${S}"/contrib/credential/osxkeychain || die
- git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
- || die "emake credential-osxkeychain"
- fi
-
- cd "${S}"/Documentation
- if [[ ${PV} == *9999 ]] ; then
- git_emake man \
- || die "emake man failed"
- if use doc ; then
- git_emake info html \
- || die "emake info html failed"
- fi
- else
- if use doc ; then
- git_emake info \
- || die "emake info html failed"
- fi
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- # by defining EXTLIBS we override the detection for libintl and
- # libiconv, bug #516168
- local nlsiconv=
- use nls && use !elibc_glibc && nlsiconv+=" -lintl"
- use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
- git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
- if use doc ; then
- git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
- fi
- cd "${S}"
- fi
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- git_emake || die "emake git-credential-gnome-keyring failed"
- fi
-
- cd "${S}"/contrib/subtree
- git_emake
- use doc && git_emake doc
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake
- fi
-}
-
-src_install() {
- git_emake \
- install || \
- die "make install failed"
-
- if [[ ${CHOST} == *-darwin* ]]; then
- dobin contrib/credential/osxkeychain/git-credential-osxkeychain
- fi
-
- # Depending on the tarball and manual rebuild of the documentation, the
- # manpages may exist in either OR both of these directories.
- find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
- find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
- dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
- use doc && dodir /usr/share/doc/${PF}/html
- for d in / /howto/ /technical/ ; do
- docinto ${d}
- dodoc Documentation${d}*.txt
- if use doc ; then
- docinto ${d}/html
- dodoc Documentation${d}*.html
- fi
- done
- docinto /
- # Upstream does not ship this pre-built :-(
- use doc && doinfo Documentation/{git,gitman}.info
-
- newbashcomp contrib/completion/git-completion.bash ${PN}
- bashcomp_alias git gitk
- # Not really a bash-completion file (bug #477920)
- # but still needed uncompressed (bug #507480)
- insinto /usr/share/${PN}
- doins contrib/completion/git-prompt.sh
-
- if use emacs ; then
- elisp-install ${PN} contrib/emacs/git.{el,elc}
- elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
- #elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
- # don't add automatically to the load-path, so the sitefile
- # can do a conditional loading
- touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
- elisp-site-file-install "${FILESDIR}"/${SITEFILE}
- fi
-
- if use python && use gtk ; then
- python_doscript "${S}"/contrib/gitview/gitview
- dodoc "${S}"/contrib/gitview/gitview.txt
- fi
-
- #dobin contrib/fast-import/git-p4 # Moved upstream
- #dodoc contrib/fast-import/git-p4.txt # Moved upstream
- newbin contrib/fast-import/import-tars.perl import-tars
- exeinto /usr/libexec/git-core/
- newexe contrib/git-resurrect.sh git-resurrect
-
- # git-subtree
- cd "${S}"/contrib/subtree
- git_emake install || die "Failed to emake install git-subtree"
- if use doc ; then
- git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
- fi
- newdoc README README.git-subtree
- dodoc git-subtree.txt
- cd "${S}"
-
- if use mediawiki ; then
- cd "${S}"/contrib/mw-to-git
- git_emake install
- cd "${S}"
- fi
-
- # diff-highlight
- dobin contrib/diff-highlight/diff-highlight
- newdoc contrib/diff-highlight/README README.diff-highlight
-
- # git-jump
- exeinto /usr/libexec/git-core/
- doexe contrib/git-jump/git-jump
- newdoc contrib/git-jump/README git-jump.txt
-
- # git-contacts
- exeinto /usr/libexec/git-core/
- doexe contrib/contacts/git-contacts
- dodoc contrib/contacts/git-contacts.txt
-
- if use gnome-keyring ; then
- cd "${S}"/contrib/credential/gnome-keyring
- dobin git-credential-gnome-keyring
- fi
-
- if use subversion ; then
- cd "${S}"/contrib/svn-fe
- dobin svn-fe
- dodoc svn-fe.txt
- if use doc ; then
- doman svn-fe.1
- docinto html
- dodoc svn-fe.html
- fi
- cd "${S}"
- fi
-
- dodir /usr/share/${PN}/contrib
- # The following are excluded:
- # completion - installed above
- # credential/gnome-keyring TODO
- # diff-highlight - done above
- # emacs - installed above
- # examples - these are stuff that is not used in Git anymore actually
- # git-jump - done above
- # gitview - installed above
- # p4import - excluded because fast-import has a better one
- # patches - stuff the Git guys made to go upstream to other places
- # persistent-https - TODO
- # mw-to-git - TODO
- # subtree - build seperately
- # svnimport - use git-svn
- # thunderbird-patch-inline - fixes thunderbird
- for i in \
- buildsystems convert-objects fast-import \
- hg-to-git hooks remotes2config.sh rerere-train.sh \
- stats workdir \
- ; do
- cp -rf \
- "${S}"/contrib/${i} \
- "${ED}"/usr/share/${PN}/contrib \
- || die "Failed contrib ${i}"
- done
-
- if use perl && use cgi ; then
- # We used to install in /usr/share/${PN}/gitweb
- # but upstream installs in /usr/share/gitweb
- # so we will install a symlink and use their location for compat with other
- # distros
- dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
- # INSTALL discusses configuration issues, not just installation
- docinto /
- newdoc "${S}"/gitweb/INSTALL INSTALL.gitweb
- newdoc "${S}"/gitweb/README README.gitweb
-
- find "${ED}"/usr/lib64/perl5/ \
- -name .packlist \
- -exec rm \{\} \;
- else
- rm -rf "${ED}"/usr/share/gitweb
- fi
-
- if ! use subversion ; then
- rm -f "${ED}"/usr/libexec/git-core/git-svn \
- "${ED}"/usr/share/man/man1/git-svn.1*
- fi
-
- if use xinetd ; then
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/git-daemon.xinetd git-daemon
- fi
-
- if use !prefix ; then
- newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
- newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
- systemd_dounit "${FILESDIR}/git-daemon.socket"
- fi
-
- perl_delete_localpod
-
- # Remove disabled linguas
- # we could remove sources in src_prepare, but install does not
- # handle missing locale dir well
- rm_loc() {
- if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
- rm -r "${ED}/usr/share/locale/${1}" || die
- fi
- }
- l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
- local disabled=""
- local tests_cvs="t9200-git-cvsexportcommit.sh \
- t9400-git-cvsserver-server.sh \
- t9401-git-cvsserver-crlf.sh \
- t9402-git-cvsserver-refs.sh \
- t9600-cvsimport.sh \
- t9601-cvsimport-vendor-branch.sh \
- t9602-cvsimport-branches-tags.sh \
- t9603-cvsimport-patchsets.sh \
- t9604-cvsimport-timestamps.sh"
- local tests_perl="t3701-add-interactive.sh \
- t5502-quickfetch.sh \
- t5512-ls-remote.sh \
- t5520-pull.sh \
- t7106-reset-unborn-branch.sh \
- t7501-commit.sh"
- # Bug #225601 - t0004 is not suitable for root perm
- # Bug #219839 - t1004 is not suitable for root perm
- # t0001-init.sh - check for init notices EPERM* fails
- local tests_nonroot="t0001-init.sh \
- t0004-unwritable.sh \
- t0070-fundamental.sh \
- t1004-read-tree-m-u-wf.sh \
- t3700-add.sh \
- t7300-clean.sh"
- # t9100 still fails with symlinks in SVN 1.7
- local test_svn="t9100-git-svn-basic.sh"
-
- # Unzip is used only for the testcase code, not by any normal parts of Git.
- if ! has_version app-arch/unzip ; then
- einfo "Disabling tar-tree tests"
- disabled="${disabled} t5000-tar-tree.sh"
- fi
-
- cvs=0
- use cvs && let cvs=$cvs+1
- if [[ ${EUID} -eq 0 ]]; then
- if [[ $cvs -eq 1 ]]; then
- ewarn "Skipping CVS tests because CVS does not work as root!"
- ewarn "You should retest with FEATURES=userpriv!"
- disabled="${disabled} ${tests_cvs}"
- fi
- einfo "Skipping other tests that require being non-root"
- disabled="${disabled} ${tests_nonroot}"
- else
- [[ $cvs -gt 0 ]] && \
- has_version dev-vcs/cvs && \
- let cvs=$cvs+1
- [[ $cvs -gt 1 ]] && \
- has_version "dev-vcs/cvs[server]" && \
- let cvs=$cvs+1
- if [[ $cvs -lt 3 ]]; then
- einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
- disabled="${disabled} ${tests_cvs}"
- fi
- fi
-
- if ! use perl ; then
- einfo "Disabling tests that need Perl"
- disabled="${disabled} ${tests_perl}"
- fi
-
- einfo "Disabling tests that fail with SVN 1.7"
- disabled="${disabled} ${test_svn}"
-
- # Reset all previously disabled tests
- cd "${S}/t"
- for i in *.sh.DISABLED ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
- done
- einfo "Disabled tests:"
- for i in ${disabled} ; do
- [[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
- done
-
- # Avoid the test system removing the results because we want them ourselves
- sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
- -i "${S}"/t/Makefile
-
- # Clean old results first, must always run
- cd "${S}/t"
- nonfatal git_emake clean
-
- # Now run the tests, keep going if we hit an error, and don't terminate on
- # failure
- cd "${S}"
- einfo "Start test run"
- #MAKEOPTS=-j1
- nonfatal git_emake --keep-going test
- rc=$?
-
- # Display nice results, now print the results
- cd "${S}/t"
- nonfatal git_emake aggregate-results
-
- # And bail if there was a problem
- [ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
- local pkg=$1
- shift
- elog " $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
- einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
- einfo "Note that the prompt bash code is now in that separate script"
- elog "These additional scripts need some dependencies:"
- echo
- showpkgdeps git-quiltimport "dev-util/quilt"
- showpkgdeps git-instaweb \
- "|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
- echo
- use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.8.1.ebuild b/dev-vcs/git/git-2.8.3.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.8.1.ebuild
rename to dev-vcs/git/git-2.8.3.ebuild
index b34fa021ab84..30ae9d02053f 100644
--- a/dev-vcs/git/git-2.8.1.ebuild
+++ b/dev-vcs/git/git-2.8.3.ebuild
@@ -540,7 +540,7 @@ src_install() {
if use !prefix ; then
newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
newconfd "${FILESDIR}"/git-daemon.confd git-daemon
- systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
+ systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
systemd_dounit "${FILESDIR}/git-daemon.socket"
fi
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
index a0fd4739b665..fc6e8c079c21 100644
--- a/games-strategy/endless-sky/Manifest
+++ b/games-strategy/endless-sky/Manifest
@@ -1 +1,2 @@
DIST endless-sky-0.8.11.tar.gz 42620910 SHA256 8c399194b5d118274f43685b9992419538e5e6c6161621e5b06aef9ca74c4718 SHA512 6f2d1fdae24a9f1f6b67cb806ae88c214ffe0827770b26f6e65da7afa823a6091e5ade7f492e8b52f761650de86b20ce497e6f03f0d9ab0a7791be456b0ea6d2 WHIRLPOOL 3691c2f982a8657388bb00c8eeb78791b404942aa0a3249b1821433646546b4c4b83fb2bb1bfe13c927911ef4ea88cce1add08f01e9b05b2dde8c96df123f55d
+DIST endless-sky-0.9.0.tar.gz 51004856 SHA256 bdd1f364fe7361ba61d7ec63049e8661a625dee6e2ab2c9ab71f95c06af708a5 SHA512 9201d31cad1e256924d6064e0748d04a785972179c92f2423e6a8dfb7703ff2a1b8d9d57457f3a701c41ff358878122e62163c1a0e8117a9f681d6e0150ace3f WHIRLPOOL 70445d260fe88904469c2789964d73bd882843b616eb1fc2f3a6d15fd80358221bda8ac2e8fd30617f2fc856e9e2528e6afd64449ac7ca793ca3d05cb7ccaa1f
diff --git a/games-strategy/endless-sky/endless-sky-0.9.0.ebuild b/games-strategy/endless-sky/endless-sky-0.9.0.ebuild
new file mode 100644
index 000000000000..ebb1f74187bc
--- /dev/null
+++ b/games-strategy/endless-sky/endless-sky-0.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils gnome2-utils scons-utils
+
+DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity"
+HOMEPAGE="https://endless-sky.github.io"
+SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/glew
+ media-libs/libsdl2
+ media-libs/libjpeg-turbo
+ media-libs/libpng:=
+ media-libs/openal
+ virtual/opengl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ sed -i 's/"-std=c++0x", "-O3", "-Wall"/"-std=c++0x", "-Wall"/' SConstruct || die
+ sed -i 's#env.Install("$DESTDIR$PREFIX/games", sky)#env.Install("$DESTDIR$PREFIX/bin", sky)#g' SConstruct || die
+ eapply_user
+}
+
+src_compile() {
+ escons
+}
+
+src_install() {
+ escons PREFIX="${D}/usr/" install
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
+
+pkg_postinst() {
+ einfo "Endless Sky provides high-res sprites for high-dpi screens."
+ einfo "If you want to use them, download"
+ einfo
+ einfo " https://github.com/endless-sky/endless-sky-high-dpi/releases"
+ einfo
+ einfo "and extract it to ~/.local/share/endless-sky/plugins/."
+ einfo
+ einfo " Enjoy."
+}
diff --git a/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild b/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
index 003540116811..9d00394e9c86 100644
--- a/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
+++ b/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
kdepim? ( $(add_kdeapps_dep kdepim-meta '' 4.4.11.1) )
nls? ( $(add_kdeapps_dep kde4-l10n '' 4.14.3-r1) )
sdk? (
- $(add_kdebase_dep kdebindings-meta)
+ $(add_kdeapps_dep kdebindings-meta)
$(add_kdeapps_dep kdesdk-meta)
$(add_kdeapps_dep kdewebdev-meta)
)
diff --git a/kde-apps/kde-meta/kde-meta-4.14.3.ebuild b/kde-apps/kde-meta/kde-meta-4.14.3.ebuild
index d5efb7c88695..d751dd47889a 100644
--- a/kde-apps/kde-meta/kde-meta-4.14.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-4.14.3.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
kdepim? ( $(add_kdeapps_dep kdepim-meta '' 4.4.11.1) )
nls? ( $(add_kdeapps_dep kde4-l10n) )
sdk? (
- $(add_kdebase_dep kdebindings-meta)
+ $(add_kdeapps_dep kdebindings-meta)
$(add_kdeapps_dep kdesdk-meta)
$(add_kdeapps_dep kdewebdev-meta)
)
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-4.14.3.ebuild b/kde-apps/kdebindings-meta/kdebindings-meta-4.14.3.ebuild
similarity index 100%
rename from kde-base/kdebindings-meta/kdebindings-meta-4.14.3.ebuild
rename to kde-apps/kdebindings-meta/kdebindings-meta-4.14.3.ebuild
diff --git a/kde-base/kdebindings-meta/Manifest b/kde-base/kdebindings-meta/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/kde-base/kdebindings-meta/metadata.xml b/kde-base/kdebindings-meta/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/kde-base/kdebindings-meta/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- kde@gentoo.org
- Gentoo KDE Project
-
-
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index dc50536ccc9f..c46d8625b140 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,4 +1,3 @@
DIST fbida-2.10.tar.gz 283490 SHA256 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 SHA512 b7371c19d68cc7219faca4bbfa464c85df2eb22c7bd737d4f0a6fb3de481497862ca22832801d29bab57285d5a8d7d0b0009e14426efdce2759d47340f5eca6d WHIRLPOOL 78c5dc34a9f050e560ada960718a9f43e6d8c95fe4c91c052a70c93350de80eebd3e8e9b6c26361ecd8361efe96824e78b2af7a2b2e27430a11e712bb9a02ee0
-DIST fbida-2.11.tar.gz 285691 SHA256 7caa63d6d09aeeef6209556f3e2d05083a6a9ffc47636dee7e6019b3eea5a103 SHA512 fcebcb4b4bf7bcbb68e7f66ac0f38ee744f90e2393b717d5e06ae0fd1d01d4902379b2cbc886e8f7c70743f75ec38999a0163683881248c2443e53af7231c5af WHIRLPOOL a4286db58de332da6b3ef1f815f9f27b6162e8dffb456d2506b8c75cd6551d621b51aa26f7c53c7ca834d817c51eccddbb07b0863e3bc8ac9e41ea61331b0114
DIST fbida-2.12.tar.gz 294842 SHA256 d33193105cce77057c919761728cee9bbe8ec8ec4f12a770a600cab33611822f SHA512 383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515 WHIRLPOOL 7ea067497eee03623fe8f07afbb77c354973187edd09f40b94d73d1b2d7c823db846c277005473c169cd1ad923e378d22d3c065f3522667e544d25917cd6495a
DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be
diff --git a/media-gfx/fbida/fbida-2.10-r1.ebuild b/media-gfx/fbida/fbida-2.10-r1.ebuild
deleted file mode 100644
index f43d6b97f193..000000000000
--- a/media-gfx/fbida/fbida-2.10-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
-SRC_URI="
- http://www.kraxel.org/releases/${PN}/${P}.tar.gz
- mirror://gentoo/ida.png.bz2
-"
-LICENSE="GPL-2 IJG"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
-REQUIRED_USE="
- pdf? ( tiff )
-"
-
-RDEPEND="
- !media-gfx/fbi
- >=media-libs/fontconfig-2.2
- >=media-libs/freetype-2.0
- media-libs/libexif
- curl? ( net-misc/curl )
- gif? ( media-libs/giflib:= )
- lirc? ( app-misc/lirc )
- png? ( media-libs/libpng:* )
- scanner? ( media-gfx/sane-backends )
- tiff? ( media-libs/tiff:* )
- virtual/jpeg:*
- virtual/ttf-fonts
- webp? ( media-libs/libwebp )
- X? (
- >=x11-libs/motif-2.3:0
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt
- )
-"
-
-DEPEND="
- ${RDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )
- pdf? ( app-text/ghostscript-gpl )
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/ida-desktop.patch \
- "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch \
- "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
-
- tc-export CC CPP
-
- # upstream omission?
- echo ${PV} > VERSION
-}
-
-src_configure() {
- # Let autoconf do its job and then fix things to build fbida
- # according to our specifications
- emake Make.config
-
- gentoo_fbida() {
- local useflag=${1}
- local config=${2}
-
- local option="no"
- use ${useflag} && option="yes"
-
- sed -i \
- -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
- "${S}/Make.config" || die
- }
-
- gentoo_fbida X MOTIF
- gentoo_fbida curl LIBCURL
- gentoo_fbida fbcon LINUX_FB_H
- gentoo_fbida gif LIBUNGIF
- gentoo_fbida lirc LIBLIRC
- gentoo_fbida pdf LIBTIFF
- gentoo_fbida png LIBPNG
- gentoo_fbida scanner LIBSANE
- gentoo_fbida tiff LIBTIFF
- gentoo_fbida webp LIBWEBP
-}
-
-src_compile() {
- emake verbose=yes
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- STRIP="" \
- prefix=/usr \
- install
-
- dodoc README
-
- if use fbcon && ! use pdf; then
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
- fi
-
- if use X ; then
- doicon "${WORKDIR}"/ida.png
- domenu desktop/ida.desktop
- fi
-}
diff --git a/media-gfx/fbida/fbida-2.11.ebuild b/media-gfx/fbida/fbida-2.11.ebuild
deleted file mode 100644
index f43d6b97f193..000000000000
--- a/media-gfx/fbida/fbida-2.11.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
-SRC_URI="
- http://www.kraxel.org/releases/${PN}/${P}.tar.gz
- mirror://gentoo/ida.png.bz2
-"
-LICENSE="GPL-2 IJG"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
-REQUIRED_USE="
- pdf? ( tiff )
-"
-
-RDEPEND="
- !media-gfx/fbi
- >=media-libs/fontconfig-2.2
- >=media-libs/freetype-2.0
- media-libs/libexif
- curl? ( net-misc/curl )
- gif? ( media-libs/giflib:= )
- lirc? ( app-misc/lirc )
- png? ( media-libs/libpng:* )
- scanner? ( media-gfx/sane-backends )
- tiff? ( media-libs/tiff:* )
- virtual/jpeg:*
- virtual/ttf-fonts
- webp? ( media-libs/libwebp )
- X? (
- >=x11-libs/motif-2.3:0
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt
- )
-"
-
-DEPEND="
- ${RDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )
- pdf? ( app-text/ghostscript-gpl )
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/ida-desktop.patch \
- "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch \
- "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
-
- tc-export CC CPP
-
- # upstream omission?
- echo ${PV} > VERSION
-}
-
-src_configure() {
- # Let autoconf do its job and then fix things to build fbida
- # according to our specifications
- emake Make.config
-
- gentoo_fbida() {
- local useflag=${1}
- local config=${2}
-
- local option="no"
- use ${useflag} && option="yes"
-
- sed -i \
- -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
- "${S}/Make.config" || die
- }
-
- gentoo_fbida X MOTIF
- gentoo_fbida curl LIBCURL
- gentoo_fbida fbcon LINUX_FB_H
- gentoo_fbida gif LIBUNGIF
- gentoo_fbida lirc LIBLIRC
- gentoo_fbida pdf LIBTIFF
- gentoo_fbida png LIBPNG
- gentoo_fbida scanner LIBSANE
- gentoo_fbida tiff LIBTIFF
- gentoo_fbida webp LIBWEBP
-}
-
-src_compile() {
- emake verbose=yes
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- STRIP="" \
- prefix=/usr \
- install
-
- dodoc README
-
- if use fbcon && ! use pdf; then
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
- fi
-
- if use X ; then
- doicon "${WORKDIR}"/ida.png
- domenu desktop/ida.desktop
- fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.4.1.ebuild b/media-gfx/imagemagick/imagemagick-6.9.4.1.ebuild
index 47260e1ab822..40ca7735461c 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.4.1.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
LICENSE="imagemagick"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
RESTRICT="perl? ( userpriv )"
diff --git a/media-libs/gd/gd-2.2.0.ebuild b/media-libs/gd/gd-2.2.0.ebuild
index 3a697e32a549..fb7d12699461 100644
--- a/media-libs/gd/gd-2.2.0.ebuild
+++ b/media-libs/gd/gd-2.2.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=6
-inherit libtool multilib-minimal
+inherit eutils libtool multilib-minimal
DESCRIPTION="A graphics library for fast image creation"
HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
+SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/lib${P}"
src_prepare() {
+ default
elibtoolize # for shared library on Solaris
}
diff --git a/media-libs/libmms/libmms-0.6.4.ebuild b/media-libs/libmms/libmms-0.6.4.ebuild
index 607e57586912..1ebe4f3e9290 100644
--- a/media-libs/libmms/libmms-0.6.4.ebuild
+++ b/media-libs/libmms/libmms-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
IUSE="static-libs"
RDEPEND="abi_x86_32? (
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index ca2c3291a268..3d8e3ca95629 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 20 May 2016 06:40:50 +0000
+Fri, 20 May 2016 12:10:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ca2c3291a268..3d8e3ca95629 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 20 May 2016 06:40:50 +0000
+Fri, 20 May 2016 12:10:49 +0000
diff --git a/metadata/md5-cache/app-arch/unrar-5.3.11 b/metadata/md5-cache/app-arch/unrar-5.3.11
index 80e9618851ce..fba01e91e71a 100644
--- a/metadata/md5-cache/app-arch/unrar-5.3.11
+++ b/metadata/md5-cache/app-arch/unrar-5.3.11
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare
DESCRIPTION=Uncompress rar files
EAPI=5
HOMEPAGE=http://www.rarlab.com/rar_add.htm
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~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 ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~x86-solaris
LICENSE=unRAR
RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
SLOT=0
SRC_URI=http://www.rarlab.com/rar/unrarsrc-5.3.11.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=db53797607da54332fe3310786c43dde
+_md5_=433d903a6056128b82fb47388596f562
diff --git a/metadata/md5-cache/app-forensics/chkrootkit-0.50 b/metadata/md5-cache/app-forensics/chkrootkit-0.50
index a6442fadc682..22cf58363922 100644
--- a/metadata/md5-cache/app-forensics/chkrootkit-0.50
+++ b/metadata/md5-cache/app-forensics/chkrootkit-0.50
@@ -3,10 +3,10 @@ DESCRIPTION=Tool to locally check for signs of a rootkit
EAPI=5
HOMEPAGE=http://www.chkrootkit.org/
IUSE=+cron
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86
LICENSE=BSD-2
RDEPEND=cron? ( virtual/cron )
SLOT=0
SRC_URI=ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-0.50.tar.gz https://dev.gentoo.org/~xmw/chkrootkit-0.50-gentoo.diff.bz2
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=a713a97027c8e86a1cd79c00649d9cc0
+_md5_=a45e43586f5c2fd51c5751c74dbe0d4a
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.25 b/metadata/md5-cache/dev-db/mariadb-10.0.25
index 9e2382aa1cf1..ac16cfd05292 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.25
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.25
@@ -4,7 +4,7 @@ DESCRIPTION=An enhanced, drop-in replacement for MySQL
EAPI=6
HOMEPAGE=http://mariadb.org/
IUSE=bindist odbc oqgraph pam sphinx tokudb xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) ~virtual/mysql-5.6[embedded=,static=] virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
RDEPEND=!bindist? ( >=sys-libs/readline-4.1:0= ) server? ( extraengine? ( odbc? ( dev-db/unixODBC:0= ) xml? ( dev-libs/libxml2:2= ) ) oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) pam? ( virtual/pam:0= ) tokudb? ( app-arch/snappy ) ) >=dev-libs/libpcre-8.35:3= perl? ( !dev-db/mytop virtual/perl-Getopt-Long dev-perl/TermReadKey virtual/perl-Term-ANSIColor virtual/perl-Time-HiRes ) kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= selinux? ( sec-policy/selinux-mysql ) abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster server? ( !prefix? ( dev-db/mysql-init-scripts ) ) !=app-admin/webapp-config-1.50.15
SLOT=4.0.10.15
SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.0.10.15/phpMyAdmin-4.0.10.15-all-languages.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb webapp 42c6ef7af496b228f9854b3c81e4b226
-_md5_=33c8310ccb896e7b932c2e8c11f7cef8
+_md5_=5001e218b3ec54ae88d21825132b05df
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.5 b/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.5
index 3344b39982c6..64145aef1b59 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.5
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.4.15.5
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
EAPI=5
HOMEPAGE=https://www.phpmyadmin.net/
IUSE=setup vhosts
-KEYWORDS=~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
SLOT=4.4.15.5
SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.4.15.5/phpMyAdmin-4.4.15.5-all-languages.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb webapp 42c6ef7af496b228f9854b3c81e4b226
-_md5_=85c13a24deafa60b8c8e34a235be2205
+_md5_=d31e4e485b0d4dadbe989f71ad428cf1
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.5.5.1 b/metadata/md5-cache/dev-db/phpmyadmin-4.5.5.1
index 7ad92f84862c..f6345b56b208 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.5.5.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.5.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=Web-based administration for MySQL database in PHP
EAPI=5
HOMEPAGE=https://www.phpmyadmin.net/
IUSE=setup vhosts
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
SLOT=4.5.5.1
SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.5.5.1/phpMyAdmin-4.5.5.1-all-languages.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb webapp 42c6ef7af496b228f9854b3c81e4b226
-_md5_=9ef0fbb0c5b335bdad05b98b7754ce46
+_md5_=73a76fd4c92066f583a8263d8b79de26
diff --git a/metadata/md5-cache/dev-vcs/git-2.8.2 b/metadata/md5-cache/dev-vcs/git-2.8.2
deleted file mode 100644
index 2f71e98bf38e..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test linguas_bg linguas_ca linguas_de linguas_fr linguas_is linguas_it linguas_ko linguas_pt_PT linguas_ru linguas_sv linguas_vi linguas_zh_CN python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://git-core.googlecode.com/files/git-2.8.2.tar.xz mirror://kernel/software/scm/git/git-2.8.2.tar.xz https://git-core.googlecode.com/files/git-manpages-2.8.2.tar.xz mirror://kernel/software/scm/git/git-manpages-2.8.2.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.8.2.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.8.2.tar.xz )
-_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 792f83d5ec9536cb5ccef375469d8bde l10n e26ea0642846685782f1813642e7ff0f multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 13d5b02ea59b21da41c77c9294f3b7f7 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=d8d8ea5c2866c08deca993c482acd158
diff --git a/metadata/md5-cache/dev-vcs/git-2.8.1 b/metadata/md5-cache/dev-vcs/git-2.8.3
similarity index 90%
rename from metadata/md5-cache/dev-vcs/git-2.8.1
rename to metadata/md5-cache/dev-vcs/git-2.8.3
index 2c84ee56d130..e1149bfe8244 100644
--- a/metadata/md5-cache/dev-vcs/git-2.8.1
+++ b/metadata/md5-cache/dev-vcs/git-2.8.3
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gnome-keyring? ( gnome-base/libgnome-keyring ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( gtk? ( >=dev-python/pygtk-2.8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.10.1-r1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] ) >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] )
REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) gtk? ( python ) python? ( python_targets_python2_7 )
SLOT=0
-SRC_URI=https://git-core.googlecode.com/files/git-2.8.1.tar.xz mirror://kernel/software/scm/git/git-2.8.1.tar.xz https://git-core.googlecode.com/files/git-manpages-2.8.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.8.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.8.1.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.8.1.tar.xz )
+SRC_URI=https://git-core.googlecode.com/files/git-2.8.3.tar.xz mirror://kernel/software/scm/git/git-2.8.3.tar.xz https://git-core.googlecode.com/files/git-manpages-2.8.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.8.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.8.3.tar.xz https://git-core.googlecode.com/files/git-htmldocs-2.8.3.tar.xz )
_eclasses_=bash-completion-r1 acf715fa09463f043fbfdc1640f3fb85 elisp-common 9f56c4e9bf1282dbfc2a5a09e1124e74 eutils 792f83d5ec9536cb5ccef375469d8bde l10n e26ea0642846685782f1813642e7ff0f multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 perl-functions aac50de73be0a80ebe780e0b20850130 perl-module c584f9e0fe426f3dcc2c46c6f7cb95ce python-single-r1 2ebea8fbab356d63110245129a67a6dd python-utils-r1 13d5b02ea59b21da41c77c9294f3b7f7 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=d8d8ea5c2866c08deca993c482acd158
+_md5_=60c4a69371e5fac0e46acaaa41c98d33
diff --git a/metadata/md5-cache/games-strategy/endless-sky-0.9.0 b/metadata/md5-cache/games-strategy/endless-sky-0.9.0
new file mode 100644
index 000000000000..f5ee980f6f75
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/endless-sky-0.9.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=media-libs/glew media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl >=sys-apps/sed-4 dev-util/scons
+DESCRIPTION=Space exploration, trading & combat in the tradition of Terminal Velocity
+EAPI=6
+HOMEPAGE=https://endless-sky.github.io
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain
+RDEPEND=media-libs/glew media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.9.0.tar.gz -> endless-sky-0.9.0.tar.gz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib d062ae4ba2fc40a19c11de2ad89b6616 scons-utils 6a35944612b7ecb18a3803359554badc toolchain-funcs d513d423d449877e49d99af3f7af7acb xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=0c512617e7ab76ab6efb2cd93ec26856
diff --git a/metadata/md5-cache/kde-apps/kde-meta-4.14.3 b/metadata/md5-cache/kde-apps/kde-meta-4.14.3
index c803865d6213..024978a476e6 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-4.14.3
+++ b/metadata/md5-cache/kde-apps/kde-meta-4.14.3
@@ -5,8 +5,8 @@ HOMEPAGE=https://www.kde.org/
IUSE=accessibility kdepim minimal nls sdk aqua
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=metapackage
-RDEPEND=>=kde-apps/kate-4.14.3:4[aqua=] >=kde-apps/kdeadmin-meta-4.14.3:4[aqua=] kde-apps/kdeartwork-meta:* >=kde-apps/kdebase-meta-4.14.3:4[aqua=] >=kde-apps/kdeedu-meta-4.14.3:4[aqua=] >=kde-apps/kdegames-meta-4.14.3:4[aqua=] >=kde-apps/kdegraphics-meta-4.14.3:4[aqua=] >=kde-apps/kdemultimedia-meta-4.14.3:4[aqua=] >=kde-apps/kdenetwork-meta-4.14.3:4[aqua=] >=kde-apps/kdetoys-meta-4.14.3:4[aqua=] >=kde-apps/kdeutils-meta-4.14.3:4[aqua=] accessibility? ( >=kde-apps/kdeaccessibility-meta-4.14.3:4[aqua=] ) kdepim? ( >=kde-apps/kdepim-meta-4.4.11.1:4[aqua=] ) nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.14.3:4[aqua=] >=kde-apps/kdesdk-meta-4.14.3:4[aqua=] >=kde-apps/kdewebdev-meta-4.14.3:4[aqua=] ) !minimal? ( >=kde-base/kdeplasma-addons-4.14.3:4[aqua=] )
+RDEPEND=>=kde-apps/kate-4.14.3:4[aqua=] >=kde-apps/kdeadmin-meta-4.14.3:4[aqua=] kde-apps/kdeartwork-meta:* >=kde-apps/kdebase-meta-4.14.3:4[aqua=] >=kde-apps/kdeedu-meta-4.14.3:4[aqua=] >=kde-apps/kdegames-meta-4.14.3:4[aqua=] >=kde-apps/kdegraphics-meta-4.14.3:4[aqua=] >=kde-apps/kdemultimedia-meta-4.14.3:4[aqua=] >=kde-apps/kdenetwork-meta-4.14.3:4[aqua=] >=kde-apps/kdetoys-meta-4.14.3:4[aqua=] >=kde-apps/kdeutils-meta-4.14.3:4[aqua=] accessibility? ( >=kde-apps/kdeaccessibility-meta-4.14.3:4[aqua=] ) kdepim? ( >=kde-apps/kdepim-meta-4.4.11.1:4[aqua=] ) nls? ( >=kde-apps/kde4-l10n-4.14.3:4[aqua=] ) sdk? ( >=kde-apps/kdebindings-meta-4.14.3:4[aqua=] >=kde-apps/kdesdk-meta-4.14.3:4[aqua=] >=kde-apps/kdewebdev-meta-4.14.3:4[aqua=] ) !minimal? ( >=kde-base/kdeplasma-addons-4.14.3:4[aqua=] )
REQUIRED_USE=minimal? ( !kdepim )
SLOT=4
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde kde4-functions 88bc45dff8c885002aca6e4c0adbe541 kde4-meta-pkg 97cd16869157d1165551fafffa23eedc multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=4d033eb4869664f0c7cba8281477d312
+_md5_=e2eacab2dd9f44bf4d1bbe9c7ad18236
diff --git a/metadata/md5-cache/kde-apps/kde-meta-4.14.3-r1 b/metadata/md5-cache/kde-apps/kde-meta-4.14.3-r1
index 161e3ca5aed9..2b9c682d5419 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-4.14.3-r1
+++ b/metadata/md5-cache/kde-apps/kde-meta-4.14.3-r1
@@ -5,8 +5,8 @@ HOMEPAGE=https://www.kde.org/
IUSE=accessibility kdepim minimal nls sdk aqua
KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=metapackage
-RDEPEND=>=kde-apps/kate-4.14.3:4[aqua=] >=kde-apps/kdeadmin-meta-4.14.3:4[aqua=] kde-apps/kdeartwork-meta:* >=kde-apps/kdebase-meta-4.14.3:4[aqua=] >=kde-apps/kdeedu-meta-4.14.3:4[aqua=] >=kde-apps/kdegames-meta-4.14.3:4[aqua=] >=kde-apps/kdegraphics-meta-4.14.3:4[aqua=] >=kde-apps/kdemultimedia-meta-4.14.3:4[aqua=] >=kde-apps/kdenetwork-meta-4.14.3:4[aqua=] >=kde-apps/kdetoys-meta-4.14.3:4[aqua=] >=kde-apps/kdeutils-meta-4.14.3:4[aqua=] accessibility? ( >=kde-apps/kdeaccessibility-meta-4.14.3:4[aqua=] ) kdepim? ( >=kde-apps/kdepim-meta-4.4.11.1:4[aqua=] ) nls? ( >=kde-apps/kde4-l10n-4.14.3-r1:4[aqua=] ) sdk? ( >=kde-base/kdebindings-meta-4.14.3:4[aqua=] >=kde-apps/kdesdk-meta-4.14.3:4[aqua=] >=kde-apps/kdewebdev-meta-4.14.3:4[aqua=] ) !minimal? ( >=kde-base/kdeplasma-addons-4.14.3:4[aqua=] )
+RDEPEND=>=kde-apps/kate-4.14.3:4[aqua=] >=kde-apps/kdeadmin-meta-4.14.3:4[aqua=] kde-apps/kdeartwork-meta:* >=kde-apps/kdebase-meta-4.14.3:4[aqua=] >=kde-apps/kdeedu-meta-4.14.3:4[aqua=] >=kde-apps/kdegames-meta-4.14.3:4[aqua=] >=kde-apps/kdegraphics-meta-4.14.3:4[aqua=] >=kde-apps/kdemultimedia-meta-4.14.3:4[aqua=] >=kde-apps/kdenetwork-meta-4.14.3:4[aqua=] >=kde-apps/kdetoys-meta-4.14.3:4[aqua=] >=kde-apps/kdeutils-meta-4.14.3:4[aqua=] accessibility? ( >=kde-apps/kdeaccessibility-meta-4.14.3:4[aqua=] ) kdepim? ( >=kde-apps/kdepim-meta-4.4.11.1:4[aqua=] ) nls? ( >=kde-apps/kde4-l10n-4.14.3-r1:4[aqua=] ) sdk? ( >=kde-apps/kdebindings-meta-4.14.3:4[aqua=] >=kde-apps/kdesdk-meta-4.14.3:4[aqua=] >=kde-apps/kdewebdev-meta-4.14.3:4[aqua=] ) !minimal? ( >=kde-base/kdeplasma-addons-4.14.3:4[aqua=] )
REQUIRED_USE=minimal? ( !kdepim )
SLOT=4
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde kde4-functions 88bc45dff8c885002aca6e4c0adbe541 kde4-meta-pkg 97cd16869157d1165551fafffa23eedc multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=88547f9e8da9199cb0d3c4e95006daad
+_md5_=b47051f840a338ab9e5927a60d9e2bfe
diff --git a/metadata/md5-cache/kde-base/kdebindings-meta-4.14.3 b/metadata/md5-cache/kde-apps/kdebindings-meta-4.14.3
similarity index 100%
rename from metadata/md5-cache/kde-base/kdebindings-meta-4.14.3
rename to metadata/md5-cache/kde-apps/kdebindings-meta-4.14.3
diff --git a/metadata/md5-cache/media-gfx/fbida-2.10-r1 b/metadata/md5-cache/media-gfx/fbida-2.10-r1
deleted file mode 100644
index 626dd2346a72..000000000000
--- a/metadata/md5-cache/media-gfx/fbida-2.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 media-libs/libexif curl? ( net-misc/curl ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:* ) virtual/jpeg:* virtual/ttf-fonts webp? ( media-libs/libwebp ) X? ( >=x11-libs/motif-2.3:0 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) X? ( x11-proto/xextproto x11-proto/xproto ) pdf? ( app-text/ghostscript-gpl )
-DESCRIPTION=Image viewers for the framebuffer console (fbi) and X11 (ida)
-EAPI=5
-HOMEPAGE=http://www.kraxel.org/blog/linux/fbida/
-IUSE=curl fbcon +gif lirc pdf +png scanner +tiff X +webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 IJG
-RDEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 media-libs/libexif curl? ( net-misc/curl ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:* ) virtual/jpeg:* virtual/ttf-fonts webp? ( media-libs/libwebp ) X? ( >=x11-libs/motif-2.3:0 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt )
-REQUIRED_USE=pdf? ( tiff )
-SLOT=0
-SRC_URI=http://www.kraxel.org/releases/fbida/fbida-2.10.tar.gz mirror://gentoo/ida.png.bz2
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=be33f710efade44deab27ea03ddfbc0b
diff --git a/metadata/md5-cache/media-gfx/fbida-2.11 b/metadata/md5-cache/media-gfx/fbida-2.11
deleted file mode 100644
index 4255c8ea31d7..000000000000
--- a/metadata/md5-cache/media-gfx/fbida-2.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 media-libs/libexif curl? ( net-misc/curl ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:* ) virtual/jpeg:* virtual/ttf-fonts webp? ( media-libs/libwebp ) X? ( >=x11-libs/motif-2.3:0 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt ) X? ( x11-proto/xextproto x11-proto/xproto ) pdf? ( app-text/ghostscript-gpl )
-DESCRIPTION=Image viewers for the framebuffer console (fbi) and X11 (ida)
-EAPI=5
-HOMEPAGE=http://www.kraxel.org/blog/linux/fbida/
-IUSE=curl fbcon +gif lirc pdf +png scanner +tiff X +webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=GPL-2 IJG
-RDEPEND=!media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 media-libs/libexif curl? ( net-misc/curl ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:* ) virtual/jpeg:* virtual/ttf-fonts webp? ( media-libs/libwebp ) X? ( >=x11-libs/motif-2.3:0 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt )
-REQUIRED_USE=pdf? ( tiff )
-SLOT=0
-SRC_URI=http://www.kraxel.org/releases/fbida/fbida-2.11.tar.gz mirror://gentoo/ida.png.bz2
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=be33f710efade44deab27ea03ddfbc0b
diff --git a/metadata/md5-cache/media-gfx/imagemagick-6.9.4.1 b/metadata/md5-cache/media-gfx/imagemagick-6.9.4.1
index e415aae46425..5b19c059ed47 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-6.9.4.1
+++ b/metadata/md5-cache/media-gfx/imagemagick-6.9.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=A collection of tools and libraries for many image formats
EAPI=6
HOMEPAGE=http://www.imagemagick.org/
IUSE=autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=imagemagick
RDEPEND=dev-libs/libltdl:0 autotrace? ( >=media-gfx/autotrace-0.31.1 ) bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-gfx/ufraw ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
@@ -12,4 +12,4 @@ RESTRICT=perl? ( userpriv )
SLOT=0/6.9.4.1
SRC_URI=mirror://imagemagick/ImageMagick-6.9.4-1.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=eb032adc67f4bafd724742437c340b55
+_md5_=d96b9a85682632ef53a98b568575284c
diff --git a/metadata/md5-cache/media-libs/gd-2.2.0 b/metadata/md5-cache/media-libs/gd-2.2.0
index 06e43b18df25..7bb3d18846d7 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.0
+++ b/metadata/md5-cache/media-libs/gd-2.2.0
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
DESCRIPTION=A graphics library for fast image creation
-EAPI=5
+EAPI=6
HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
@@ -9,6 +9,6 @@ LICENSE=gd IJG HPND BSD
RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( media-libs/tiff:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
REQUIRED_USE=prefix? ( fontconfig )
SLOT=2/3
-SRC_URI=https://bitbucket.org/libgd/gd-libgd/downloads/libgd-2.2.0.tar.xz
+SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.0/libgd-2.2.0.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=398cc2d7df044d99c8f9c8ad6c46949f
+_md5_=4d18dec92c74c5c632391c8ff74b42c1
diff --git a/metadata/md5-cache/media-libs/libmms-0.6.4 b/metadata/md5-cache/media-libs/libmms-0.6.4
index 69af38c89ccc..79e4fadfd444 100644
--- a/metadata/md5-cache/media-libs/libmms-0.6.4
+++ b/metadata/md5-cache/media-libs/libmms-0.6.4
@@ -4,10 +4,10 @@ DESCRIPTION=Common library for accessing Microsoft Media Server (MMS) media stre
EAPI=5
HOMEPAGE=http://sourceforge.net/projects/libmms/ https://launchpad.net/libmms/
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
SLOT=0
SRC_URI=mirror://sourceforge/libmms/libmms-0.6.4.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c autotools-multilib 77afca16a6cb82823eed6366a10e7f75 autotools-utils 419811142edf3516b0d0cf1a254d93cb eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=895e5b41a3ec4d26cc84f8cde1b4ba98
+_md5_=b37f70fc7d75d93fcd34ec68bff48ff6
diff --git a/metadata/md5-cache/net-analyzer/cacti-0.8.8e b/metadata/md5-cache/net-analyzer/cacti-0.8.8e
deleted file mode 100644
index 047d8e051b30..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-0.8.8e
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Cacti is a complete frontend to rrdtool
-EAPI=5
-HOMEPAGE=http://www.cacti.net/
-IUSE=snmp doc vhosts
-KEYWORDS=alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
-SLOT=0.8.8e
-SRC_URI=http://www.cacti.net/downloads/cacti-0.8.8e.tar.gz
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb webapp 42c6ef7af496b228f9854b3c81e4b226
-_md5_=0c48f632393c22514e9076f1ae8d3978
diff --git a/metadata/md5-cache/net-analyzer/cacti-0.8.8f b/metadata/md5-cache/net-analyzer/cacti-0.8.8f
deleted file mode 100644
index c2d2b3249982..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-0.8.8f
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Cacti is a complete frontend to rrdtool
-EAPI=5
-HOMEPAGE=http://www.cacti.net/
-IUSE=snmp doc vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
-SLOT=0.8.8f
-SRC_URI=http://www.cacti.net/downloads/cacti-0.8.8f.tar.gz
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb webapp 42c6ef7af496b228f9854b3c81e4b226
-_md5_=5617b0db8b35d751cc188551a3bbdbee
diff --git a/metadata/md5-cache/net-analyzer/cacti-0.8.8g b/metadata/md5-cache/net-analyzer/cacti-0.8.8g
deleted file mode 100644
index 430d1772c15d..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-0.8.8g
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare prerm setup
-DEPEND=|| ( virtual/httpd-basic virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Cacti is a complete frontend to rrdtool
-EAPI=5
-HOMEPAGE=http://www.cacti.net/
-IUSE=snmp doc vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[cli,mysql,session,sockets,xml] dev-php/adodb net-analyzer/rrdtool[graph] virtual/cron virtual/mysql snmp? ( >=net-analyzer/net-snmp-5.2.0 ) >=app-admin/webapp-config-1.50.15
-SLOT=0.8.8g
-SRC_URI=http://www.cacti.net/downloads/cacti-0.8.8g.tar.gz
-_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb webapp 42c6ef7af496b228f9854b3c81e4b226
-_md5_=5617b0db8b35d751cc188551a3bbdbee
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.8f b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.8f
deleted file mode 100644
index a9ae699acf4d..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.8f
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=5
-HOMEPAGE=http://cacti.net/spine_info.php
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=http://www.cacti.net/downloads/spine/cacti-spine-0.8.8f.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=4e87af64739251c56e6dd8e100761ebb
diff --git a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.8g b/metadata/md5-cache/net-analyzer/cacti-spine-0.8.8g
deleted file mode 100644
index 23cfe7fa9458..000000000000
--- a/metadata/md5-cache/net-analyzer/cacti-spine-0.8.8g
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql sys-apps/help2man !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Spine is a fast poller for Cacti (formerly known as Cactid)
-EAPI=5
-HOMEPAGE=http://cacti.net/spine_info.php
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/openssl:* net-analyzer/net-snmp virtual/mysql >net-analyzer/cacti-0.8.8
-SLOT=0
-SRC_URI=http://www.cacti.net/downloads/spine/cacti-spine-0.8.8g.tar.gz
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=30a5a894a6d77db6d71f76750f0c84eb
diff --git a/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r1 b/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r2
similarity index 52%
rename from metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r1
rename to metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r2
index 3fb1be73e0fe..3ca8ddfdf1b6 100644
--- a/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r1
+++ b/metadata/md5-cache/net-analyzer/echoping-6.0.2_p434-r2
@@ -1,15 +1,15 @@
DEFINED_PHASES=configure install prepare
-DEPEND=idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql ) ldap? ( net-nds/openldap ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( >=dev-libs/openssl-0.9.7d ) ) >=sys-devel/libtool-2 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql:* ) ldap? ( net-nds/openldap ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3:= ) !gnutls? ( >=dev-libs/openssl-0.9.7d:= ) ) >=sys-devel/libtool-2 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Small program to test performances of remote servers
EAPI=5
HOMEPAGE=http://echoping.sourceforge.net/
IUSE=gnutls http icp idn priority smtp ssl tos postgres ldap
KEYWORDS=~amd64 ~hppa ~x86
LICENSE=GPL-2
-RDEPEND=idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql ) ldap? ( net-nds/openldap ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( >=dev-libs/openssl-0.9.7d ) )
+RDEPEND=idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql:* ) ldap? ( net-nds/openldap ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3:= ) !gnutls? ( >=dev-libs/openssl-0.9.7d:= ) )
REQUIRED_USE=gnutls? ( ssl )
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~jer/echoping-6.0.2_p434.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=352390b8096d00383a6480698f73bf81
+_md5_=12eb245cb71440d4cfecdfd8ea6c3378
diff --git a/metadata/md5-cache/net-analyzer/vnstat-1.15 b/metadata/md5-cache/net-analyzer/vnstat-1.15
index 55ca781cb0df..a694d4d9e068 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-1.15
+++ b/metadata/md5-cache/net-analyzer/vnstat-1.15
@@ -4,10 +4,10 @@ DESCRIPTION=Console-based network traffic monitor that keeps statistics of netwo
EAPI=5
HOMEPAGE=http://humdi.net/vnstat/
IUSE=gd selinux test
-KEYWORDS=amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm hppa ~ppc ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd )
SLOT=0
SRC_URI=http://humdi.net/vnstat/vnstat-1.15.tar.gz
_eclasses_=multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
-_md5_=0dc0e9aa9ab6362337d820a087d18a1f
+_md5_=f6ac231271278beb942054a7570e42cf
diff --git a/metadata/md5-cache/net-dialup/mingetty-1.08-r1 b/metadata/md5-cache/net-dialup/mingetty-1.08-r1
index bf7d640628e5..c8b405674f47 100644
--- a/metadata/md5-cache/net-dialup/mingetty-1.08-r1
+++ b/metadata/md5-cache/net-dialup/mingetty-1.08-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A compact getty program for virtual consoles only
EAPI=6
HOMEPAGE=http://sourceforge.net/projects/mingetty
IUSE=unicode
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/mingetty/mingetty-1.08.tar.gz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=5c46db3e7b60918dc16b14f11a9a52d8
+_md5_=3cff26593b392d1f828e8a7c5d44ace5
diff --git a/metadata/md5-cache/net-firewall/firehol-3.0.1-r1 b/metadata/md5-cache/net-firewall/firehol-3.0.1-r1
new file mode 100644
index 000000000000..37a715051024
--- /dev/null
+++ b/metadata/md5-cache/net-firewall/firehol-3.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute virtual/modutils app-arch/gzip
+DESCRIPTION=iptables firewall generator
+EAPI=5
+HOMEPAGE=http://firehol.sourceforge.net/
+IUSE=doc ipv6
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=net-firewall/iptables sys-apps/iproute2[-minimal,ipv6?] net-misc/iputils[ipv6?] net-misc/iprange net-analyzer/traceroute virtual/modutils app-arch/gzip
+SLOT=0
+SRC_URI=https://firehol.org/download/firehol/releases/v3.0.1/firehol-3.0.1.tar.xz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde linux-info fd1e29abbb02cbc49f1a14299846e9c4 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=739729ef89ded94b3507b58f955f5095
diff --git a/metadata/md5-cache/net-ftp/lftp-4.7.1 b/metadata/md5-cache/net-ftp/lftp-4.7.1
index cad3dec4832e..d8dc3ae92df5 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.7.1
+++ b/metadata/md5-cache/net-ftp/lftp-4.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer
EAPI=5
HOMEPAGE=http://lftp.yar.ru/
IUSE=convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN linguas_zh_HK linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) openssl? ( dev-libs/openssl:0= ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
SLOT=0
SRC_URI=http://lftp.yar.ru/ftp/lftp-4.7.1.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=5674e9ffeaf7738c3d67bcda96599991
+_md5_=197eece16bdb2c036c321144b6956a69
diff --git a/metadata/md5-cache/net-ftp/lftp-4.7.0 b/metadata/md5-cache/net-ftp/lftp-4.7.2
similarity index 67%
rename from metadata/md5-cache/net-ftp/lftp-4.7.0
rename to metadata/md5-cache/net-ftp/lftp-4.7.2
index d0490b3b3e61..9fceaf92ef7d 100644
--- a/metadata/md5-cache/net-ftp/lftp-4.7.0
+++ b/metadata/md5-cache/net-ftp/lftp-4.7.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( dev-libs/openssl:0 ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) openssl? ( dev-libs/openssl:0= ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 ) =sys-devel/libtool-2* app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19 ) virtual/pkgconfig !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
EAPI=5
HOMEPAGE=http://lftp.yar.ru/
IUSE=convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_uk linguas_zh_CN linguas_zh_HK linguas_zh_TW
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( dev-libs/openssl:0 ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
+RDEPEND=>=sys-libs/ncurses-5.1:= >=sys-libs/readline-5.1:= dev-libs/expat sys-libs/zlib convert-mozilla-cookies? ( dev-perl/DBI ) idn? ( net-dns/libidn ) socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3:0= ) openssl? ( dev-libs/openssl:0= ) ) verify-file? ( dev-perl/String-CRC32 virtual/perl-Digest-MD5 )
REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
SLOT=0
-SRC_URI=http://lftp.yar.ru/ftp/lftp-4.7.0.tar.xz
+SRC_URI=http://lftp.yar.ru/ftp/lftp-4.7.2.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=abd7333c1d85c59b97258e60059658b0
+_md5_=a63f3e765349cc8a31b8d9d750e4846b
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.23 b/metadata/md5-cache/net-libs/gnutls-3.3.23
new file mode 100644
index 000000000000..aa9954b09e77
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/libtasn1-4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.7:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( sys-apps/texinfo dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
+EAPI=6
+HOMEPAGE=http://www.gnutls.org/
+IUSE=+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-libs/libtasn1-4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-2.7:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.23.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=527b4909ba7693986d35159210985cc8
diff --git a/metadata/md5-cache/net-libs/gnutls-3.4.12 b/metadata/md5-cache/net-libs/gnutls-3.4.12
new file mode 100644
index 000000000000..297a693aabd4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.4.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/libtasn1-4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-devel/automake-1.11.6 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] doc? ( sys-apps/texinfo dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
+EAPI=6
+HOMEPAGE=http://www.gnutls.org/
+IUSE=+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-libs/libtasn1-4.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.1:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( sys-devel/autogen ) crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0/30
+SRC_URI=mirror://gnupg/gnutls/v3.4/gnutls-3.4.12.tar.xz
+_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=cfadac2e28b86e49e900cfe75d5a2b54
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.3-r1 b/metadata/md5-cache/net-libs/libssh-0.7.3-r1
index 4c52c090277c..7c2161c9aad3 100644
--- a/metadata/md5-cache/net-libs/libssh-0.7.3-r1
+++ b/metadata/md5-cache/net-libs/libssh-0.7.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Access a working SSH implementation by means of a library
EAPI=6
HOMEPAGE=http://www.libssh.org/
IUSE=debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gcrypt? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/4
SRC_URI=https://red.libssh.org/attachments/download/195/libssh-0.7.3.tar.xz -> libssh-0.7.3.tar.xz
_eclasses_=cmake-multilib 273c15f5a0a06438a38bb5c3e98fa2db cmake-utils d6c1714cc58fd2168bf150f2a01f3801 eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multilib-build 8fe2e81aeb36cdf8a6cc5f50443879cc multilib-minimal 0224dee31c0f98405d572e14ad6dee65 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=46c737b1bd99b87e96b01387000c3a89
+_md5_=49cde81450b125109ca78da9d8e4e582
diff --git a/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9-r1 b/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9-r1
index 535366054219..04670cf5f686 100644
--- a/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9-r1
+++ b/metadata/md5-cache/net-libs/rb_libtorrent-1.0.9-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/arvidn/libtorrent/archive/libtorrent-1_0_9.tar.gz -> rb_libtorrent-1.0.9.tar.gz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c distutils-r1 0af33659915efd4b147c76251893f652 eutils 792f83d5ec9536cb5ccef375469d8bde libtool 4890219c51da247200223277f993e054 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib d062ae4ba2fc40a19c11de2ad89b6616 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 0f6937650a475d673baa5d0c8c0b37b3 python-utils-r1 13d5b02ea59b21da41c77c9294f3b7f7 toolchain-funcs d513d423d449877e49d99af3f7af7acb versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5592e5b306cb2831952376377a2b7960
+_md5_=c32c3a966042c24429f6ba8baae79cae
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.2 b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.2
new file mode 100644
index 000000000000..37ee11b5af57
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install preinst setup
+DEPEND=dev-lang/erlang app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
+DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
+EAPI=5
+HOMEPAGE=http://www.rabbitmq.com/
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2 MPL-1.1
+RDEPEND=dev-lang/erlang
+SLOT=0
+SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.2/rabbitmq-server-3.6.2.tar.xz
+_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 python-any-r1 8eb13cdf35f6e43c48107b911900b2cc python-utils-r1 13d5b02ea59b21da41c77c9294f3b7f7 systemd 3165c885f3c71ffae7a867d931fb0e07 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
+_md5_=1c4b86433b0d923570145058f0eec2a5
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.0 b/metadata/md5-cache/sys-apps/texinfo-6.0
index dc4435dbd0ac..ffa853bdc79d 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.0
+++ b/metadata/md5-cache/sys-apps/texinfo-6.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
+DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext )
DESCRIPTION=The GNU info program and utilities
EAPI=5
HOMEPAGE=https://www.gnu.org/software/texinfo/
IUSE=nls static
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-3
-RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
+RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://gnu/texinfo/texinfo-6.0.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=757576ce4e80736bb1ff1e881426e80f
+_md5_=a3a35cbe9113907e436135768b9fa610
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.1 b/metadata/md5-cache/sys-apps/texinfo-6.1
index 58be722e00e5..2a5ddd329fd6 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.1
+++ b/metadata/md5-cache/sys-apps/texinfo-6.1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure
-DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl ) app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19.6 )
+DEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl ) app-arch/xz-utils nls? ( >=sys-devel/gettext-0.19.6 )
DESCRIPTION=The GNU info program and utilities
EAPI=5
HOMEPAGE=https://www.gnu.org/software/texinfo/
IUSE=nls static
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=GPL-3
-RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
+RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://gnu/texinfo/texinfo-6.1.tar.xz
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde flag-o-matic d270fa247153df66074f795fa42dba3e multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb
-_md5_=2e5d6536d0521539a0c2ec9f135d6f04
+_md5_=1085e7805e9947fb7a12ee8a435740a2
diff --git a/metadata/md5-cache/www-servers/uwsgi-2.0.13.1 b/metadata/md5-cache/www-servers/uwsgi-2.0.13.1-r1
similarity index 100%
rename from metadata/md5-cache/www-servers/uwsgi-2.0.13.1
rename to metadata/md5-cache/www-servers/uwsgi-2.0.13.1-r1
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ca2c3291a268..3d8e3ca95629 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 20 May 2016 06:40:50 +0000
+Fri, 20 May 2016 12:10:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index e07729d33b1e..bf92021d2db3 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri May 20 06:39:54 UTC 2016
+Fri May 20 12:09:54 UTC 2016
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 09d6a0aaae16..cb1b51c7d0ce 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 20 May 2016 07:00:01 +0000
+Fri, 20 May 2016 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d78d541d0087..5261300b3958 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1463726401 Fri 20 May 2016 06:40:01 AM UTC
+1463746201 Fri 20 May 2016 12:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ca2c3291a268..3d8e3ca95629 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 20 May 2016 06:40:50 +0000
+Fri, 20 May 2016 12:10:49 +0000
diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest
index 66db427a67d1..2dcb67b97aa5 100644
--- a/net-analyzer/cacti-spine/Manifest
+++ b/net-analyzer/cacti-spine/Manifest
@@ -1,4 +1,2 @@
DIST cacti-spine-0.8.8e.tar.gz 757042 SHA256 e014488acffd4dd3a88306c3809e93a89c8538a050c2a58a9666e4c04c004b92 SHA512 165e93d4cce3378e911aec41fcd68fb541d82d849ebf3e2e28e0ddb65027ff2eb77d488acbaa133244091cd02adb58d8f74ea5abc36abed07af9ea72bc104f40 WHIRLPOOL 59442f54fbb8956a945404f374eba848bc21b60d53dacb025132a91dc077115aa65ee30959ba81fb521beb9732c1c5944adb1c555a36ad6ea72898172404970c
-DIST cacti-spine-0.8.8f.tar.gz 757078 SHA256 d0599239187f2f5a29f82b809e6941447f18bb7b170cd42e67455633b195e3c7 SHA512 8c5e1713bb1d41227cef6047e5348ef33b90b5591976cf24390abbf1e5c68de6714f785d9517ca9aed21b42b6b8772512af176b9f62bf18d6d74d949a6359a22 WHIRLPOOL 70545057f80d5cc5940059179bc3b72eabf48ff61c5eed5b0b344e995eb1411e3a89359e8c0b6bc3850b029233597d581ece59a99c6653ac7cfd028ef2e24232
-DIST cacti-spine-0.8.8g.tar.gz 805321 SHA256 f7d60d5663f6fe8f730363763f31d110589c725e482c943f0f8287359a6db533 SHA512 24d208b4779e5d04e0206e950c0d49d0453937b3da4a3e3bdbb1a075bdf22db3c6bb6789bab92f6c22a67c39745a36fc98cb28371423469b87a5936b3afb3ba3 WHIRLPOOL d1106b59748ac166c0b44ffdad285c3efefb03fec98318704e16022bf788168603884ee1b4bd22d9ef5fb962c5a60bfda241c6675b987fe9c02c7c4068213ad2
DIST cacti-spine-0.8.8h.tar.gz 804951 SHA256 a693136839bd7d03cae5b3ff4614a4d21a2153ffb14d09fc061b843ab0b2bb30 SHA512 6a7147ab645be44de0d330c7801e569705817da10bf6cedba82c712e1701ada8aa8924a6b3b063ea680e6af24f815d6767e8773ad7b8da212abfa082b4211bd4 WHIRLPOOL 36daed4986ca84883e51ab6b02ebb2ade00205c30705cfc94e73835bc2fc427a60a2dba9c7ca3665d0c0b2fca21afab77d94cde63b740f3734f9279c929cccaf
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
deleted file mode 100644
index 81e07ffbb733..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8f.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="http://cacti.net/spine_info.php"
-SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="
- dev-libs/openssl:*
- net-analyzer/net-snmp
- virtual/mysql
-"
-RDEPEND="
- ${DEPEND}
- >net-analyzer/cacti-0.8.8
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.8.8f-fix-ac-macro.patch \
- "${FILESDIR}"/${PN}-0.8.8e-net-snmp.patch \
- "${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
- "${FILESDIR}"/${PN}-0.8.8d-ping.patch \
- "${FILESDIR}"/${PN}-0.8.8d-snmp_spine_close.patch
-
- sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
- AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
- dosbin spine
- insinto /etc/
- insopts -m0640 -o root
- newins spine.conf{.dist,}
- dodoc ChangeLog README
-}
diff --git a/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
deleted file mode 100644
index 75f9d645d7dc..000000000000
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8g.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${PN}-${PV/_p/-}
-
-DESCRIPTION="Spine is a fast poller for Cacti (formerly known as Cactid)"
-HOMEPAGE="http://cacti.net/spine_info.php"
-SRC_URI="http://www.cacti.net/downloads/spine/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-CDEPEND="
- dev-libs/openssl:*
- net-analyzer/net-snmp
- virtual/mysql
-"
-DEPEND="
- ${CDEPEND}
- sys-apps/help2man
-"
-RDEPEND="
- ${CDEPEND}
- >net-analyzer/cacti-0.8.8
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-0.8.8g-fix-ac-macro.patch \
- "${FILESDIR}"/${PN}-0.8.8d-mysql.patch \
- "${FILESDIR}"/${PN}-0.8.8d-ping.patch \
- "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch \
- "${FILESDIR}"/${PN}-0.8.8g-parallel-make.patch
-
- sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
- AT_M4DIR="config" eautoreconf
-}
-
-src_install() {
- dosbin spine
- insinto /etc/
- insopts -m0640 -o root
- newins spine.conf{.dist,}
- dodoc ChangeLog README
-}
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch
deleted file mode 100644
index a879d5e0bf96..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8f-fix-ac-macro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@
- AC_LANG(C)
-
- AM_INIT_AUTOMAKE(spine, 0.8.8f)
--AM_CONFIG_HEADER(config/config.h)
-+AC_CONFIG_HEADERS(config/config.h)
-
- # static libraries
- AC_ARG_WITH(static,
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
deleted file mode 100644
index fa12f1ec4a79..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-fix-ac-macro.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,7 +10,7 @@
- AC_LANG(C)
-
- AM_INIT_AUTOMAKE(spine, 0.8.8g)
--AM_CONFIG_HEADER(config/config.h)
-+AC_CONFIG_HEADERS(config/config.h)
-
- # static libraries
- AC_ARG_WITH(static,
diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
deleted file mode 100644
index e7983ed759e5..000000000000
--- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8g-parallel-make.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -9,5 +9,5 @@
-
- man_MANS = spine.1
-
--spine.1: spine.c
-+spine.1: $(sbin_PROGRAMS)
- $(HELP2MAN) --output=$@ --name='Data Collector for Cacti' --no-info --version-option='--version' ./spine
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index ccc05f635c17..025dd4d0a3e4 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,4 +1,2 @@
-DIST cacti-0.8.8e.tar.gz 2594446 SHA256 43b091957faf03a4b0baacc8c327320394c0843476ea34e3beb1416506ad3f55 SHA512 11eeace353b7bacb2e4f065b1557b6978f0315d372f03f25bbdd210aaa494b70661b24502885bb610d8cf042cdcd68c69ea1a6fd1cb7073af29553116500df0c WHIRLPOOL ea5f29a71504f4e1fb4d8981db84b46fb87842921d8f6f422b8a0c2b127e80b785fca60b3b037036396cf9de456240a573cd446118f03a93f25a2406fe22be40
DIST cacti-0.8.8f.tar.gz 2594409 SHA256 2ea92407c11bf13302558a5bc9e1f3a57bd14a1d9ded48c505ec495762f76738 SHA512 b712a9f8b7bee632cb4982fed72793ac2f4d70aa042784bbd2fd3923a27901f457393aa95bbd63960187e85fe462c35e88fa3cd93e8537a3a68f94bdbf5d7f2b WHIRLPOOL 58c883780fed833df2501b204a21fc8605e76a7b5ac26ebd13f0bf22f45dda6363be35ada8af2a65f4e7db506d103b6739d73699676c1622e7051eb8a89ad555
-DIST cacti-0.8.8g.tar.gz 2584879 SHA256 3187bd5054ae4e54496bb23187f14c79a441fedcfd397a2d27cd60179f0dee33 SHA512 cbac69de47a32de8b87d0fc2f32e90eb70f7f13828fd17764957b5afbbcc7a8954ccc49f30f414d5fdf09142967a9ddcb4cde66d03569407ae05fc36612b731c WHIRLPOOL 47633f00e8875f98d80806cb0743b817030c487a3c62ede453e73125f87c210c320820c92df95555227e32148ff8271c8760c504955a683d6affadda73846213
DIST cacti-0.8.8h.tar.gz 2585226 SHA256 0673bd9513dad381c8bbb9133c721a32bc6422dc91c5a81de16e3cd32e4d0600 SHA512 11bb0682a7220af5581f42579cf9c38d94aae202425ce15b824849684b1a6778d6f14e6a62ec94c608b7ba06562a825be7fd6d812d0800daa5eb56e640ac1c5f WHIRLPOOL 250ee38d969c9a7d9a71b15a25e48c2b9b22412c6c2394798d178172d9a1be056b009b328594559524adbd47ad05032992b13cb5a632af1a23f947fb55342402
diff --git a/net-analyzer/cacti/cacti-0.8.8e.ebuild b/net-analyzer/cacti/cacti-0.8.8e.ebuild
deleted file mode 100644
index c0f81999031b..000000000000
--- a/net-analyzer/cacti/cacti-0.8.8e.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="http://www.cacti.net/"
-SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
- dev-lang/php[cli,mysql,session,sockets,xml]
- dev-php/adodb
- net-analyzer/rrdtool[graph]
- virtual/cron
- virtual/mysql
- snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_prepare() {
- sed -i -e \
- 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
- "${S}"/include/global.php || die
-
- rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
- webapp_src_preinst
-
- rm LICENSE README || die
- dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt}
- use doc && dohtml -r docs/html/
- rm -rf docs
-
- edos2unix `find -type f -name '*.php'`
-
- dodir ${MY_HTDOCSDIR}
- cp -r . "${D}"${MY_HTDOCSDIR}
-
- webapp_serverowned ${MY_HTDOCSDIR}/rra
- webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
- webapp_configfile ${MY_HTDOCSDIR}/include/config.php
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
- webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-0.8.8f.ebuild b/net-analyzer/cacti/cacti-0.8.8f.ebuild
deleted file mode 100644
index 3c9a4a9b9b6f..000000000000
--- a/net-analyzer/cacti/cacti-0.8.8f.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="http://www.cacti.net/"
-SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
- dev-lang/php[cli,mysql,session,sockets,xml]
- dev-php/adodb
- net-analyzer/rrdtool[graph]
- virtual/cron
- virtual/mysql
- snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_prepare() {
- sed -i -e \
- 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
- "${S}"/include/global.php || die
-
- rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
- webapp_src_preinst
-
- rm LICENSE README || die
- dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt}
- use doc && dohtml -r docs/html/
- rm -rf docs
-
- edos2unix `find -type f -name '*.php'`
-
- dodir ${MY_HTDOCSDIR}
- cp -r . "${D}"${MY_HTDOCSDIR}
-
- webapp_serverowned ${MY_HTDOCSDIR}/rra
- webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
- webapp_configfile ${MY_HTDOCSDIR}/include/config.php
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
- webapp_src_install
-}
diff --git a/net-analyzer/cacti/cacti-0.8.8g.ebuild b/net-analyzer/cacti/cacti-0.8.8g.ebuild
deleted file mode 100644
index 3c9a4a9b9b6f..000000000000
--- a/net-analyzer/cacti/cacti-0.8.8g.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils webapp
-
-# Support for _p* in version.
-MY_P=${P/_p*/}
-
-DESCRIPTION="Cacti is a complete frontend to rrdtool"
-HOMEPAGE="http://www.cacti.net/"
-SRC_URI="http://www.cacti.net/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="snmp doc"
-
-need_httpd
-
-RDEPEND="
- dev-lang/php[cli,mysql,session,sockets,xml]
- dev-php/adodb
- net-analyzer/rrdtool[graph]
- virtual/cron
- virtual/mysql
- snmp? ( >=net-analyzer/net-snmp-5.2.0 )
-"
-
-src_prepare() {
- sed -i -e \
- 's:$config\["library_path"\] . "/adodb/adodb.inc.php":"adodb/adodb.inc.php":' \
- "${S}"/include/global.php || die
-
- rm -rf lib/adodb || die # don't use bundled adodb
-}
-
-src_compile() { :; }
-
-src_install() {
- webapp_src_preinst
-
- rm LICENSE README || die
- dodoc docs/{CHANGELOG,CONTRIB,README,txt/manual.txt}
- use doc && dohtml -r docs/html/
- rm -rf docs
-
- edos2unix `find -type f -name '*.php'`
-
- dodir ${MY_HTDOCSDIR}
- cp -r . "${D}"${MY_HTDOCSDIR}
-
- webapp_serverowned ${MY_HTDOCSDIR}/rra
- webapp_serverowned ${MY_HTDOCSDIR}/log/cacti.log
- webapp_configfile ${MY_HTDOCSDIR}/include/config.php
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-
- webapp_src_install
-}
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
similarity index 77%
rename from net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
rename to net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
index f0c6bf4d1c70..dc4f5d53219c 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r1.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,11 +16,11 @@ IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap"
RESTRICT="test"
RDEPEND="idn? ( net-dns/libidn )
- postgres? ( dev-db/postgresql )
+ postgres? ( dev-db/postgresql:* )
ldap? ( net-nds/openldap )
ssl? (
- gnutls? ( >=net-libs/gnutls-1.0.17 )
- !gnutls? ( >=dev-libs/openssl-0.9.7d )
+ gnutls? ( >=net-libs/gnutls-3.3:= )
+ !gnutls? ( >=dev-libs/openssl-0.9.7d:= )
)"
DEPEND="${RDEPEND}
>=sys-devel/libtool-2"
@@ -31,6 +31,8 @@ DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO )
src_prepare() {
epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch
+ epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch
+ epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch
eautoreconf
}
diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch
new file mode 100644
index 000000000000..0cb219f254cb
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_certificate_type_set_priority.patch
@@ -0,0 +1,11 @@
+--- a/echoping.c
++++ b/echoping.c
+@@ -981,8 +981,6 @@
+ if (tls_result != 0)
+ err_sys("Cannot create a new TLS session");
+ gnutls_set_default_priority(session);
+- gnutls_certificate_type_set_priority(session,
+- cert_type_priority);
+ gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+ gnutls_transport_set_ptr(session, (gnutls_transport_ptr)
+ (long) sockfd);
diff --git a/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch
new file mode 100644
index 000000000000..8b87c47c7892
--- /dev/null
+++ b/net-analyzer/echoping/files/echoping-6.0.2_p434-gnutls_session.patch
@@ -0,0 +1,22 @@
+--- a/echoping.c
++++ b/echoping.c
+@@ -134,7 +134,7 @@
+ SSL *sslh = NULL;
+ #endif
+ #ifdef GNUTLS
+- gnutls_session session;
++ gnutls_session_t session;
+ gnutls_certificate_credentials xcred;
+ int tls_result;
+ const int cert_type_priority[3] = { GNUTLS_CRT_X509,
+--- a/echoping.h
++++ b/echoping.h
+@@ -103,7 +103,7 @@
+ SSL *ssl;
+ #endif
+ #ifdef GNUTLS
+- gnutls_session tls;
++ gnutls_session_t tls;
+ #endif
+ } CHANNEL;
+
diff --git a/net-analyzer/vnstat/vnstat-1.15.ebuild b/net-analyzer/vnstat/vnstat-1.15.ebuild
index 3c389b1a93a7..9d51a3fedcbb 100644
--- a/net-analyzer/vnstat/vnstat-1.15.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm hppa ~ppc ppc64 ~sparc ~x86"
IUSE="gd selinux test"
COMMON_DEPEND="
diff --git a/net-dialup/mingetty/mingetty-1.08-r1.ebuild b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
index abb39f352a7a..f9a9265f5430 100644
--- a/net-dialup/mingetty/mingetty-1.08-r1.ebuild
+++ b/net-dialup/mingetty/mingetty-1.08-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
IUSE="unicode"
PATCHES=(
diff --git a/net-firewall/firehol/firehol-3.0.1-r1.ebuild b/net-firewall/firehol/firehol-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..74bdc5750ff2
--- /dev/null
+++ b/net-firewall/firehol/firehol-3.0.1-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils linux-info
+
+DESCRIPTION="iptables firewall generator"
+HOMEPAGE="http://firehol.sourceforge.net/"
+SRC_URI="https://firehol.org/download/firehol/releases/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc ipv6"
+KEYWORDS="~amd64 ~arm"
+
+RDEPEND="net-firewall/iptables
+ sys-apps/iproute2[-minimal,ipv6?]
+ net-misc/iputils[ipv6?]
+ net-misc/iprange
+ net-analyzer/traceroute
+ virtual/modutils
+ app-arch/gzip"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ local KCONFIG_OPTS=" \
+ ~IP_NF_FILTER \
+ ~IP_NF_IPTABLES \
+ ~IP_NF_MANGLE \
+ ~IP_NF_TARGET_MASQUERADE
+ ~IP_NF_TARGET_REDIRECT \
+ ~IP_NF_TARGET_REJECT \
+ ~NETFILTER_XT_MATCH_LIMIT \
+ ~NETFILTER_XT_MATCH_OWNER \
+ ~NETFILTER_XT_MATCH_STATE \
+ ~NF_CONNTRACK \
+ ~NF_CONNTRACK_IPV4 \
+ ~NF_CONNTRACK_MARK \
+ ~NF_NAT \
+ ~NF_NAT_FTP \
+ ~NF_NAT_IRC \
+ "
+ linux-info_pkg_setup
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --disable-vnetbuild \
+ --disable-update-ipsets \
+ $(use_enable doc) \
+ $(use_enable ipv6)
+}
+
+src_install() {
+ default
+
+ newconfd "${FILESDIR}"/firehol.conf.d firehol
+ newinitd "${FILESDIR}"/firehol.initrd firehol
+ newconfd "${FILESDIR}"/fireqos.conf.d fireqos
+ newinitd "${FILESDIR}"/fireqos.initrd fireqos
+}
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index defad20ef9e5..b93fa817a1b7 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,3 +1,3 @@
DIST lftp-4.6.5.tar.xz 1514644 SHA256 1fd0920a1791ce0e9e39ffce77ae6619e5dc665f16e9380bafbfc69411eeb71e SHA512 a22faa3a6901160460f1103c19c5276f603c154908ec2e34804a6eb48452b59ba495993e6824f57d114285ddc80a64dccd0069465cc0593f34f435ac181250c0 WHIRLPOOL 088598ed9395cd8f9ed79be26e0833593e733cf87bbd51e5d008ce4de2b9924e62add20789c098a866d82dc3f168a373c4874de264d669950524a9a255e1e028
-DIST lftp-4.7.0.tar.xz 1621592 SHA256 9a0b3580b222a7f9cc17c6c85d6ac8ec227357ca5050301171fd9564aae73f44 SHA512 9d20b78a8ae33ef7337ce2699d5ff682b45fd3015d5a9b40e87ca6c426a1ce22ab13778110e8120da8c5087c5de9fe203b7192e2e80296e9d84d267c4b2b5de6 WHIRLPOOL 3df4ef7e89c3499811ed90d0775c5eed48a7698cc26475cd9c545af66ffa1e355e93c8bf579d24885fee301d044f39fe92de7a5afc48a4700910fa9959050725
DIST lftp-4.7.1.tar.xz 1532368 SHA256 fd5a5cff636629a19c60a60007f4b0dc0c7d59566b1e8a50f668d2f7e67740e5 SHA512 b65ce2514f954cfcef9cee721b0b6d5607457ce541e40ee758d9f9f4dabab58edcb9a70ac7aa46c17d80d83b595f32cc40ea664606ba7310ed24e58bd4add494 WHIRLPOOL 24c2610cae254a77006f3a80afd64b034a1864b832a65c14b9c7248351e19f3bc062fe2a02f02789cfdc895a5481dd06937369ce2f45e2751728a7be00b61106
+DIST lftp-4.7.2.tar.xz 1542780 SHA256 475d7699b1390f951efee867ba1ad600f78329e13fd2a04d92f82bfffb70d872 SHA512 6cd948835b320c14c58c7fe9b684aa3cd6281437ebebcb39091c96c55615d07ea8a4786fb82cd3818ddcf62b969d1db3f8927c6e43ab8a504991fa845dd57622 WHIRLPOOL 62b00178cceb0cbe055e07db33b6fce4d2a1532d23d290b3a5b359e2e9f05ccafc5bec1772b79dbbbd3a4df22c7fb617a219184de9fc98e6047ec74b61d61796
diff --git a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
index c2d6b805478e..729410a9ddf6 100644
--- a/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
+++ b/net-ftp/lftp/files/lftp-4.7.0-gettext.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig 2016-03-28 18:28:34.834007550 +0200
-+++ configure.ac 2016-03-28 19:03:32.455125971 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -138,7 +138,7 @@
ALL_LINGUAS="de es fr it ja ko pl pt_BR ru uk zh_CN zh_TW zh_HK cs"
diff --git a/net-ftp/lftp/lftp-4.7.1.ebuild b/net-ftp/lftp/lftp-4.7.1.ebuild
index 37525237b3d8..0cc576bcb0cc 100644
--- a/net-ftp/lftp/lftp-4.7.1.ebuild
+++ b/net-ftp/lftp/lftp-4.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file"
LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
diff --git a/net-ftp/lftp/lftp-4.7.0.ebuild b/net-ftp/lftp/lftp-4.7.2.ebuild
similarity index 96%
rename from net-ftp/lftp/lftp-4.7.0.ebuild
rename to net-ftp/lftp/lftp-4.7.2.ebuild
index 3a58816ba2c9..e7dec1a0d048 100644
--- a/net-ftp/lftp/lftp-4.7.0.ebuild
+++ b/net-ftp/lftp/lftp-4.7.2.ebuild
@@ -33,8 +33,8 @@ RDEPEND="
virtual/pam
)
ssl? (
- gnutls? ( >=net-libs/gnutls-1.2.3 )
- openssl? ( dev-libs/openssl:0 )
+ gnutls? ( >=net-libs/gnutls-1.2.3:0= )
+ openssl? ( dev-libs/openssl:0= )
)
verify-file? (
dev-perl/String-CRC32
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index d3d172c4dee0..43d836e81eb4 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,6 @@
DIST gnutls-3.3.17.1.tar.xz 6339588 SHA256 b40f158030a92f450a07b20300a3996710ca19800848d9f6fd62493170c5bbb4 SHA512 9f2945abe1251db176fa227f2c90be46dba831af97647f04b960c71a50fc597776be31080733f9417f2242c4c6ae92fa897bf02d5f2ba40863e94df245c03319 WHIRLPOOL 8a04e56a5f47ddaad106081a613ead85a107b013d3e894074745e9439e0a7797b7f528aab5db7e3ac808f1c5c361c4717d7f0cb3abc943a6f912e5b6981db320
DIST gnutls-3.3.22.tar.xz 6295088 SHA256 0ffa233e022e851f3f5f7811ac9223081a0870d5a05a7cf35a9f22e173c7b009 SHA512 9cfbf4057b0728afde8465a4c10a8d1fbcb615e07210abab158a3008c73b71ddfbad1b2d67b92d8d5facb4bcd8298a3fb7e9ce6629bda1c6dd35d7f9e4b74a9d WHIRLPOOL 22ddd249a2d5362e7e01743a6809f7909c7a3bda27309fe16754fba60665e87efd1ac1d6af6ad6a8b34f84e8d833650477087e93a7ca380132c74e01f145f0a4
+DIST gnutls-3.3.23.tar.xz 6304332 SHA256 f53453857e369d66d665c40389201c0b9dacb7ccda560fd21b20b798687a4239 SHA512 5c2e93ddbff3ca2fc5f8fca8eeaef363bf8fe0f5dce2f4a9448e3235c930baa09d59a456a019283a451d19e0497d3ae645786080aa31febc7f1bcd71c6de1e09 WHIRLPOOL fa082db1933eefc7e061dc7f7e6584d03920f40584865e2983250097db9acea0e6d0c075e8207a2e5b96e37ae77db2b91bcf21e97cc7dfdec0744904de4b5866
DIST gnutls-3.4.11.tar.xz 6652224 SHA256 70ef9c9f95822d363036c6e6b5479750e5b7fc34f50e750c3464a98ec65a9ab8 SHA512 cf58309a45f751d07dc05858c163209cefd09831717220df7e072a303c7af5f71da872e975a776557e42982bc21efbe2e4d6f2ec46aec020e7d465274d1d4b42 WHIRLPOOL 3e99a66556539de7f155ef8f9fc3b97a8c4349997e48bb2e29ecd444a76812c660b2385c2c2e1ed672408a4444fd2880e4581b9b3c6529ba8053452bd08f3cb1
+DIST gnutls-3.4.12.tar.xz 6648308 SHA256 e3370a3bf60f2ca4a6204461ea99e7d7047ee46f96bc2fb7c63f103312d3c9c7 SHA512 ebfe7b0546c145e5f53138434b8727a865c6ac71fe1ee806fca6933cd8c86a3dfb110eeb5696f137845e04ebd372d5b1d268fd7d44eb875094d920956677edb3 WHIRLPOOL 47c91d0420217c6b72fd9f485499bbe27dc3a6aa4d17204b805ea679015287eeb08a79d4e4d43c14963337ed3072a69477da063f56c5645cda359a3d62289243
DIST gnutls-3.5.0.tar.xz 6716848 SHA256 fc6b3b544d411e6ca54dd6167541770559070ea15e6868946cf56a621d58ae25 SHA512 0b53b8084972e9b47e71c47ca9a42d0413c781641f4da640a1016aa0c1a736863a57eadbd9bb81248d3fdf723796edbb1424b14f9846b2300ad7650925f2ac27 WHIRLPOOL 0f1b3e07f94f101b004ecb1024424a10826d32bab0168076e412cd8d3881af8d77b440395b1811a910188d950ed71a2eb13e87dae029ee4c8c461a3d71077ba3
diff --git a/net-libs/gnutls/gnutls-3.3.23.ebuild b/net-libs/gnutls/gnutls-3.3.23.ebuild
new file mode 100644
index 000000000000..41ffb01ff69b
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.3.23.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-2.7:=[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+ sys-devel/autogen
+ crywrap? ( net-dns/libidn )
+ dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+ guile? ( >=dev-scheme/guile-1.8:*[networking] )
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/automake-1.11.6
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ doc? (
+ sys-apps/texinfo
+ dev-util/gtk-doc
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch"
+)
+
+pkg_setup() {
+ # bug#520818
+ export TZ=UTC
+}
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+ doc/Makefile.am || die
+
+ # force regeneration of autogen-ed files
+ local file
+ for file in $(grep -l AutoGen-ed src/*.c) ; do
+ rm src/$(basename ${file} .c).{c,h} || die
+ done
+
+ # force regeneration of makeinfo files
+ # have no idea why on some system these files are not
+ # accepted as-is, see bug#520818
+ for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+ rm "${file}" || die
+ done
+
+ eautoreconf
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+
+ # bug 497472
+ use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+ LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+ # TPM needs to be tested before being enabled
+ # hardware-accell is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-valgrind-tests \
+ --without-included-libtasn1 \
+ --enable-heartbeat-support \
+ $(use_enable cxx) \
+ $(use_enable dane libdane) \
+ $(multilib_native_enable manpages) \
+ $(multilib_native_use_enable doc) \
+ $(multilib_native_use_enable doc gtk-doc) \
+ $(multilib_native_use_enable guile) \
+ $(multilib_native_use_enable crywrap) \
+ $(use_enable nls) \
+ $(use_enable openssl openssl-compatibility) \
+ $(use_enable static-libs static) \
+ $(use_with pkcs11 p11-kit) \
+ $(use_with zlib) \
+ --without-tpm \
+ --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+ $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/reference/html doc/reference/html || die
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+
+ # symlink certtool for use in other ABIs
+ if use test; then
+ ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+ fi
+ else
+ emake -C gl
+ emake -C lib
+ emake -C extra
+ use dane && emake -C libdane
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ # parallel testing often fails
+ emake -j1 check
+ else
+ # use native ABI tools
+ ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+ "${BUILD_DIR}"/src/ || die
+
+ emake -C gl -j1 check
+ emake -C tests -j1 check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake -C lib DESTDIR="${D}" install
+ emake -C extra DESTDIR="${D}" install
+ use dane && emake -C libdane DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ dodoc doc/certtool.cfg
+
+ if use doc; then
+ dohtml doc/gnutls.html
+ else
+ rm -fr "${ED}/usr/share/doc/${PF}/html"
+ fi
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/gnutls/gnutls-3.4.12.ebuild b/net-libs/gnutls/gnutls-3.4.12.ebuild
new file mode 100644
index 000000000000..ed0dc898806e
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.4.12.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools libtool eutils multilib-minimal versionator
+
+DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project"
+HOMEPAGE="http://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
+
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/30" # libgnutls.so number
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs test +tools zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
+
+# NOTICE: sys-devel/autogen is required at runtime as we
+# use system libopts
+RDEPEND=">=dev-libs/libtasn1-4.3[${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]
+ tools? ( sys-devel/autogen )
+ crywrap? ( net-dns/libidn )
+ dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
+ guile? ( >=dev-scheme/guile-1.8:*[networking] )
+ nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ >=sys-devel/automake-1.11.6
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ doc? (
+ sys-apps/texinfo
+ dev-util/gtk-doc
+ )
+ nls? ( sys-devel/gettext )
+ test? ( app-misc/datefudge )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch"
+)
+
+pkg_setup() {
+ # bug#520818
+ export TZ=UTC
+}
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e 's/imagesdir = $(infodir)/imagesdir = $(htmldir)/' \
+ doc/Makefile.am || die
+
+ # force regeneration of autogen-ed files
+ local file
+ for file in $(grep -l AutoGen-ed src/*.c) ; do
+ rm src/$(basename ${file} .c).{c,h} || die
+ done
+
+ # force regeneration of makeinfo files
+ # have no idea why on some system these files are not
+ # accepted as-is, see bug#520818
+ for file in $(grep -l "produced by makeinfo" doc/*.info) ; do
+ rm "${file}" || die
+ done
+
+ eautoreconf
+
+ # Use sane .so versioning on FreeBSD.
+ elibtoolize
+
+ # bug 497472
+ use cxx || epunt_cxx
+}
+
+multilib_src_configure() {
+ LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+ # TPM needs to be tested before being enabled
+ # hardware-accell is disabled on OSX because the asm files force
+ # GNU-stack (as doesn't support that) and when that's removed ld
+ # complains about duplicate symbols
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-valgrind-tests \
+ --without-included-libtasn1 \
+ --enable-heartbeat-support \
+ $(use_enable cxx) \
+ $(use_enable dane libdane) \
+ $(multilib_native_enable manpages) \
+ $(multilib_native_use_enable tools) \
+ $(multilib_native_use_enable doc) \
+ $(multilib_native_use_enable doc gtk-doc) \
+ $(multilib_native_use_enable guile) \
+ $(multilib_native_use_enable crywrap) \
+ $(multilib_native_use_enable test tests) \
+ $(use_enable nls) \
+ $(use_enable openssl openssl-compatibility) \
+ $(use_enable static-libs static) \
+ $(use_with pkcs11 p11-kit) \
+ $(use_with zlib) \
+ --without-tpm \
+ --with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+ $([[ ${CHOST} == *-darwin* ]] && echo --disable-hardware-acceleration)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --all
+
+ dodoc doc/certtool.cfg
+
+ if use doc; then
+ dohtml doc/gnutls.html
+ else
+ rm -fr "${ED}/usr/share/doc/${PF}/html"
+ fi
+
+ if use examples; then
+ docinto examples
+ dodoc doc/examples/*.c
+ fi
+}
diff --git a/net-libs/libssh/libssh-0.7.3-r1.ebuild b/net-libs/libssh/libssh-0.7.3-r1.ebuild
index a45ecd84dd94..57555325cd16 100644
--- a/net-libs/libssh/libssh-0.7.3-r1.ebuild
+++ b/net-libs/libssh/libssh-0.7.3-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.libssh.org/"
SRC_URI="https://red.libssh.org/attachments/download/195/${MY_P}.tar.xz -> ${P}.tar.xz"
LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0/4" # subslot = soname major version
IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
# Maintainer: check IUSE-defaults at DefineOptions.cmake
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
index 9476aa4b2b30..6a517b90ea42 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.0.9-r1.ebuild
@@ -43,6 +43,10 @@ RESTRICT="test"
src_prepare() {
default
+ # make sure lib search dir points to the main `S` dir and not to python copies
+ sed -i "s|-L[^ ]*/src/\.libs|-L${S}/src/.libs|" \
+ -- 'bindings/python/link_flags.in' || die
+
# needed or else eautoreconf fails
mkdir build-aux && cp {m4,build-aux}/config.rpath || die
@@ -80,7 +84,7 @@ src_compile() {
default
python_compile() {
- cd "${BUILD_DIR}/../bindings/python" || return 1
+ cd "${BUILD_DIR}/../bindings/python" || die
distutils-r1_python_compile
}
use python && distutils-r1_src_compile
@@ -92,7 +96,7 @@ src_install() {
default
python_install() {
- cd "${BUILD_DIR}/../bindings/python" || return 1
+ cd "${BUILD_DIR}/../bindings/python" || die
distutils-r1_python_install
}
use python && distutils-r1_src_install
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 951fafc24b55..980643b3920a 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -4,3 +4,4 @@ DIST rabbitmq-server-3.5.4.tar.gz 3730770 SHA256 f79814d5fd5574734f599ef570ddace
DIST rabbitmq-server-3.5.7.tar.gz 3919168 SHA256 380c9cab8f24add440a0aead3b70a0830e0f32a531139828003ae18e08b72028 SHA512 7ccfb5f4f81262988f81d93d9bb71fd3fa1812d028fbcc9f3b4d3ed0a0a975d1249874c67c73b11195cd8175f36d2a7df3c1cd69a250af3b82f030104b433629 WHIRLPOOL 4861b92e0a385a559ac51c9eefcaf0204855294d863019a0dd86a39f86a6a3f7baa0679b1ffc3ee6359d11b41414e86de3deb4f5b06fc0786db306870d32bcd5
DIST rabbitmq-server-3.6.0.tar.xz 2928768 SHA256 8e55cce9e293108b16567cf3acca4ba8227cf6ada5933527f274687821cfe386 SHA512 5ed5cd9fc0092e4cfc8187f38143ce9b43c12fa48595ca84e650dd696fae120e405593a15e5832f05fc80bd15525841f6e60dfdc5e9fc8f42397ae66d78d6bf9 WHIRLPOOL c76d6cb14076770a62c2a2cc2f3d886217841abfbddcb45ed5495cb699ba0ce792ea1b3ab7fc5c495cfc33803be7f0a199edbd9dcdb388091395ea94381d0535
DIST rabbitmq-server-3.6.1.tar.xz 2895888 SHA256 c696134e863f99191a301288c12d69ff00b7e648107ee52c8686ae047dde1bee SHA512 dbcb6b6bef117c1d79afd909257b7b744dbcaf7dfa8d064a6bcf4599ec9c882cf3712c8726e79529af016ec1dc090a43eb332d48e40b90398186e08ef3be46aa WHIRLPOOL 9942fb550b8e46f6668c863b4adefb73afe4581f2dc9f99444a787f3179840041dc8aba06dbe6aefd216f650bf3f9e28c52e3aae8d5966326ba0dfd91a12e7ba
+DIST rabbitmq-server-3.6.2.tar.xz 2937204 SHA256 b09eadd91244115e50856d1423e4659e46313f1545c69b434021e1afa1b60216 SHA512 9ada10f6dff84161dae13e593211a271b7c414252a3da276f593c57fe8a513cd6a718ec592e2853630f703bb6c7f0dee3bed8c0ddeaefbb36c04613b5466f3e8 WHIRLPOOL 509dca71973b1761d3e5ac26a6829d738d8d717ff0c3244f21d84abbd31e07e4214cb6f14bfcc01bcb14a0decca59335a8ad13ddf7512dc0aebb4030793dc006
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.2.ebuild
new file mode 100644
index 000000000000..799f40494539
--- /dev/null
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-any-r1 systemd user
+
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
+HOMEPAGE="http://www.rabbitmq.com/"
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
+
+LICENSE="GPL-2 MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/erlang"
+DEPEND="${RDEPEND}
+ app-arch/zip
+ app-arch/unzip
+ app-text/docbook-xml-dtd:4.5
+ app-text/xmlto
+ dev-libs/libxslt
+ $(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
+"
+
+pkg_setup() {
+ enewgroup rabbitmq
+ enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
+ python-any-r1_pkg_setup
+}
+
+src_compile() {
+ emake all docs dist
+}
+
+src_install() {
+ # erlang module
+ local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
+
+ einfo "Setting correct RABBITMQ_HOME in scripts"
+ sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
+ -i scripts/rabbitmq-env || die
+
+ einfo "Installing Erlang modules to ${targetdir}"
+ insinto "${targetdir}"
+ doins -r ebin include plugins
+
+ einfo "Installing server scripts to /usr/sbin"
+ for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
+ exeinto /usr/libexec/rabbitmq
+ doexe scripts/${script}
+ newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
+ done
+
+ # install the init script
+ newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
+ systemd_dounit "${FILESDIR}/rabbitmq.service"
+
+ # install documentation
+ doman docs/*.[15]
+ dodoc README
+
+ # create the directory where our log file will go.
+ diropts -m 0770 -o rabbitmq -g rabbitmq
+ keepdir /var/log/rabbitmq /etc/rabbitmq
+
+ # create the mnesia directory
+ diropts -m 0770 -o rabbitmq -g rabbitmq
+ dodir /var/lib/rabbitmq{,/mnesia}
+}
+
+pkg_preinst() {
+ if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
+ elog "IMPORTANT UPGRADE NOTICE:"
+ elog
+ elog "RabbitMQ is now running as an unprivileged user instead of root."
+ elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
+ elog "Please run the following commands as root:"
+ elog
+ elog " usermod -d /var/lib/rabbitmq rabbitmq"
+ elog " chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
+ elog
+ elif has_version " (25 June 2011)
# kde-base/krossjava fails to build on ppc
-kde-base/kdebindings-meta java
+kde-apps/kdebindings-meta java
# Doug Goldstein (27 May 2011)
# app-emulation/spice, app-emulation/xen, and sys-cluster/ceph
diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016
index 9b95448d5516..f4e1244881c0 100644
--- a/profiles/updates/2Q-2016
+++ b/profiles/updates/2Q-2016
@@ -26,3 +26,4 @@ move app-dicts/myspell-de-alt app-dicts/myspell-de_1901
move media-gfx/dispcalgui media-gfx/displaycal
move kde-plasma/kwayland kde-frameworks/kwayland
move x11-themes/xcursor-neutral x11-themes/neutral-xcursors
+move kde-base/kdebindings-meta kde-apps/kdebindings-meta
diff --git a/sys-apps/texinfo/texinfo-6.0.ebuild b/sys-apps/texinfo/texinfo-6.0.ebuild
index d3fa36130298..2e2ddf0227c7 100644
--- a/sys-apps/texinfo/texinfo-6.0.ebuild
+++ b/sys-apps/texinfo/texinfo-6.0.ebuild
@@ -22,7 +22,7 @@ IUSE="nls static"
RDEPEND="
!=app-text/tetex-2*
>=sys-libs/ncurses-5.2-r2:0=
- dev-lang/perl
+ dev-lang/perl:=
dev-perl/libintl-perl
dev-perl/Unicode-EastAsianWidth
dev-perl/Text-Unidecode
diff --git a/sys-apps/texinfo/texinfo-6.1.ebuild b/sys-apps/texinfo/texinfo-6.1.ebuild
index 17ee03ba91fc..7cba6a70e8f5 100644
--- a/sys-apps/texinfo/texinfo-6.1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.1.ebuild
@@ -22,7 +22,7 @@ IUSE="nls static"
RDEPEND="
!=app-text/tetex-2*
>=sys-libs/ncurses-5.2-r2:0=
- dev-lang/perl
+ dev-lang/perl:=
dev-perl/libintl-perl
dev-perl/Unicode-EastAsianWidth
dev-perl/Text-Unidecode
diff --git a/www-servers/uwsgi/files/uwsgi.initd-r7 b/www-servers/uwsgi/files/uwsgi.initd-r7
index 01c22192be36..5f38e67778ea 100644
--- a/www-servers/uwsgi/files/uwsgi.initd-r7
+++ b/www-servers/uwsgi/files/uwsgi.initd-r7
@@ -32,6 +32,7 @@ start_emperor() {
[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+ [ -z "${UWSGI_EMPEROR_PIDPATH_MODE}" ] && UWSGI_EMPEROR_PIDPATH_MODE=0770
if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
@@ -60,6 +61,7 @@ start_app() {
[ -z "${UWSGI_DIR}" ] && UWSGI_DIR="/"
[ -z "${UWSGI_USER}" ] && UWSGI_USER="root"
[ -z "${UWSGI_GROUP}" ] && UWSGI_GROUP="root"
+ [ -z "${UWSGI_PIDPATH_MODE}" ] && UWSGI_PIDPATH_MODE=0750
if [ -n "${UWSGI_EXTRA_OPTIONS}" ]; then
OPTIONS="${OPTIONS} ${UWSGI_EXTRA_OPTIONS}"
diff --git a/www-servers/uwsgi/uwsgi-2.0.13.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.13.1-r1.ebuild
similarity index 100%
rename from www-servers/uwsgi/uwsgi-2.0.13.1.ebuild
rename to www-servers/uwsgi/uwsgi-2.0.13.1-r1.ebuild