diff --git a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
index 2702ed185f1f..f8ec8a9ebff5 100644
--- a/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
+++ b/app-dicts/myspell-ru/myspell-ru-20150711-r2.ebuild
@@ -16,7 +16,7 @@ MY_PV="0.4.0"
DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
HOMEPAGE="https://extensions.libreoffice.org/extensions/russian-dictionary-pack"
-SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/${MY_PV}/@@download/file/${MY_PN}-0-4-0.oxt"
+SRC_URI="https://extensions.libreoffice.org/${EXT}/${DICT}/${MY_PV}/@@download/file/${MY_PN}-${MY_PV//./-}.oxt"
LICENSE="LGPL-2.1"
SLOT="0"
diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest
index 1b0ef648da31..1af7f3a5e5a2 100644
--- a/app-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@@ -1,3 +1 @@
-DIST qxmledit-0.9.5-src.tgz 19653021 SHA256 ac6341f1ceb004e64e070c6e99b5c3be3cfdf7d81a5556e79d99beb2f9eab43f SHA512 d54672af9154dcae4486b72a14024f23bcec834dae9c6ec082496b532d750d2411f64ae0dfbd66da7817027e2f4cd6ed1bc7e065ceb822ef2e4d60d14a308609 WHIRLPOOL 37e32dcca088693d5ffb591e812a93b3d8815eaab341a45d5c2a0278c0db18dc9788593ed7dd8ca8411d5d0ac1034c8a0dac8bd9c1b3a09fe22697dd97716d98
-DIST qxmledit-0.9.6-src.tgz 22661917 SHA256 46928b059d9c00c96d98a5ab0bb6249abdd9225b2bbf280bbb8e0f54a894e964 SHA512 d2cf6ae630a84305b10d4a362859500b52e4d6e03e4f1852b953178ac023a13eb9e90f8da8cf6633dcf5a3cfbf5a44affb69465eb91240ccc22b0256100a685f WHIRLPOOL 784362b4738bc5606f942a48a1dfade4a264227c4feb2597bdfa10759b1c96e68ec824ca56550a20c5322d790ce7b82728c1ca4d774370fcbbbbc5dfa3953846
DIST qxmledit-0.9.7-1-src.tgz 20151952 SHA256 bcb694f01db5e4f4bedec81f823d498c6270f78da6a0c5963c52956f6c81c443 SHA512 c2304c0d46925f36ae2e411bae805406df60339bbce1f030ebbbe42b203133770ff011cb9751e79ac6807f21425e73f3f66f7081a5b14d6701522c2aa1e9a9df WHIRLPOOL 6f037cc63ec40446bee41e9eab8646f2c349bc3525d01c5e5cce417932b3020e1b79da71f356f64bac963bfb063a34ea0a3b44b8f17d051b8b4509a09172be3f
diff --git a/app-editors/qxmledit/metadata.xml b/app-editors/qxmledit/metadata.xml
index cfde07d83b4e..304a2d714ea9 100644
--- a/app-editors/qxmledit/metadata.xml
+++ b/app-editors/qxmledit/metadata.xml
@@ -17,6 +17,7 @@
XSD viewers.
+ lbellonda/qxmledit
qxmledit
diff --git a/app-editors/qxmledit/qxmledit-0.9.5.ebuild b/app-editors/qxmledit/qxmledit-0.9.5.ebuild
deleted file mode 100644
index 35fd1d4cb7cc..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fdo-mime qmake-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
- default
-
- # bug 568746
- sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
- src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
- export \
- QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
- QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
- QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
- QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
- QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
- eqmake5
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- doicon install_scripts/environment/icon/qxmledit.png
- domenu install_scripts/environment/desktop/QXmlEdit.desktop
- einstalldocs
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.6.ebuild b/app-editors/qxmledit/qxmledit-0.9.6.ebuild
deleted file mode 100644
index c273c304e80d..000000000000
--- a/app-editors/qxmledit/qxmledit-0.9.6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils fdo-mime qmake-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtscxml:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
- default
-
- # bug 568746
- sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
- src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
- export \
- QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
- QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
- QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
- QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
- QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
- eqmake5
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- doicon install_scripts/environment/icon/qxmledit.png
- domenu install_scripts/environment/desktop/QXmlEdit.desktop
- einstalldocs
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/app-editors/qxmledit/qxmledit-0.9.7.ebuild b/app-editors/qxmledit/qxmledit-0.9.7.ebuild
index cfb94f95329a..08e35d79954d 100644
--- a/app-editors/qxmledit/qxmledit-0.9.7.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-1-src.tgz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
@@ -27,6 +27,8 @@ DEPEND="
dev-qt/qtwidgets:5
dev-qt/qtxml:5
dev-qt/qtxmlpatterns:5
+ media-libs/glu
+ virtual/opengl
"
RDEPEND="${DEPEND}"
@@ -40,6 +42,10 @@ src_prepare() {
# bug 568746
sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
+
+ # bug 629624
+ sed -i -e 's/LIBS += -lGL -lGLU -lglut/LIBS += -lGL -lGLU/' \
+ src/QXmlEdit.pro || die
}
src_configure() {
@@ -50,6 +56,9 @@ src_configure() {
QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ # avoid internal compiler errors
+ use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y
+
eqmake5
}
diff --git a/dev-lang/ruby/ruby-2.2.7-r4.ebuild b/dev-lang/ruby/ruby-2.2.7-r4.ebuild
index 1968cd53ba0e..519fc06d291a 100644
--- a/dev-lang/ruby/ruby-2.2.7-r4.ebuild
+++ b/dev-lang/ruby/ruby-2.2.7-r4.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
RDEPEND="
diff --git a/dev-libs/atf/atf-0.21.ebuild b/dev-libs/atf/atf-0.21.ebuild
index 0e1b96bc6e73..fd205ac6e8f2 100644
--- a/dev-libs/atf/atf-0.21.ebuild
+++ b/dev-libs/atf/atf-0.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmmv/atf/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD BSD-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
IUSE=""
DEPEND="virtual/pkgconfig"
diff --git a/dev-lua/lutok/lutok-0.4-r1.ebuild b/dev-lua/lutok/lutok-0.4-r1.ebuild
index 9e49908f159e..4f4b22bd91c2 100644
--- a/dev-lua/lutok/lutok-0.4-r1.ebuild
+++ b/dev-lua/lutok/lutok-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jmmv/lutok/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-qt/qtscxml/qtscxml-5.7.1.ebuild b/dev-qt/qtscxml/qtscxml-5.7.1.ebuild
index 28c991b4f7c8..dc5f1c74ae20 100644
--- a/dev-qt/qtscxml/qtscxml-5.7.1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit qt5-build
DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
IUSE=""
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild b/dev-ruby/json/json-1.8.6-r1.ebuild
index bd88d747fbc2..fa0891618c6e 100644
--- a/dev-ruby/json/json-1.8.6-r1.ebuild
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
HOMEPAGE="https://github.com/flori/json"
LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/dev-util/kyua/kyua-0.13-r1.ebuild b/dev-util/kyua/kyua-0.13-r1.ebuild
index dec65cd30080..67c6f644ace7 100644
--- a/dev-util/kyua/kyua-0.13-r1.ebuild
+++ b/dev-util/kyua/kyua-0.13-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
IUSE="test"
# Tests fail
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index e0a773084d93..a0dfbd61c5e3 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86"
fi
inherit ltprune multilib-minimal
diff --git a/media-sound/audacity/audacity-2.1.3-r1.ebuild b/media-sound/audacity/audacity-2.1.3-r1.ebuild
index bdb7f4843751..7c2c2b2d5b66 100644
--- a/media-sound/audacity/audacity-2.1.3-r1.ebuild
+++ b/media-sound/audacity/audacity-2.1.3-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND=">=app-arch/zip-2.3
alsa? ( media-libs/alsa-lib )
ffmpeg? ( libav? ( media-video/libav:= )
!libav? ( >=media-video/ffmpeg-1.2:= ) )
- flac? ( >=media-libs/flac-1.2.0[cxx] )
+ flac? ( >=media-libs/flac-1.3.1[cxx] )
id3tag? ( media-libs/libid3tag )
jack? ( virtual/jack )
lame? ( >=media-sound/lame-3.70 )
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index dbef9b3111aa..5a4b69f739ce 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Sep 2017 07:39:02 +0000
+Mon, 11 Sep 2017 12:39:05 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 111db3a0ab8b..5a4b69f739ce 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Sep 2017 07:39:03 +0000
+Mon, 11 Sep 2017 12:39:05 +0000
diff --git a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2 b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
index 7b2fd7469c39..2f9afddbbf66 100644
--- a/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
+++ b/metadata/md5-cache/app-dicts/myspell-ru-20150711-r2
@@ -8,4 +8,4 @@ LICENSE=LGPL-2.1
SLOT=0
SRC_URI=https://extensions.libreoffice.org/extensions/russian-dictionary-pack/0.4.0/@@download/file/dict_pack_ru-aot-0-4-0.oxt
_eclasses_=myspell-r2 efe585da0c175bc2ac2dffda176c79dc
-_md5_=8f29777bb3fae5d75ba1be9bcc506fb1
+_md5_=212e4d993d79485b7cf0ab9715cfd1f5
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.5 b/metadata/md5-cache/app-editors/qxmledit-0.9.5
deleted file mode 100644
index 73d53c6ff627..000000000000
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
-DESCRIPTION=Simple Qt-based XML editor
-EAPI=6
-HOMEPAGE=http://qxmledit.org/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
-SLOT=0
-SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.5-src.tgz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=7dab79995581b69df1d36275498d4df9
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.6 b/metadata/md5-cache/app-editors/qxmledit-0.9.6
deleted file mode 100644
index e4f1da0a63df..000000000000
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
-DESCRIPTION=Simple Qt-based XML editor
-EAPI=6
-HOMEPAGE=http://qxmledit.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
-SLOT=0
-SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.6-src.tgz
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=0ea6842a00c8649265f5ee1070365505
diff --git a/metadata/md5-cache/app-editors/qxmledit-0.9.7 b/metadata/md5-cache/app-editors/qxmledit-0.9.7
index ecea7f14304b..7d47d73299b3 100644
--- a/metadata/md5-cache/app-editors/qxmledit-0.9.7
+++ b/metadata/md5-cache/app-editors/qxmledit-0.9.7
@@ -1,12 +1,12 @@
DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
DESCRIPTION=Simple Qt-based XML editor
EAPI=6
HOMEPAGE=http://qxmledit.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5
+RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscxml:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 media-libs/glu virtual/opengl
SLOT=0
SRC_URI=mirror://sourceforge/qxmledit/qxmledit-0.9.7-1-src.tgz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b5bf0f8e596c443ba565747f3baa9be
+_md5_=a9204d17a506e4ced61cc6fcf00696dc
diff --git a/metadata/md5-cache/dev-lang/ruby-2.2.7-r4 b/metadata/md5-cache/dev-lang/ruby-2.2.7-r4
index 30198f9538be..b160dd4d715b 100644
--- a/metadata/md5-cache/dev-lang/ruby-2.2.7-r4
+++ b/metadata/md5-cache/dev-lang/ruby-2.2.7-r4
@@ -4,11 +4,11 @@ DESCRIPTION=An object-oriented scripting language
EAPI=5
HOMEPAGE=http://www.ruby-lang.org/
IUSE=berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=|| ( Ruby-BSD BSD-2 )
PDEPEND=>=dev-ruby/minitest-5.4.3[ruby_targets_ruby22] >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22] virtual/rubygems[ruby_targets_ruby22] >=dev-ruby/json-1.8.1[ruby_targets_ruby22] >=dev-ruby/rake-0.9.6[ruby_targets_ruby22] rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] ) xemacs? ( app-xemacs/ruby-modes )
RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( sys-libs/gdbm ) jemalloc? ( dev-libs/jemalloc ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tcl:0=[threads] dev-lang/tk:0=[threads] ) ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:0= ) dev-libs/libyaml virtual/libffi sys-libs/zlib >=app-eselect/eselect-ruby-20141227 !=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 =media-libs/portaudio-19* media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lv2 ) mad? ( >=media-libs/libmad-0.14.2b ) midi? ( media-libs/portmidi ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext )
+DEPEND=>=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 =media-libs/portaudio-19* media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lv2 ) mad? ( >=media-libs/libmad-0.14.2b ) midi? ( media-libs/portmidi ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 ) app-arch/xz-utils virtual/pkgconfig nls? ( sys-devel/gettext )
DESCRIPTION=Free crossplatform audio editor
EAPI=5
HOMEPAGE=http://web.audacityteam.org/
IUSE=alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst
KEYWORDS=amd64 ~mips ppc ppc64 x86
LICENSE=GPL-2
-RDEPEND=>=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 =media-libs/portaudio-19* media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lv2 ) mad? ( >=media-libs/libmad-0.14.2b ) midi? ( media-libs/portmidi ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 )
+RDEPEND=>=app-arch/zip-2.3 dev-libs/expat >=media-libs/libsndfile-1.0.0 =media-libs/portaudio-19* media-libs/soxr x11-libs/wxGTK:3.0[X] alsa? ( media-libs/alsa-lib ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( >=media-video/ffmpeg-1.2:= ) ) flac? ( >=media-libs/flac-1.3.1[cxx] ) id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) lame? ( >=media-sound/lame-3.70 ) lv2? ( media-libs/lv2 ) mad? ( >=media-libs/libmad-0.14.2b ) midi? ( media-libs/portmidi ) sbsms? ( media-libs/libsbsms ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) twolame? ( media-sound/twolame ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) vorbis? ( >=media-libs/libvorbis-1.0 )
REQUIRED_USE=soundtouch? ( midi )
RESTRICT=test
SLOT=0
SRC_URI=https://dev.gentoo.org/~polynomial-c/dist/audacity-minsrc-2.1.3.tar.xz doc? ( https://dev.gentoo.org/~polynomial-c/dist/audacity-help-2.1.3.zip )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af wxwidgets 04e063b0eff26daaea83d859dd9d6e05
-_md5_=2cfedb6d50fcfd9db6c4d4a7f0fe9639
+_md5_=5af19f2d6564883a021449ffb15c2caf
diff --git a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r1 b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r1
index e56199328d8d..adb0f7b6c7e4 100644
--- a/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r1
+++ b/metadata/md5-cache/net-firewall/ipt_netflow-2.2-r1
@@ -10,4 +10,4 @@ RDEPEND=net-firewall/iptables snmp? ( net-analyzer/net-snmp ) kernel_linux? ( vi
SLOT=0
SRC_URI=mirror://sourceforge/ipt-netflow/ipt-netflow-2.2.tgz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea linux-info ca370deef9d44125d829f2eb6ebc83e0 linux-mod e77cdec133261f6bfa67560748277269 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2a834754040205d2792e9a710bf8add7
+_md5_=a5ea6692185b71f42ac7ded0045810fc
diff --git a/metadata/md5-cache/net-fs/nfs-utils-1.3.1-r5 b/metadata/md5-cache/net-fs/nfs-utils-1.3.1-r5
deleted file mode 100644
index b971a591ac85..000000000000
--- a/metadata/md5-cache/net-fs/nfs-utils-1.3.1-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( <=dev-libs/libevent-2.1 >=net-libs/libnfsidmap-0.21-r1 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 >=sys-apps/keyutils-1.5.9 ) ) nfsv41? ( sys-fs/lvm2 ) uuid? ( sys-apps/util-linux ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=NFS client and server daemons
-EAPI=5
-HOMEPAGE=http://linux-nfs.org/
-IUSE=caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs >=net-nds/rpcbind-0.2.0-r1 net-libs/libtirpc libmount? ( sys-apps/util-linux ) nfsdcld? ( >=dev-db/sqlite-3.3 ) nfsv4? ( <=dev-libs/libevent-2.1 >=net-libs/libnfsidmap-0.21-r1 kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 >=sys-apps/keyutils-1.5.9 ) ) nfsv41? ( sys-fs/lvm2 ) uuid? ( sys-apps/util-linux ) !net-nds/portmap !=dev-lang/go-1.8
+DESCRIPTION=CLI to manage Calico network and security policy
+EAPI=6
+HOMEPAGE=https://github.com/projectcalico/calicoctl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/projectcalico/calicoctl/archive/v1.5.0.tar.gz -> calicoctl-1.5.0.tar.gz https://github.com/docopt/docopt-go/archive/784ddc588536785e7299f7272f39101f7faccc3f.tar.gz -> github.com-docopt-docopt-go-784ddc588536785e7299f7272f39101f7faccc3f.tar.gz https://github.com/mcuadros/go-version/archive/257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz -> github.com-mcuadros-go-version-257f7b9a7d87427c8d7f89469a5958d57f8abd7c.tar.gz https://github.com/mitchellh/go-ps/archive/4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz -> github.com-mitchellh-go-ps-4fdf99ab29366514c69ccccddab5dc58b8d84062.tar.gz https://github.com/olekukonko/tablewriter/archive/be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz -> github.com-olekukonko-tablewriter-be5337e7b39e64e5f91445ce7e721888dbab7387.tar.gz https://github.com/mattn/go-runewidth/archive/97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz -> github.com-mattn-go-runewidth-97311d9f7767e3d6f422ea06661bc2c7a19e8a5d.tar.gz https://github.com/osrg/gobgp/archive/bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz -> github.com-osrg-gobgp-bbd1d99396fef6503e308d1851ecf91c31006635.tar.gz https://github.com/armon/go-radix/archive/1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz -> github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz https://github.com/eapache/channels/archive/47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz -> github.com-eapache-channels-47238d5aae8c0fefd518ef2bee46290909cf8263.tar.gz https://github.com/eapache/queue/archive/44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz -> github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz https://github.com/golang/protobuf/archive/4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz -> github.com-golang-protobuf-4bd1920723d7b7c925de087aa32e2187708897f7.tar.gz https://github.com/influxdata/influxdb/archive/392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz -> github.com-influxdata-influxdb-392fa03cf3cc98b78e606c34996976cea65b6814.tar.gz https://github.com/projectcalico/go-json/archive/6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz -> github.com-projectcalico-go-json-6219dc7339ba20ee4c57df0a8baac62317d19cb1.tar.gz https://github.com/projectcalico/go-yaml-wrapper/archive/598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz -> github.com-projectcalico-go-yaml-wrapper-598e54215bee41a19677faa4f0c32acd2a87eb56.tar.gz https://github.com/projectcalico/libcalico-go/archive/25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz -> github.com-projectcalico-libcalico-go-25a8c377d7b3299a50197a92704d606f5f5ca691.tar.gz https://github.com/coreos/etcd/archive/17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz -> github.com-coreos-etcd-17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz https://github.com/kelseyhightower/envconfig/archive/f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz -> github.com-kelseyhightower-envconfig-f611eb38b3875cc3bd991ca91c51d06446afa14c.tar.gz https://github.com/coreos/go-semver/archive/568e959cd89871e61434c1143528d9162da89ef2.tar.gz -> github.com-coreos-go-semver-568e959cd89871e61434c1143528d9162da89ef2.tar.gz https://github.com/projectcalico/go-yaml/archive/955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz -> github.com-projectcalico-go-yaml-955bc3e451ef0c9df8b9113bf2e341139cdafab2.tar.gz https://github.com/satori/go.uuid/archive/879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz -> github.com-satori-go.uuid-879c5887cd475cd7864858769793b2ceb0d44feb.tar.gz https://github.com/sirupsen/logrus/archive/ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz -> github.com-sirupsen-logrus-ba1b36c82c5e05c4f912a88eab0dcd91a171688f.tar.gz https://github.com/spf13/viper/archive/25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz -> github.com-spf13-viper-25b30aa063fc18e48662b86996252eabdcf2f0c7.tar.gz https://github.com/fsnotify/fsnotify/archive/4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz -> github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz https://github.com/hashicorp/hcl/archive/392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz -> github.com-hashicorp-hcl-392dba7d905ed5d04a5794ba89f558b27e2ba1ca.tar.gz https://github.com/magiconair/properties/archive/be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz -> github.com-magiconair-properties-be5ece7dd465ab0765a9682137865547526d1dfb.tar.gz https://github.com/mitchellh/mapstructure/archive/d0303fe809921458f417bcf828397a65db30a7e4.tar.gz -> github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz https://github.com/pelletier/go-toml/archive/69d355db5304c0f7f809a2edc054553e7142f016.tar.gz -> github.com-pelletier-go-toml-69d355db5304c0f7f809a2edc054553e7142f016.tar.gz https://github.com/spf13/afero/archive/9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz -> github.com-spf13-afero-9be650865eab0c12963d8753212f4f9c66cdcf12.tar.gz https://github.com/spf13/cast/archive/acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz -> github.com-spf13-cast-acbeb36b902d72a7a4c18e8f3241075e7ab763e4.tar.gz https://github.com/spf13/jwalterweatherman/archive/0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz -> github.com-spf13-jwalterweatherman-0efa5202c04663c757d84f90f5219c1250baf94f.tar.gz https://github.com/spf13/pflag/archive/08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz -> github.com-spf13-pflag-08b1a584251b5b62f458943640fc8ebd4d50aaa5.tar.gz https://github.com/termie/go-shutil/archive/bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz -> github.com-termie-go-shutil-bcacb06fecaeec8dc42af03c87c6949f4a05c74c.tar.gz https://github.com/ugorji/go/archive/ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz -> github.com-ugorji-go-ded73eae5db7e7a0ef6f55aace87a2873c5d2b74.tar.gz https://github.com/vishvananda/netlink/archive/f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz -> github.com-vishvananda-netlink-f5a6f697a596c788d474984a38a0ac4ba0719e93.tar.gz https://github.com/vishvananda/netns/archive/8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz -> github.com-vishvananda-netns-8ba1072b58e0c2a240eb5f6120165c7776c3e7b8.tar.gz https://github.com/golang/net/archive/f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz -> github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz https://github.com/golang/sys/archive/8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz -> github.com-golang-sys-8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9.tar.gz https://github.com/golang/text/archive/19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz -> github.com-golang-text-19e51611da83d6be54ddafce4a4af510cb3e9ea4.tar.gz https://github.com/golang/glog/archive/44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz -> github.com-golang-glog-44145f04b68cf362d9c4df2182967c2275eaefed.tar.gz https://github.com/grpc/grpc-go/archive/777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz -> github.com-grpc-grpc-go-777daa17ff9b5daef1cfdf915088a2ada3332bf0.tar.gz https://github.com/go-playground/validator/archive/5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz -> github.com-go-playground-validator-5f57d2222ad794d0dffb07e664ea05e2ee07d60c.tar.gz https://github.com/tchap/go-patricia/archive/666120de432aea38ab06bd5c818f04f4129882c9.tar.gz -> github.com-tchap-go-patricia-666120de432aea38ab06bd5c818f04f4129882c9.tar.gz https://github.com/go-tomb/tomb/archive/d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz -> github.com-go-tomb-tomb-d5d1b5820637886def9eef33e03a27a9f166942c.tar.gz https://github.com/go-yaml/yaml/archive/53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz -> github.com-go-yaml-yaml-53feefa2559fb8dfa8d81baad31be332c97d6c77.tar.gz https://github.com/kubernetes/client-go/archive/4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz -> github.com-kubernetes-client-go-4a3ab2f5be5177366f8206fd79ce55ca80e417fa.tar.gz https://github.com/kubernetes/apimachinery/archive/b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz -> github.com-kubernetes-apimachinery-b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215.tar.gz
+_eclasses_=golang-base 51a1f13e065f1cff4507685d9cc268c7 golang-vcs-snapshot 913580335becddd3ebecefe852e47536
+_md5_=9740a245c1114b07163b75f94127c9fa
diff --git a/metadata/md5-cache/net-misc/curl-7.55.1 b/metadata/md5-cache/net-misc/curl-7.55.1
index 2533757c2ccc..9d79c3917d25 100644
--- a/metadata/md5-cache/net-misc/curl-7.55.1
+++ b/metadata/md5-cache/net-misc/curl-7.55.1
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
EAPI=6
HOMEPAGE=https://curl.haxx.se/
IUSE=adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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 ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ldap? ( net-nds/openldap[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(-)?] ) ssl? ( curl_ssl_axtls? ( net-libs/axtls: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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] dev-libs/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2:0[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(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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(-)?] ) sys-libs/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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://curl.haxx.se/download/curl-7.55.1.tar.bz2
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 prefix 7b6fb2fc216b101b5d97d171925a847c toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=a98194109d3cc5633499e01bce841d67
+_md5_=ef40a1ca6e5ed08aab21364ca777d0ae
diff --git a/metadata/md5-cache/net-misc/iperf-2.0.10 b/metadata/md5-cache/net-misc/iperf-2.0.10
new file mode 100644
index 000000000000..019862587012
--- /dev/null
+++ b/metadata/md5-cache/net-misc/iperf-2.0.10
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Tool to measure IP bandwidth using UDP or TCP
+EAPI=6
+HOMEPAGE=http://iperf2.sourceforge.net/
+IUSE=ipv6 threads debug
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint
+LICENSE=HPND
+SLOT=2
+SRC_URI=mirror://sourceforge/iperf2/iperf-2.0.10.tar.gz
+_md5_=ffbd44464da9400b3f3edf6f000cdb09
diff --git a/metadata/md5-cache/net-misc/iperf-3.2_rc1 b/metadata/md5-cache/net-misc/iperf-3.2
similarity index 91%
rename from metadata/md5-cache/net-misc/iperf-3.2_rc1
rename to metadata/md5-cache/net-misc/iperf-3.2
index 62db64cbe182..117a2c9515f8 100644
--- a/metadata/md5-cache/net-misc/iperf-3.2_rc1
+++ b/metadata/md5-cache/net-misc/iperf-3.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
LICENSE=BSD
RDEPEND=sctp? ( net-misc/lksctp-tools )
SLOT=3
-SRC_URI=https://github.com/esnet/iperf/archive/3.2rc1.tar.gz -> iperf-3.2_rc1.tar.gz
+SRC_URI=https://github.com/esnet/iperf/archive/3.2.tar.gz -> iperf-3.2.tar.gz
_eclasses_=autotools 7027963e8e8cc12c91117bdb9225dc26 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af
_md5_=d5ac93cca54796d29104725cbd39e50e
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.26 b/metadata/md5-cache/sys-apps/coreutils-8.26
index d03b8e75b8fa..347e338e372e 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.26
+++ b/metadata/md5-cache/sys-apps/coreutils-8.26
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,.
EAPI=5
HOMEPAGE=https://www.gnu.org/software/coreutils/
IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
-KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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(-)?] ) python? ( !dev-python/python-magic )
REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
SLOT=0
SRC_URI=ftp://ftp.astron.com/pub/file/file-5.31.tar.gz
_eclasses_=distutils-r1 372bbe39047c0a2550319a3a82f3e063 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 multiprocessing 284a473719153462f3e974d86c8cb81c python-r1 e9350ec46bb5c9f3504b4fbe8b8d8987 python-utils-r1 c9de01becf9df3f8c10aeec3dc693f5d toolchain-funcs 185a06792159ca143528e7010368e8af xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7661b4491b7cb19d61fb6ce0d5666d65
+_md5_=6f3ee2b7b35b56be431e7e97228bdfe1
diff --git a/metadata/md5-cache/sys-apps/openrc-0.28 b/metadata/md5-cache/sys-apps/openrc-0.28
index 6ef85a227813..05d04553411a 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.28
+++ b/metadata/md5-cache/sys-apps/openrc-0.28
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
EAPI=6
HOMEPAGE=https://github.com/openrc/openrc/
IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
LICENSE=BSD-2
PDEPEND=netifrc? ( net-misc/netifrc )
RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc )
SLOT=0
SRC_URI=https://github.com/openrc/openrc/archive/0.28.tar.gz -> openrc-0.28.tar.gz
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 toolchain-funcs 185a06792159ca143528e7010368e8af
-_md5_=1f1d4610460def8196f8e161897f30c8
+_md5_=68723d949cf920a6329868fb2d82c2aa
diff --git a/metadata/md5-cache/sys-libs/glibc-2.24-r4 b/metadata/md5-cache/sys-libs/glibc-2.24-r4
deleted file mode 100644
index 677c1502022d..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.24-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) >=app-misc/pax-utils-0.1.10 !=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.24-patches-10.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af toolchain-glibc 09c288d55e47e9140c030c8e2f4bc779 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=d85314bbbdec51190d226ed19956597c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r3 b/metadata/md5-cache/sys-libs/glibc-2.25-r3
deleted file mode 100644
index 3e5313403e1d..000000000000
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) >=app-misc/pax-utils-0.1.10 !=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
-DESCRIPTION=GNU libc6 (also called glibc2) C library
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/libc/libc.html
-IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
-PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
-RESTRICT=strip
-SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-7.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-7.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.25-patches-7.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-7.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-7.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af toolchain-glibc 09c288d55e47e9140c030c8e2f4bc779 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=2cf310478af90eb6669c515127e1f47a
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r2 b/metadata/md5-cache/sys-libs/glibc-2.25-r5
similarity index 70%
rename from metadata/md5-cache/sys-libs/glibc-2.25-r2
rename to metadata/md5-cache/sys-libs/glibc-2.25-r5
index 430c046475d7..5e834f1d4e5b 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r5
@@ -4,12 +4,11 @@ DESCRIPTION=GNU libc6 (also called glibc2) C library
EAPI=5
HOMEPAGE=https://www.gnu.org/software/libc/libc.html
IUSE=audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
PDEPEND=!vanilla? ( sys-libs/timezone-data )
RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
RESTRICT=strip
SLOT=2.2
-SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-5.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.25-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-5.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-9.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-9.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af toolchain-glibc 09c288d55e47e9140c030c8e2f4bc779 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1a6027092bfdf10f392c642b56ab229d
+_md5_=b627cd8a6f14232834c4b854492ba533
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r1 b/metadata/md5-cache/sys-libs/glibc-2.26-r1
index 9d92a18ea61f..4d68c426fecb 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst preinst prepare pretend test unpack
-DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) >=app-misc/pax-utils-0.1.10 !=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
+DEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) >=app-misc/pax-utils-0.1.10 !=sys-devel/binutils-2.24 >=sys-devel/gcc-4.7 virtual/os-headers sys-devel/gnuconfig virtual/pkgconfig
DESCRIPTION=GNU libc C library
EAPI=6
HOMEPAGE=https://www.gnu.org/software/libc/
IUSE=audit caps debug gd hardened multilib nscd selinux systemtap profile suid vanilla crosscompile_opts_headers-only
LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
RESTRICT=strip
SLOT=2.2
SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-0.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 9c113d6a64826c40154cad7be15d95ea flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing 284a473719153462f3e974d86c8cb81c prefix 7b6fb2fc216b101b5d97d171925a847c systemd 34815d3b76e745c5ca33eec9f95074c2 toolchain-funcs 185a06792159ca143528e7010368e8af toolchain-glibc 09c288d55e47e9140c030c8e2f4bc779 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 versionator c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=eef9ef6c7a3eb5f2c48a3946c2b7d96e
+_md5_=a87b79ad3a7abdca732162c55d35aec2
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 111db3a0ab8b..5a4b69f739ce 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Sep 2017 07:39:03 +0000
+Mon, 11 Sep 2017 12:39:05 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3a74dda329f8..eef7cd6d5ec4 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Sep 11 07:39:02 UTC 2017
+Mon Sep 11 12:39:05 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d63195125e7d..947d8b0ac4c5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Sep 2017 08:00:01 +0000
+Mon, 11 Sep 2017 13:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 31187311ffac..090555c869af 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-eb108d8b5224d9986d607b683ec8bcd6c9e56633 1505112233 2017-09-11T06:43:53+00:00
+7ac1b59fd6b5b1d3c1faa93282ae1f29c5dc69c0 1505132205 2017-09-11T12:16:45+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 86edf347b748..e0489bf1fba3 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1505115301 Mon 11 Sep 2017 07:35:01 AM UTC
+1505133301 Mon 11 Sep 2017 12:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index dbef9b3111aa..5a4b69f739ce 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 11 Sep 2017 07:39:02 +0000
+Mon, 11 Sep 2017 12:39:05 +0000
diff --git a/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.13.patch b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.13.patch
new file mode 100644
index 000000000000..10e8b552afb4
--- /dev/null
+++ b/net-firewall/ipt_netflow/files/ipt_netflow-2.2-linux-4.13.patch
@@ -0,0 +1,63 @@
+commit 53a556cb4a705f4eae2bcb49552b6427b231378a
+Author: ABC
+Date: Mon Aug 14 22:55:25 2017 +0300
+
+ Compatibility with kernel 4.13.
+
+ Offset patch torvalds/linux@14afee4b6092fde451ee17604e5f5c89da33e71e
+
+diff --git a/compat.h b/compat.h
+index 061eb57..275ff58 100644
+--- a/compat.h
++++ b/compat.h
+@@ -636,4 +636,10 @@ static inline unsigned int xt_hooknum(const struct xt_action_param *par)
+ # define SK_CAN_REUSE 1
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,13,0)
++# define compat_refcount_read atomic_read
++#else
++# define compat_refcount_read refcount_read
++#endif
++
+ #endif /* COMPAT_NETFLOW_H */
+diff --git a/ipt_NETFLOW.c b/ipt_NETFLOW.c
+index 494ea74..9365325 100644
+--- a/ipt_NETFLOW.c
++++ b/ipt_NETFLOW.c
+@@ -622,7 +622,7 @@ static int snmp_seq_show(struct seq_file *seq, void *v)
+
+ seq_printf(seq, " %u %u %u\n",
+ sk->sk_sndbuf,
+- atomic_read(&sk->sk_wmem_alloc),
++ compat_refcount_read(&sk->sk_wmem_alloc),
+ wmem_peak);
+ } else
+ seq_printf(seq, " 0 0 %u\n", wmem_peak);
+@@ -864,7 +864,7 @@ static int nf_seq_show(struct seq_file *seq, void *v)
+ seq_printf(seq, ", sndbuf %u, filled %u, peak %u;"
+ " err: sndbuf reached %u, connect %u, cberr %u, other %u\n",
+ sk->sk_sndbuf,
+- atomic_read(&sk->sk_wmem_alloc),
++ compat_refcount_read(&sk->sk_wmem_alloc),
+ atomic_read(&usock->wmem_peak),
+ usock->err_full,
+ usock->err_connect,
+@@ -2031,7 +2031,7 @@ static void netflow_sendmsg(void *buffer, const int len)
+ printk(KERN_INFO "netflow_sendmsg: sendmsg(%d, %d) [%u %u]\n",
+ snum,
+ len,
+- atomic_read(&usock->sock->sk->sk_wmem_alloc),
++ compat_refcount_read(&usock->sock->sk->sk_wmem_alloc),
+ usock->sock->sk->sk_sndbuf);
+ ret = kernel_sendmsg(usock->sock, &msg, &iov, 1, (size_t)len);
+ if (ret < 0) {
+@@ -2054,7 +2054,7 @@ static void netflow_sendmsg(void *buffer, const int len)
+ printk(KERN_ERR "ipt_NETFLOW: sendmsg[%d] error %d: data loss %llu pkt, %llu bytes%s\n",
+ snum, ret, pdu_packets, pdu_traf, suggestion);
+ } else {
+- unsigned int wmem = atomic_read(&usock->sock->sk->sk_wmem_alloc);
++ unsigned int wmem = compat_refcount_read(&usock->sock->sk->sk_wmem_alloc);
+ if (wmem > atomic_read(&usock->wmem_peak))
+ atomic_set(&usock->wmem_peak, wmem);
+ NETFLOW_STAT_INC(exported_pkt);
diff --git a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
index d7f364065e36..f82263fe40cd 100644
--- a/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
+++ b/net-firewall/ipt_netflow/ipt_netflow-2.2-r1.ebuild
@@ -56,6 +56,9 @@ src_prepare() {
# Compatibility with kernel 4.10, bug #617484
eapply "${FILESDIR}/${P}-linux-4.10.patch"
+ # Compatibility with kernel 4.13, bug #630446
+ eapply "${FILESDIR}/${P}-linux-4.13.patch"
+
eapply_user
}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index d5798c70b259..f55aa5701df0 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,4 +1,3 @@
-DIST nfs-utils-1.3.1.tar.bz2 785800 SHA256 748c4afbdfd3e92017fe579f1dd3280a10db1306c43228f83cd6b55f0d95aed3 SHA512 304e718aaee1df4decb0711c58c814ac773d55277baca01fd74d275969b9a1cee4bf0c0c20ba3ed72a112bd92b4744d45179f29a2a69a7fc2ca2590762a671c9 WHIRLPOOL 6fe5e9957c4a2775871ede47d1020f1a642e9242501ff3d21b74c4772ae8dfcafba27334e5844a06f9cc3e0fd286d1f90573511c2b198e330cb46c06cdbfc592
DIST nfs-utils-1.3.4.tar.bz2 814545 SHA256 c529c82a82320daae811f3d3a143f83d2714d7e7a43beadd42fcd6022c17d590 SHA512 765c0bc55a9a0bdb2c25d8fb7189a9054fb9f2dd51726eda29f44e5d5c423e245b02307dfcfab9239276d8f44869a72732416f6e9ef5a1f80753d9243ba1b38c WHIRLPOOL 6dc556ef7d00a583c222eb62a600b0d83c6f91ad65d89ca14e1fb3c8aaacf4fbae492e6f0ca3fb0821e2b666f0806ad5fddec041a1124b86b9941540cdfb08b4
DIST nfs-utils-2.1.1.tar.bz2 820083 SHA256 0a28416948516c26f3bfe90425b0de09b79364dc1f508bf1dda8de66e1edbb09 SHA512 ed358280b7e124154632040bf747f6e4c3c6e4156bf90e82ff6915b1488f1c0dd65251a3a0f9b7ca96b9664d64e24b379828da9b524e64a3c769a44f4c930448 WHIRLPOOL bb28ae312b64c3493a1393a5b41eda457367594a71e230379ec04ffea3eb29d60ab8254e4981b0aa9cbe778dc1fbe9b08dc8615184a35cdb22bf4e5e04e56a6c
DIST nfs-utils-2.1.2_rc3.tar.gz 475356 SHA256 5b379316a2cc49b07f72042b72eadee0bfe7c88e65d7b5baa4798e6cefca5a82 SHA512 2f948994f275b405678240deecc879900cc0e72476adaf552db059364f08f0929722013d751e0bc7913c30eb3f8183d1fc7693709c063fc92e20b71edd24ccef WHIRLPOOL 6a16a9cc3d22d883b6a8aa2d2f01dce81f9a1df03154a80e4aa43ae9bb878a15f0ca37951702f780341283da94d885b7be3656a950285ef79619e09dc465727f
diff --git a/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild b/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild
deleted file mode 100644
index 12993ab5b9a8..000000000000
--- a/net-fs/nfs-utils/nfs-utils-1.3.1-r5.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib autotools systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="caps ipv6 kerberos +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="tcpd? ( sys-apps/tcp-wrappers )
- caps? ( sys-libs/libcap )
- sys-libs/e2fsprogs-libs
- >=net-nds/rpcbind-0.2.0-r1
- net-libs/libtirpc
- libmount? ( sys-apps/util-linux )
- nfsdcld? ( >=dev-db/sqlite-3.3 )
- nfsv4? (
- <=dev-libs/libevent-2.1
- >=net-libs/libnfsidmap-0.21-r1
- kerberos? (
- >=net-libs/libtirpc-0.2.4-r1[kerberos]
- app-crypt/mit-krb5
- )
- nfsidmap? (
- >=net-libs/libnfsidmap-0.24
- >=sys-apps/keyutils-1.5.9
- )
- )
- nfsv41? (
- sys-fs/lvm2
- )
- uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON}
- !net-nds/portmap
- ! id_resolver.conf
- doins id_resolver.conf
- fi
-
- insinto /etc
- doins "${FILESDIR}"/exports
- keepdir /etc/exports.d
-
- local f list=() opt_need=""
- if use nfsv4 ; then
- opt_need="rpc.idmapd"
- list+=( rpc.idmapd rpc.pipefs )
- use kerberos && list+=( rpc.gssd rpc.svcgssd )
- fi
- for f in nfs nfsclient rpc.statd "${list[@]}" ; do
- newinitd "${FILESDIR}"/${f}.initd ${f}
- done
- newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
- for f in nfs nfsclient ; do
- newconfd "${FILESDIR}"/${f}.confd ${f}
- done
- sed -i \
- -e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
- "${ED}"/etc/conf.d/nfs || die #234132
-
- systemd_dounit systemd/*.{mount,service,target}
- if ! use nfsv4 || ! use kerberos ; then
- rm "${D}$(systemd_get_unitdir)"/rpc-{gssd,svcgssd}.service || die
- fi
- rm "${D}$(systemd_get_unitdir)"/nfs-config.service || die
- sed -i -r \
- -e "/^EnvironmentFile=/s:=.*:=${EPREFIX}/etc/conf.d/nfs:" \
- -e '/^(After|Wants)=nfs-config.service$/d' \
- -e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
- "${D}$(systemd_get_unitdir)"/* || die
-}
-
-pkg_postinst() {
- # Install default xtab and friends if there's none existing. In
- # src_install we put them in /usr/lib/nfs for safe-keeping, but
- # the daemons actually use the files in /var/lib/nfs. #30486
- local f
- mkdir -p "${EROOT}"/var/lib/nfs #368505
- for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
- [[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
- einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
- cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
- done
-
- if systemd_is_booted; then
- if [[ ${REPLACING_VERSIONS} < 1.3.0 ]]; then
- ewarn "We have switched to upstream systemd unit files. Since"
- ewarn "they got renamed, you should probably enable the new ones."
- ewarn "You can run 'equery files nfs-utils | grep systemd'"
- ewarn "to know what services you need to enable now."
- fi
- else
- ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
- ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
- ewarn "same runlevel as nfsmount."
- fi
-}
diff --git a/net-misc/calicoctl/Manifest b/net-misc/calicoctl/Manifest
index b8f835b8b09a..26423fca3de7 100644
--- a/net-misc/calicoctl/Manifest
+++ b/net-misc/calicoctl/Manifest
@@ -1,3 +1,4 @@
+DIST calicoctl-1.5.0.tar.gz 63645 SHA256 e055b1b33b3225228abf37c474c91dabe8d1b292ca5b0df4c97df096dacc6487 SHA512 57bf1b9e008df0c652881f84e59cbfdb3bf6192ff0810ef068c16e7601a6da78e7d0c4bdd912606c2095059ced8e7fe820bbb42f328bf9e7a5404f773f4c883f WHIRLPOOL 9a959d0d13cb585505a1e86eea05194c2414c5e87c31f6560e580f470399e22f6dfaa5106a29d391f10070ef4ff8f7b5a314a77f857115be0377d7aff453da3b
DIST calicoctl-1.5.0_rc1.tar.gz 63635 SHA256 75a0b507c04954a79908804878bb7c2640354aaf0603601d648cbe24fd4144dd SHA512 1a84ba1facc29752886abb190a3a8cd8cea0ddb6f9118ff5dd10e5d3f3df892b5ee50b13a8271fd1a7f6d1c87ab1ee212a70c847aa9bfda7d5f9a6bb5be5cfc0 WHIRLPOOL a3875e5115b2d4484cc570f22a6c4a550e3996c4e72c927fa4f293912f18105c2ff1daf9d21b6a24abdb692fc6e65b132280db0006218f2dff1337ece2b096a1
DIST github.com-armon-go-radix-1fca145dffbcaa8fe914309b1ec0cfc67500fe61.tar.gz 5943 SHA256 c2898252c1bf79e16edbbeec0e0e8590372681a54b16e2ff1172ecf5cd291383 SHA512 431e41870728d86accd7ed78d1e16c92adebfe79cef59b7f656a395e4bf7727ae9521f7e9d291931590680fd32eaef26622d888f30a4a4511dbddcae8dda1c08 WHIRLPOOL a41c4a579ce1a269f94e2b406bd19d21a505bbd6a094bd60b7e556627d457f6383dbccd1d94f27949b67ec67367abd6f0a4b26afba4eca12aff975e7c9c3d6ac
DIST github.com-coreos-etcd-17ae440991da3bdb2df4309936dd2074f66ec394.tar.gz 2538523 SHA256 013a89f6351967a85dafeb959ca8932db1198057f105becbe949e80c8f73a6e2 SHA512 9202595469d538328cd0ca57f08e29d66f93080592eb65fb32ae76c13a14dfaefdacb9d7b1aca8c069db52363e3d798b4882c5977bbcd600159d3d8cb65d5eeb WHIRLPOOL 838cac222af8505bd56e3b0bb37593df05658585a0e978541ec863a8fbe7654224240877326eb3b8b83a84ab22f3de03c2011f1c3b5bebccb0dacf8c1fc35c2a
diff --git a/net-misc/calicoctl/calicoctl-1.5.0.ebuild b/net-misc/calicoctl/calicoctl-1.5.0.ebuild
new file mode 100644
index 000000000000..45eb88efab70
--- /dev/null
+++ b/net-misc/calicoctl/calicoctl-1.5.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_VENDOR=( "github.com/docopt/docopt-go 784ddc588536785e7299f7272f39101f7faccc3f"
+ "github.com/mcuadros/go-version 257f7b9a7d87427c8d7f89469a5958d57f8abd7c"
+ "github.com/mitchellh/go-ps 4fdf99ab29366514c69ccccddab5dc58b8d84062"
+ "github.com/olekukonko/tablewriter be5337e7b39e64e5f91445ce7e721888dbab7387"
+ "github.com/mattn/go-runewidth 97311d9f7767e3d6f422ea06661bc2c7a19e8a5d"
+ "github.com/osrg/gobgp bbd1d99396fef6503e308d1851ecf91c31006635"
+ "github.com/armon/go-radix 1fca145dffbcaa8fe914309b1ec0cfc67500fe61"
+ "github.com/eapache/channels 47238d5aae8c0fefd518ef2bee46290909cf8263"
+ "github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98"
+ "github.com/golang/protobuf 4bd1920723d7b7c925de087aa32e2187708897f7"
+ "github.com/influxdata/influxdb 392fa03cf3cc98b78e606c34996976cea65b6814"
+ "github.com/projectcalico/go-json 6219dc7339ba20ee4c57df0a8baac62317d19cb1"
+ "github.com/projectcalico/go-yaml-wrapper 598e54215bee41a19677faa4f0c32acd2a87eb56"
+ "github.com/projectcalico/libcalico-go 25a8c377d7b3299a50197a92704d606f5f5ca691"
+ "github.com/coreos/etcd 17ae440991da3bdb2df4309936dd2074f66ec394"
+ "github.com/kelseyhightower/envconfig f611eb38b3875cc3bd991ca91c51d06446afa14c"
+ "github.com/coreos/go-semver 568e959cd89871e61434c1143528d9162da89ef2"
+ "github.com/projectcalico/go-yaml 955bc3e451ef0c9df8b9113bf2e341139cdafab2"
+ "github.com/satori/go.uuid 879c5887cd475cd7864858769793b2ceb0d44feb"
+ "github.com/sirupsen/logrus ba1b36c82c5e05c4f912a88eab0dcd91a171688f"
+ "github.com/spf13/viper 25b30aa063fc18e48662b86996252eabdcf2f0c7"
+ "github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+ "github.com/hashicorp/hcl 392dba7d905ed5d04a5794ba89f558b27e2ba1ca"
+ "github.com/magiconair/properties be5ece7dd465ab0765a9682137865547526d1dfb"
+ "github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4"
+ "github.com/pelletier/go-toml 69d355db5304c0f7f809a2edc054553e7142f016"
+ "github.com/spf13/afero 9be650865eab0c12963d8753212f4f9c66cdcf12"
+ "github.com/spf13/cast acbeb36b902d72a7a4c18e8f3241075e7ab763e4"
+ "github.com/spf13/jwalterweatherman 0efa5202c04663c757d84f90f5219c1250baf94f"
+ "github.com/spf13/pflag 08b1a584251b5b62f458943640fc8ebd4d50aaa5"
+ "github.com/termie/go-shutil bcacb06fecaeec8dc42af03c87c6949f4a05c74c"
+ "github.com/ugorji/go ded73eae5db7e7a0ef6f55aace87a2873c5d2b74"
+ "github.com/vishvananda/netlink f5a6f697a596c788d474984a38a0ac4ba0719e93"
+ "github.com/vishvananda/netns 8ba1072b58e0c2a240eb5f6120165c7776c3e7b8"
+ "golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d github.com/golang/net"
+ "golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9 github.com/golang/sys"
+ "golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 github.com/golang/text"
+ "github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed"
+ "google.golang.org/grpc 777daa17ff9b5daef1cfdf915088a2ada3332bf0 github.com/grpc/grpc-go"
+ "gopkg.in/go-playground/validator.v8 5f57d2222ad794d0dffb07e664ea05e2ee07d60c github.com/go-playground/validator"
+ "gopkg.in/tchap/go-patricia.v2 666120de432aea38ab06bd5c818f04f4129882c9 github.com/tchap/go-patricia"
+ "gopkg.in/tomb.v2 d5d1b5820637886def9eef33e03a27a9f166942c github.com/go-tomb/tomb"
+ "gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 github.com/go-yaml/yaml"
+ "k8s.io/client-go 4a3ab2f5be5177366f8206fd79ce55ca80e417fa github.com/kubernetes/client-go"
+ "k8s.io/apimachinery b317fa7ec8e0e7d1f77ac63bf8c3ec7b29a2a215 github.com/kubernetes/apimachinery")
+
+inherit golang-vcs-snapshot
+
+CALICOCTL_COMMIT="118b8ae1cbfb852f387c9066b5ae27633593a99f"
+
+KEYWORDS="~amd64"
+DESCRIPTION="CLI to manage Calico network and security policy"
+EGO_PN="github.com/projectcalico/calicoctl"
+HOMEPAGE="https://github.com/projectcalico/calicoctl"
+MY_PV=${PV/_/-}
+SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+ pushd "src/${EGO_PN}" || die
+ GOPATH="${WORKDIR}/${P}" CGO_ENABLED=0 go build -v -o dist/calicoctl -ldflags \
+ "-X github.com/projectcalico/calicoctl/calicoctl/commands.VERSION=${PV} \
+ -X github.com/projectcalico/calicoctl/calicoctl/commands.BUILD_DATE=$(date -u +'%FT%T%z') \
+ -X github.com/projectcalico/calicoctl/calicoctl/commands.GIT_REVISION=${CALICOCTL_COMMIT}" "./calicoctl/calicoctl.go" || die
+ popd || die
+}
+
+src_install() {
+ pushd "src/${EGO_PN}" || die
+ dobin "dist/${PN}"
+ dodoc README.md
+}
diff --git a/net-misc/curl/curl-7.55.1.ebuild b/net-misc/curl/curl-7.55.1.ebuild
index 23bc2a4881d4..ed013664bd65 100644
--- a/net-misc/curl/curl-7.55.1.ebuild
+++ b/net-misc/curl/curl-7.55.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
IUSE+=" elibc_Winnt"
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 69e7173180ed..f8c22e1acf15 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,4 +1,5 @@
+DIST iperf-2.0.10.tar.gz 290282 SHA256 7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2 SHA512 74bf49133cd123243c179e174cbaa7d2f74ca9fb47c80ca2c88b2e68ce8bca0a73709e51b3aac6bd85b8c70483b70f33e8a2424e7e0e5922397967330f7e2ecc WHIRLPOOL 4fa4e3006bc6354653fcc249cf0e4660af2ea88e463fbf731a65c5ecab44c297d36b0079dab1b38cadd1962c52d4fb1bba71f700af0ddec3296e94c79b5f5180
DIST iperf-2.0.9.tar.gz 277702 SHA256 a5350777b191e910334d3a107b5e5219b72ffa393da4186da1e0a4552aeeded6 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2 WHIRLPOOL 044a189931459dca8fc35d94d5d0518533a104cf3981d33f0ab768a98ed5bec971799468146d5d980b614341afcff81d939a35e6ba9bd4c221311520d8fa1c19
DIST iperf-3.1.3.tar.gz 549466 SHA256 e34cf60cffc80aa1322d2c3a9b81e662c2576d2b03e53ddf1079615634e6f553 SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9 WHIRLPOOL 0082f5156df751cbed49e86f794a48ff05857cd7cd4ee3bdb57f4df763a323d84f47d9e0b01e0b5932ae1e065bcf8ac706e6b96b6ac5ecee2daad6615ca4f38d
DIST iperf-3.1.7.tar.gz 552793 SHA256 1d99e3b309aa94d8f4fe7b4e953f038396ab46c1fc809ac06fffbe21ffcb64b3 SHA512 9bcc011de99356467341bd9082d2a57d243a3543c65afc18f8027b1bc7e54c1544a750640fa5230b9610ac2241571395a1bd011812edd141607b59dd3cd08ce0 WHIRLPOOL 8b938ae6b38308c15cc22e918469433fa3fbd8bd782071e160195f5f068d4cff3a696120f07f8cb24f1f2bbe0cd111f94ffd764364a74cf678f4b3f70f3bee0d
-DIST iperf-3.2_rc1.tar.gz 587479 SHA256 1bdce5a78ce15001215e8dc5ca8a362adbbd10758a793298c870e8973af7f9de SHA512 e876e592eeab2c440a4b193a10a17d1079f7887cb94a9ffda09d6c405d026e9dd0cd09729c212f729babee718b55171727ef335ec06a4c7c18131b3f55174665 WHIRLPOOL 2f0d1fbf643eeb6a7d9657976957f5a5e4c1a1aefb8136ad83a552479f6360717e8d72edd461b782cb5b4882b782c0e0197f73935bbb2ce8755e6a7b5286afe0
+DIST iperf-3.2.tar.gz 588723 SHA256 cb20d3a33e07a3b45a49a358b044f4998f452ef9d1a8a5cbde476b6ab9e9b526 SHA512 5c49bb832dd53956d15b0a9374b052a4e4e03c7c3b6e8c150001a7aba07b6ad5f8cd2b9ac2d9876981be0adf8b0396535ec9e021d58c8fe909a0f92743b4f855 WHIRLPOOL b14b076bc6588407dedc6ee3d8236d11fb756e443ad851002f28d02ef86fa006275ed57ab97a8ab8657f2c8c51ac9170f92a408e7e3ff5a30d51f37408410032
diff --git a/net-misc/iperf/iperf-2.0.10.ebuild b/net-misc/iperf/iperf-2.0.10.ebuild
new file mode 100644
index 000000000000..42c1e501eb05
--- /dev/null
+++ b/net-misc/iperf/iperf-2.0.10.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
+HOMEPAGE="http://iperf2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="ipv6 threads debug"
+
+DOCS="INSTALL README"
+
+src_configure() {
+ econf \
+ $(use_enable debug debuginfo) \
+ $(use_enable ipv6) \
+ $(use_enable threads)
+}
+
+src_install() {
+ default
+ dodoc doc/*
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-misc/iperf/iperf-3.2_rc1.ebuild b/net-misc/iperf/iperf-3.2.ebuild
similarity index 100%
rename from net-misc/iperf/iperf-3.2_rc1.ebuild
rename to net-misc/iperf/iperf-3.2.ebuild
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index 89c633e16d45..b047725e46e2 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -4,6 +4,10 @@
# NOTE: When masking a USE flag due to missing keywords, please file a keyword
# request bug for the hppa arch.
+# Andreas K. Hüttel (11 Sep 2017)
+# Systemtap has no hppa keywords
+sys-libs/glibc systemtap
+
# Göktürk Yüksek (15 Aug 2017)
# Requires java
app-forensics/sleuthkit java
diff --git a/sys-apps/coreutils/coreutils-8.26.ebuild b/sys-apps/coreutils/coreutils-8.26.ebuild
index b8dabb65223f..1a52ef267243 100644
--- a/sys-apps/coreutils/coreutils-8.26.ebuild
+++ b/sys-apps/coreutils/coreutils-8.26.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr"
LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
diff --git a/sys-apps/file/file-5.31.ebuild b/sys-apps/file/file-5.31.ebuild
index a4df466046c8..b606011e5f36 100644
--- a/sys-apps/file/file-5.31.ebuild
+++ b/sys-apps/file/file-5.31.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/openrc/openrc-0.28.ebuild b/sys-apps/openrc/openrc-0.28.ebuild
index f774016fe9ad..4e23f10fe47e 100644
--- a/sys-apps/openrc/openrc-0.28.ebuild
+++ b/sys-apps/openrc/openrc-0.28.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
fi
LICENSE="BSD-2"
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 082bd06d9a65..b8d66c32d1af 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -14,12 +14,10 @@ DIST glibc-2.22.tar.xz 12969072 SHA256 eb731406903befef1d8f878a46be75ef862b9056a
DIST glibc-2.23-patches-7.tar.bz2 315221 SHA256 97ef9e370ce9b09d8e9b9f6239f7ef94dd837d29b7bfc1404438c63da1d534ac SHA512 c0d0cab0a370acef0b085b0ab09ce868425a12bbb371d0a9ff91dc83a74a0d8d3b541d10c44650b00b7cb155f8ac1f87764e6a6bd9d6bae8a9a904b4df1650ef WHIRLPOOL 128ea1a2eeaad3d95cdf1054d10232a34e8f88d10ed8907a67d9ff02734243d20b21595ca3698a4861d9c65e2a59aedbcf8e399bd1ed879dba1556ce2995ad9b
DIST glibc-2.23-patches-8.tar.bz2 304199 SHA256 6110777176abfb8d287d82804d98e007c255db6040a1beca589a212772c90482 SHA512 470814bbbd9d4ee5fa2dd7570a2e14b0229723e373e801472856fd6c2f089499eddc300f69b49af8ba0edbdca583ee3ca521fdb5c642509717cafea0ad925fd2 WHIRLPOOL 1ef9a431d67d7669f34f7db21185d50ddd6dc82c549a9ff274f0b98454417f4098ee771bfe10073be12d3c153ee46ff36e40b46ecb31844ab09791ae29b49074
DIST glibc-2.23.tar.xz 13455260 SHA256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 SHA512 b82953388cd028e174cb08f082557bbce0dad8b67b17d31b29f90102fd52a51e03d591448ecb64882a1c1d5303afffc7f6ede85cee4c784a9284fbc9b4ad26cf WHIRLPOOL 7c7e3bf55a89a04bac917b9ca5a1cbb1613f22c427d2766f114b5a36f9635856005b823852ef5d3b73462b577fe4e5865e68e7b64633d48a95fa1e5eaa831a71
-DIST glibc-2.24-patches-10.tar.bz2 73586 SHA256 d479033b63ff796fea56fb1bde390c442021acd856994b15c983b4a89e46fbbe SHA512 fc9191a85da53a2515bbaab228648936682e04267284049468e0c82284f618ab2907b9247baca701e16edc50640199ff6d8e2a6a93ccbd5a9d3b0eb73cc484ca WHIRLPOOL 7afe94307900a70de2f5e028d8ec9e0f4b06b661ec6493217e51a13d750f891e10b45c0f66d86fa83c16cc3ce539bb257039b33bc3e363469cd03502d956d75e
DIST glibc-2.24-patches-8.tar.bz2 71769 SHA256 0a21549ed196c5c03efc37273fb991e199c585140d954dca61140c3d0c227af9 SHA512 897c9d158f898edb355ee6478a7e0372a29e6c9d0b98cd80ccaa3ed4f0aab35e3b038217735f2a3b6007ff0cf27c7d6b27a84daaceca9361dce04bc5b2124ada WHIRLPOOL 222b375249c5a3e53fd0116fadf9612c5e5479cd845dc3fcebb496dfe38d70d0e2c84517b79258c73afe2c1f5d15ecec768d33659c10fb15ae59b9061072987d
DIST glibc-2.24.tar.xz 13554048 SHA256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 SHA512 a4cb28a2c51a0cc029ed69da7cba11931a615ba897235590b4f7fad2eaabec9042f8250eaac2a5860997437a69ab13304f10a634000e52c0336b5593b7969adb WHIRLPOOL be82b47fc73f7e780e8e73a5f58b313d8e861d5ea8c4320f95ef0d8c1e125ff011d61dcfc0380be0e83868bd8c3299de1ea662da7fc8d709050e89b2c126e3eb
-DIST glibc-2.25-patches-5.tar.bz2 44356 SHA256 d9ea3908c8c4d561d22697d9830b4032cbbba46822613d5a3509d3b7e579c016 SHA512 ad3acf760e6cd714fe5d6833b53d8759e09c74ca60fbfd173e87dbb2d1062a5006427ca17db0b6ce695dae03e2ace7dc30992ae9b08e94ae4350b19ea03acdcc WHIRLPOOL 1fa660852f9e42fda956b4924351a532efdca88691cb2855c458e8bb9af1fc3cbdf2eb9c8ce93a7c57fa2d6a7e20b1c1a5c17d29b0d07f8e44e0ed8fdb7db8bc
-DIST glibc-2.25-patches-7.tar.bz2 46222 SHA256 af1a3c13409599486d58c531d04d794698b1ac04cc883dbdb0d29af7b44d7ca5 SHA512 21637f3b1a20cef55ce52311bc7b4d60d93b6f04a8d45944ccb9286fc330e262c6f37f729b7f5a5daec588821e8ae330f89cb7f7e84463b4e533aa80f408e415 WHIRLPOOL bc48fa53ddd264559378e8075c42bd38fd49015ac76834aaed7e0ec338dbbba1f4fdc1d2aaea6d53d72bbbaef99920cad489188b95cd0ec06b02ce5def110c11
DIST glibc-2.25-patches-8.tar.bz2 47110 SHA256 1dc41664153369886d240a1851b15bf0c3c3739c8319e6d68cb0c2f85fc98901 SHA512 41d772c47770a63502c863f3c9bb05164e0ceab69fb7b7f355c25685ae4285d73e9ab0e3836162bd11852339055329d0bdc7238f3191fde39a50ce0d9a60454c WHIRLPOOL c6e0443d75e2e4607226caa4df1ce2b10ef21ec2564b447e2a287888d1f593d51f334a6e1ab942f5d1602d02c6fee87ce4ef9a7db3409de6063bc377a470a42d
+DIST glibc-2.25-patches-9.tar.bz2 67901 SHA256 cbd8af837aa0776940fd41e34874e930a7f25d78cdd212e138dd9a85e1349519 SHA512 b4f0be5b20834aff102394df23084cc0adf1ab674e6ce050550f6b6658cf0eab57f7685cac079b1a19388dba927a36b8ca31f58af3dddc559d7230674ffd59b5 WHIRLPOOL 81c18056fe26a79c7a7598da1181ba02e83daf7d9e9883a3c1195804a35fe22a79d7cc4a8411f2f4a4ce6430e506978199f59b61d3ed0a70b4e4f7dd05ecfafe
DIST glibc-2.25.tar.xz 13873900 SHA256 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 SHA512 5b7a2418d5b8a1b6a907c6c7fb6477ee2a473151cb45e03d0d4cdd9a33497c90b1ee39e2e7e885e2b25743dcd3747336ef114b4a73eb001da1fd79f29e0f9a6e WHIRLPOOL dc2fafaa4a0e5581268338453838a03ed0c5e7a2af844e8fb7086ab8d3ae48efbdbe6f25db1d089ae669cd2f8b0412f690d965506753d86f8525da2df59b7953
DIST glibc-2.26-patches-0.tar.bz2 22289 SHA256 4b59db44f22c415a3c30a543927e69c04d15ef5d9d5f2ce63eba30e0354ebbd1 SHA512 4afb828d2897c68c7a16e42a2c38a872d38c42954a626d0650cc3fface907d28ba4f5b50504aa4e6c465c5b9c37ab0014d2d228b29ac50335aeb85fec713fd78 WHIRLPOOL 6fa2ad2be084e14e4e9105947232a6b5057d23dd0b55b40bd15bb48c84bfb492a22a27d8a3358f6cc1335b7c9652a0be2d7a977eb266dd08d531ecee12449184
DIST glibc-2.26.tar.xz 14682748 SHA256 e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0 WHIRLPOOL 9091c3bccc9b590de6b9595aa391ba01091f0c301bd9199d7c48fbeaeeb013ec9c683c68b65b59c5a69e3905b7f842cca1b0a410431967ecb3a1229b8535486f
diff --git a/sys-libs/glibc/glibc-2.24-r4.ebuild b/sys-libs/glibc/glibc-2.24-r4.ebuild
deleted file mode 100644
index 29a17f827aec..000000000000
--- a/sys-libs/glibc/glibc-2.24-r4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-glibc
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
- EGIT_SOURCEDIRS="${S}"
- inherit git-2
- ;;
-*)
- RELEASE_VER=${PV}
- ;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="10" # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires
-
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-# CTARGET - machine that will target the binaries
-# CHOST - machine that will host the binaries
-# CBUILD - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-# CBUILD = CHOST = CTARGET - native build/install
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler
-# For install paths:
-# CHOST = CTARGET - install into /
-# CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-COMMON_DEPEND="
- nscd? ( selinux? (
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap )
- ) )
- suid? ( caps? ( sys-libs/libcap ) )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
- >=app-misc/pax-utils-0.1.10
- !=${CATEGORY}/binutils-2.24
- >=${CATEGORY}/gcc-4.7
- )"
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
- DEPEND+="
- >=sys-devel/binutils-2.24
- >=sys-devel/gcc-4.7
- virtual/os-headers"
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
- devspace=${devspace//HTTP/https://dev.gentoo.org/}
- echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-src_unpack() {
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-
- toolchain-glibc_src_unpack
-}
-
-src_prepare() {
- toolchain-glibc_src_prepare
-
- cd "${S}"
-
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
-
- if use hardened ; then
- # We don't enable these for non-hardened as the output is very terse --
- # it only states that a crash happened. The default upstream behavior
- # includes backtraces and symbols.
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-chk_fail.c debug/chk_fail.c || die
-
- if use debug ; then
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
- sed -i \
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
- debug/Makefile || die
- fi
-
- # Build various bits with ssp-all
- sed -i \
- -e 's:-fstack-protector$:-fstack-protector-all:' \
- */Makefile || die
- fi
-
- case $(gcc-fullversion) in
- 4.8.[0-3]|4.9.0)
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
- eerror "glibc. See https://bugs.gentoo.org/547420 for details."
- die "need to switch compilers #547420"
- ;;
- esac
-}
diff --git a/sys-libs/glibc/glibc-2.25-r2.ebuild b/sys-libs/glibc/glibc-2.25-r2.ebuild
deleted file mode 100644
index 61088f71f41b..000000000000
--- a/sys-libs/glibc/glibc-2.25-r2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-glibc
-
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
-
-LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-RESTRICT="strip" # strip ourself #46186
-EMULTILIB_PKG="true"
-
-# Configuration variables
-RELEASE_VER=""
-case ${PV} in
-9999*)
- EGIT_REPO_URIS="git://sourceware.org/git/glibc.git"
- EGIT_SOURCEDIRS="${S}"
- inherit git-2
- ;;
-*)
- RELEASE_VER=${PV}
- ;;
-esac
-GCC_BOOTSTRAP_VER="4.7.3-r1"
-# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="5" # Gentoo patchset
-: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires
-
-IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
-
-# Here's how the cross-compile logic breaks down ...
-# CTARGET - machine that will target the binaries
-# CHOST - machine that will host the binaries
-# CBUILD - machine that will build the binaries
-# If CTARGET != CHOST, it means you want a libc for cross-compiling.
-# If CHOST != CBUILD, it means you want to cross-compile the libc.
-# CBUILD = CHOST = CTARGET - native build/install
-# CBUILD != (CHOST = CTARGET) - cross-compile a native build
-# (CBUILD = CHOST) != CTARGET - libc for cross-compiler
-# CBUILD != CHOST != CTARGET - cross-compile a libc for a cross-compiler
-# For install paths:
-# CHOST = CTARGET - install into /
-# CHOST != CTARGET - install into /usr/CTARGET/
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
- if [[ ${CATEGORY} == cross-* ]] ; then
- export CTARGET=${CATEGORY#cross-}
- fi
-fi
-
-is_crosscompile() {
- [[ ${CHOST} != ${CTARGET} ]]
-}
-
-# Why SLOT 2.2 you ask yourself while sippin your tea ?
-# Everyone knows 2.2 > 0, duh.
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
-COMMON_DEPEND="
- nscd? ( selinux? (
- audit? ( sys-process/audit )
- caps? ( sys-libs/libcap )
- ) )
- suid? ( caps? ( sys-libs/libcap ) )
- selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
- >=app-misc/pax-utils-0.1.10
- !=${CATEGORY}/binutils-2.24
- >=${CATEGORY}/gcc-4.7
- )"
- [[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers"
-else
- DEPEND+="
- >=sys-devel/binutils-2.24
- >=sys-devel/gcc-4.7
- virtual/os-headers"
- RDEPEND+=" vanilla? ( !sys-libs/timezone-data )"
- PDEPEND+=" !vanilla? ( sys-libs/timezone-data )"
-fi
-
-upstream_uris() {
- echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-}
-gentoo_uris() {
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI"
- devspace=${devspace//HTTP/https://dev.gentoo.org/}
- echo mirror://gentoo/$1 ${devspace//URI/$1}
-}
-SRC_URI=$(
- [[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
- [[ -n ${PATCH_VER} ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
-)
-SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
-
-src_unpack() {
- [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
-
- toolchain-glibc_src_unpack
-}
-
-src_prepare() {
- toolchain-glibc_src_prepare
-
- cd "${S}"
-
- epatch "${FILESDIR}"/2.19/${PN}-2.19-ia64-gcc-4.8-reloc-hack.patch #503838
-
- if use hardened ; then
- # We don't enable these for non-hardened as the output is very terse --
- # it only states that a crash happened. The default upstream behavior
- # includes backtraces and symbols.
- einfo "Installing Hardened Gentoo SSP and FORTIFY_SOURCE handler"
- cp "${FILESDIR}"/2.20/glibc-2.20-gentoo-stack_chk_fail.c debug/stack_chk_fail.c || die
- cp "${FILESDIR}"/2.25/glibc-2.25-gentoo-chk_fail.c debug/chk_fail.c || die
-
- if use debug ; then
- # Allow SIGABRT to dump core on non-hardened systems, or when debug is requested.
- sed -i \
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-stack_chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
- -e '/^CFLAGS-backtrace.c/ iCPPFLAGS-chk_fail.c = -DSSP_SMASH_DUMPS_CORE' \
- debug/Makefile || die
- fi
- fi
-
- case $(gcc-fullversion) in
- 4.8.[0-3]|4.9.0)
- eerror "You need to switch to a newer compiler; gcc-4.8.[0-3] and gcc-4.9.0 miscompile"
- eerror "glibc. See https://bugs.gentoo.org/547420 for details."
- die "need to switch compilers #547420"
- ;;
- esac
-}
diff --git a/sys-libs/glibc/glibc-2.25-r3.ebuild b/sys-libs/glibc/glibc-2.25-r5.ebuild
similarity index 94%
rename from sys-libs/glibc/glibc-2.25-r3.ebuild
rename to sys-libs/glibc/glibc-2.25-r5.ebuild
index 3174a4d36115..0ce346e5829c 100644
--- a/sys-libs/glibc/glibc-2.25-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r5.ebuild
@@ -9,7 +9,8 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS=""
RESTRICT="strip" # strip ourself #46186
EMULTILIB_PKG="true"
@@ -27,7 +28,7 @@ case ${PV} in
esac
GCC_BOOTSTRAP_VER="4.7.3-r1"
# patches live at https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/glibc/
-PATCH_VER="7" # Gentoo patchset
+PATCH_VER="9" # Gentoo patchset
: ${NPTL_KERN_VER:="2.6.32"} # min kernel version nptl requires
IUSE="audit caps debug gd hardened multilib nscd +rpc selinux systemtap profile suid vanilla crosscompile_opts_headers-only"
@@ -100,7 +101,7 @@ upstream_uris() {
echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
}
gentoo_uris() {
- local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
+ local devspace="HTTP~vapier/dist/URI HTTP~dilfridge/distfiles/URI HTTP~tamiko/distfiles/URI HTTP~slyfox/distfiles/URI"
devspace=${devspace//HTTP/https://dev.gentoo.org/}
echo mirror://gentoo/$1 ${devspace//URI/$1}
}
diff --git a/sys-libs/glibc/glibc-2.26-r1.ebuild b/sys-libs/glibc/glibc-2.26-r1.ebuild
index 3658a3e108a3..d7692868c3f2 100644
--- a/sys-libs/glibc/glibc-2.26-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r1.ebuild
@@ -75,6 +75,7 @@ COMMON_DEPEND="
) )
suid? ( caps? ( sys-libs/libcap ) )
selinux? ( sys-libs/libselinux )
+ systemtap? ( dev-util/systemtap )
"
DEPEND="${COMMON_DEPEND}
>=app-misc/pax-utils-0.1.10