Merge updates from master

19 files changed, 330 insertions, 10 deletions

diff --git a/app-benchmarks/iozone/Manifest b/app-benchmarks/iozone/Manifest
index a9b5c023d557..b4e1bf07cb75 100644
--- a/app-benchmarks/iozone/Manifest
+++ b/app-benchmarks/iozone/Manifest
@@ -1 +1,2 @@
 DIST iozone3_471.tar 1853440 BLAKE2B 280c821a439ad1bacbd749278385481678d644a59c14395482c8a088b0578285f389f376fb32ce3c3abde598f50d693fb0c7c9a3d6597765547a71c76d21ea1c SHA512 c61b2b8b5af3dccdb99b26aef8a0a4f2f5f467fc3985ac72ed4bb4fb36e4b7684ca6dbaa5bbc05ae0a4e73852e048e9fd2495eda9313f5abc4e631499d683aec
+DIST iozone3_484.tar 1863680 BLAKE2B 72d3d3125aec2dfc504bb00684ef325e85edffe0d6efcd519cd692cfa2b9b792a44c00313dc96eabbbb3ab850a7a440b3ca3d5b955c4f6092b08f92ebe5c332b SHA512 bb1ac0c1724a5d3c20e90c56c0b4a438b4aa50384cddc76f4b77f2c465f052fd3fae9217b77688a2c6caf5e90611123a97ea0cd8074b3678068a90e6dd7857b7
diff --git a/app-benchmarks/iozone/iozone-3.484.ebuild b/app-benchmarks/iozone/iozone-3.484.ebuild
new file mode 100644
index 000000000000..cc8b0d30da97
--- /dev/null
+++ b/app-benchmarks/iozone/iozone-3.484.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+# TODO
+#        ->   linux-arm            (32bit)   <-
+#        ->   linux-AMD64          (64bit)   <-
+#        ->   linux-ia64           (64bit)   <-
+#        ->   linux-powerpc        (32bit)   <-
+#        ->   linux-powerpc64      (64bit)   <-
+#        ->   linux-S390           (32bit)   <-
+#        ->   linux-S390X          (64bit)   <-
+#
+#        ->   freebsd              (32bit)   <-
+#        ->   macosx               (32bit)   <-
+#        ->   netbsd               (32bit)   <-
+#        ->   openbsd              (32bit)   <-
+#        ->   openbsd-threads      (32bit)   <-
+#
+# ~ia64 ~s390 alpha(?) x86-fbsd
+
+inherit toolchain-funcs
+
+DESCRIPTION="Filesystem benchmarking program"
+HOMEPAGE="http://www.iozone.org/"
+SRC_URI="http://www.iozone.org/src/current/${PN}${PV/./_}.tar"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}${PV/./_}
+
+src_prepare() {
+	default
+
+	# Options FIX
+	sed -i -e "s:CC	=.*:CC	=$(tc-getCC):g" \
+		-e "s:-O3:${CFLAGS}:g" src/current/makefile || die
+}
+
+src_configure() {
+	case ${ARCH} in
+		x86|alpha)	PLATFORM="linux";;
+		arm)		PLATFORM="linux-arm";;
+		ppc)		PLATFORM="linux-powerpc";;
+		ppc64)		PLATFORM="linux-powerpc64";;
+		amd64)		PLATFORM="linux-AMD64";;
+		ia64)		PLATFORM="linux-ia64";;
+		s390)		PLATFORM="linux-S390";;
+		x86-fbsd)	PLATFORM="freebsd";;
+		*)		PLATFORM="linux-${ARCH}";;
+	esac
+}
+
+src_compile() {
+	emake -C src/current ${PLATFORM}
+}
+
+src_test() {
+	cd "${T}" || die
+	"${S}"/src/current/iozone testfile || die "self test failed"
+}
+
+src_install() {
+	dosbin src/current/{iozone,fileop}
+
+	# decompress pre-compressed file to make QA check happy
+	gzip -d docs/Iozone_ps.gz || die
+
+	dodoc docs/I* docs/Run_rules.doc src/current/Changes.txt
+	doman docs/iozone.1
+	cd src/current || die
+	dodoc Generate_Graphs Gnuplot.txt gengnuplot.sh gnu3d.dem
+}
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.22.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.22.ebuild
index 370a0ec7bf39..60f5830be848 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.22.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.22.126460.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.22.126460.ebuild
index fd828192e3a8..3bed9174d291 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.22.126460.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.22.126460.ebuild
@@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
 
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.22.126460.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.22.126460.ebuild
index 0abe47877460..b981dc4d64ae 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.22.126460.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.22.126460.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="mirror strip"
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.22.ebuild
index f67c918dad93..5983c8110cb5 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.22.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.22.ebuild
index f0beae793bd7..a565bfc1fa23 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.22.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pax_kernel"
 
 RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox/virtualbox-5.2.22.ebuild b/app-emulation/virtualbox/virtualbox-5.2.22.ebuild
index 547c8cc73167..6594bcd89f31 100644
--- a/app-emulation/virtualbox/virtualbox-5.2.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.22.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 
 RDEPEND="!app-emulation/virtualbox-bin
diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest
index 0ee7488f7ad1..13b90276c1b5 100644
--- a/dev-db/kyotocabinet/Manifest
+++ b/dev-db/kyotocabinet/Manifest
@@ -1 +1,2 @@
 DIST kyotocabinet-1.2.76.tar.gz 951930 BLAKE2B 7d2b5e5c85e0a6f90c88cd3b6e1b41588dffeaa2a404aa2c83281e033fe4e1275fbbc15584d4998e97f166c5060ce43c9cee9567121edbe1f72a0d5f52f42b40 SHA512 278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a
+DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
new file mode 100644
index 000000000000..36ee56423060
--- /dev/null
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A straightforward implementation of DBM"
+HOMEPAGE="https://fallabs.com/kyotocabinet/"
+SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="debug doc examples +lzma +lzo static-libs"
+
+DEPEND="sys-libs/zlib[static-libs?]
+	lzma? ( app-arch/xz-utils:=[static-libs?] )
+	lzo? ( dev-libs/lzo:=[static-libs?] )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/fix_configure-1.2.62.patch
+	"${FILESDIR}"/${PN}-1.2.76-configure-8-byte-atomics.patch
+	"${FILESDIR}"/${PN}-1.2.76-flags.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "/DOCDIR/d" Makefile.in || die
+	tc-export AR
+
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	# We need to set LD_LIBRARY_PATH which will be assigned to RUNENV later
+	# used by test suite
+	LD_LIBRARY_PATH=. \
+	econf $(use_enable debug) \
+		$(use_enable static-libs static) \
+		$(use_enable !static-libs shared) \
+		$(use_enable lzma) \
+		$(use_enable lzo)
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/${PF}/example
+		doins example/*
+	fi
+
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc/*
+	fi
+}
diff --git a/dev-libs/dietlibc/Manifest b/dev-libs/dietlibc/Manifest
index 5610c77f2ad6..09f53a3ba4b0 100644
--- a/dev-libs/dietlibc/Manifest
+++ b/dev-libs/dietlibc/Manifest
@@ -1 +1,2 @@
+DIST dietlibc-0.34.tar.xz 662732 BLAKE2B ac709f19f98c298ee424f8320cbc7bca997156323e64d3a219251146b4257185f27519262914d3df044638ecfcf06e1e3680d8af226704dca65d6e4be20b3dc4 SHA512 2b38528c0ccf50e426f587b6448fed997fab1147eecc9e1af2f3fb3efe3d8f3997656d8e66e7cf1045ceb1f602cef43456c62ba83ff494f9c9816721bdb4d6c6
 DIST dietlibc-0.34_pre20140729.tar.bz2 670195 BLAKE2B 9479c97c09b0c8c7e5d85536afd962613e9f5fbcb1aff3ef9b2aace19d246b2d0b637f00c3abee0a2c06f170263e85ffba94247171afc47e40c8ab0e95fe5191 SHA512 a0bb5465f7fc985fd074dfcc4039003ec26b6b5fde5f2ccc53322067bd1a6459e742c9debeffda0b5146e287baa8e49f74f4a8ffafdf1daacacec4768d13db36
diff --git a/dev-libs/dietlibc/dietlibc-0.34.ebuild b/dev-libs/dietlibc/dietlibc-0.34.ebuild
new file mode 100644
index 000000000000..4a35f612fa6d
--- /dev/null
+++ b/dev-libs/dietlibc/dietlibc-0.34.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A libc optimized for small size"
+HOMEPAGE="https://www.fefe.de/dietlibc/"
+SRC_URI="https://www.fefe.de/dietlibc/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+DIETHOME="/usr/diet"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if $(tc-getLD) --version | grep -q "2.31.1"; then
+			ewarn "${PN} does not work with unpatched binutils-2.31.1,"
+			ewarn "see \"${S}/FAQ\""
+			ewarn "and https://bugs.gentoo.org/672126 for details."
+			ewarn "In the meanwhile you can install another binutils version"
+			ewarn "and use binutils-config to switch version."
+			sleep 10
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
+	use sparc && replace-sparc64-flags
+
+	# gcc-hppa suffers support for SSP, compilation will fail
+	use hppa && strip-unsupported-flags
+
+	# Makefile does not append CFLAGS
+	append-flags -W -Wall -Wchar-subscripts \
+		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
+		-Wno-unused -Wredundant-decls -fno-strict-aliasing
+
+	# Disable ssp for we default to it on >=gcc-4.8.3
+	append-flags $(test-flags -fno-stack-protector)
+
+	# only use -nopie on archs that support it
+	tc-enables-pie && append-flags -no-pie
+
+	sed -i -e 's:strip::' Makefile || die
+	append-flags -Wa,--noexecstack
+}
+
+src_compile() {
+	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		STRIP=":"
+}
+
+src_install() {
+	emake -j1 prefix="${EPREFIX}"${DIETHOME} \
+		DESTDIR="${D}" \
+		install-bin \
+		install-headers \
+		install-profiling
+
+	dobin "${ED}"${DIETHOME}/bin/*
+	doman "${ED}"${DIETHOME}/man/*/*
+	rm -r "${ED}"${DIETHOME}/{man,bin} || die
+
+	dodoc AUTHOR BUGS CAVEAT CHANGES README THANKS TODO PORTING
+}
diff --git a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
index 732ca48ef1b4..47c2c1b97da5 100644
--- a/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
+++ b/dev-libs/libfstrcmp/libfstrcmp-0.7.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 SRC_URI="http://fstrcmp.sourceforge.net/fstrcmp-0.7.D001.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/fstrcmp-0.7.D001"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 DEPEND="
 	sys-apps/groff
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index 816155149182..dbed130e1f44 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1 +1,2 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
+DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
diff --git a/dev-libs/libowfat/libowfat-0.32.ebuild b/dev-libs/libowfat/libowfat-0.32.ebuild
new file mode 100644
index 000000000000..daee3d504455
--- /dev/null
+++ b/dev-libs/libowfat/libowfat-0.32.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
+SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
+HOMEPAGE="https://www.fefe.de/libowfat/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="diet"
+
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	# Required for mult/umult64.c to be usable
+	append-flags -fomit-frame-pointer
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		CFLAGS="-I. ${CFLAGS}" \
+		DIET="/usr/bin/diet -Os" \
+		prefix=/usr \
+		INCLUDEDIR=/usr/include/libowfat \
+		$( use diet || echo 'DIET=' )
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="/usr/$(get_libdir)" \
+		MAN3DIR="/usr/share/man/man3" \
+		INCLUDEDIR="/usr/include/libowfat" \
+		install
+
+	cd "${D}"/usr/share/man
+	mv man3/buffer.3 man3/owfat-buffer.3
+}
diff --git a/dev-python/python-ly/python-ly-0.9.5.ebuild b/dev-python/python-ly/python-ly-0.9.5.ebuild
index 6bdab043c960..b911dc76b5a8 100644
--- a/dev-python/python-ly/python-ly-0.9.5.ebuild
+++ b/dev-python/python-ly/python-ly-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 3d7f91a3d2f0..77d2c7fd6e45 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,3 +2,4 @@ DIST jenkins-bin-2.138.1.war 75714886 BLAKE2B 9008f33ee79f99e029333ec9071021bf1b
 DIST jenkins-bin-2.138.2.war 75728164 BLAKE2B 2f322d05f60d4fac93087cae45f5a2a31af03c386d8c3e8ca392a0897d1bb0342e2ce48f9d4d07bb18e5110966078a47f25fbfdadb857f8339ec6f0e289b8fe6 SHA512 593b08d1aa0021de1698c7c30737be45425b0b956c3a8b62b3ffebcdfaf9971bf65d16544106265a635e2d21df69b3aca38ddfa7ed6a1ebb34e7cffc24591860
 DIST jenkins-bin-2.138.3.war 75733340 BLAKE2B c285d6d9d9a3fbea4463b9413ddb9bb0970be1b0cfea64525ba84110a83cee1a0e99177dcc9a3b4b67bf31479af2438c98c9e086d0bd4c06508d3d54c86f1bce SHA512 8cd8388a3b0e596821ea9c3b316294489b14e24e9a7f332940be1bcb93af7e6b9c02bb077d1ba421c39a5399c241bcdcb516a8f19fd480181ec32e1ddbc5e596
 DIST jenkins-bin-2.146.war 75878664 BLAKE2B 9063d66b8113162bcb177e878f679c80201fc5ef6bff3b6b222387c4c4655739b11579fef4ffe5282f4bdae58d407f9903665acfb1743e068a5453fd944ef163 SHA512 7d3fa96a97dd701f438e582dc2840b214e78df725daaa03a4646e846ec9f57ad0544b87d84b6436b8128e0a4a55c74c8c122b8f5ba607c8885f4c23b0b9ab8b9
+DIST jenkins-bin-2.153.war 75988150 BLAKE2B 963fefa46cef2117929c00fcbf5eb8d1dd60e1a3cffe885361e2af0ffb7b34a953fa30e73d7ddb45a967f465ba8cd6f82d4b669e065536d3551b808ac85af4f3 SHA512 1e78e414b6db6f523bc0a872a60ec09c6e60d3dac2c9192af7c1d7420ba338b852c82a47d9c437b7c71a71cc7df5d1cb6066e2d36e9b772bff9bc12aef6cc11d
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.153.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.153.ebuild
new file mode 100644
index 000000000000..dfe46af57ae6
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.153.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/net-analyzer/munin/munin-2.0.38.ebuild b/net-analyzer/munin/munin-2.0.38.ebuild
index e84866a74b20..bb89ab6127c2 100644
--- a/net-analyzer/munin/munin-2.0.38.ebuild
+++ b/net-analyzer/munin/munin-2.0.38.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2"
 REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )"