Merge updates from master

7 files changed, 30 insertions, 84 deletions

diff --git a/app-i18n/man-pages-ru/Manifest b/app-i18n/man-pages-ru/Manifest
index 431a43d42225..f2a0ff0873d5 100644
--- a/app-i18n/man-pages-ru/Manifest
+++ b/app-i18n/man-pages-ru/Manifest
@@ -1 +1,2 @@
 DIST man-pages-ru_4.08-2329-2329-20170422.tar.bz2 1543256 BLAKE2B ea17641041c6f9168255d4b15d4a85fb50ec3273e1118a57fe4de2f2fe8849011b414975d451f44a5f99acc55ad571b8544043d13fdb3f935281ab9006714760 SHA512 4cfb9b67118d0b3ed44d7ec2f5cbd3e711e738225fe528e7a80c9503bc9136bbf81423772ce9e25abd46f172b90dcee931ebfec26ed79a6bf6d36cc0287af51f
+DIST man-pages-ru_4.16-2383-2383-20180422.tar.bz2 1682388 BLAKE2B 3707d972313ca1f96c3d5be3f8f74dd3e88322f3e9504799d49fb57c06f99d62f0cb88d545c90c4b47795b9aee92d1f89d55c777b0970070120b1496be0b3426 SHA512 df358c917ba55360b86e075097316c2eeb29eb9f9938ad7ee1ae6679690f1d736f448cee36643f2645c40a964274e1a3d0948f91ec0f99d81b4a29009704f009
diff --git a/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild b/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
new file mode 100644
index 000000000000..d506b66d2434
--- /dev/null
+++ b/app-i18n/man-pages-ru/man-pages-ru-4.16.2383.2383.20180422.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+MY_PV="$(replace_version_separator 1 . $(replace_all_version_separators -))"
+
+DESCRIPTION="A collection of Russian translations of Linux manual pages"
+HOMEPAGE="http://man-pages-ru.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MY_PV}.tar.bz2"
+
+LICENSE="FDL-1.3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=""
+RDEPEND="virtual/man"
+
+S="${WORKDIR}/${PN}_${MY_PV}"
+
+src_install() {
+	insinto /usr/share/man/ru
+	doins -r man*
+	dodoc README
+}
diff --git a/dev-libs/bitset/Manifest b/dev-libs/bitset/Manifest
index 1a206ad88074..2ec6b28c82a7 100644
--- a/dev-libs/bitset/Manifest
+++ b/dev-libs/bitset/Manifest
@@ -1,2 +1 @@
-DIST bitset-2.8.3.tar.gz 36787 BLAKE2B 1c30d389c83b8c7bd13ec698db4b3d38600521c38014a7f3acaba708d0b7b914877e08dc1b32c2d9caf8baf2f171c518fc92ebbc52b94602bbf0e372af385400 SHA512 7b451139ee9db0b581e552d09f03809185e64f3b1190d887ba58478c4dc10a1ecc687d69cb42045e3c01ad9d065e12aa4f31d14068d7df9f6a8f284344d5b51c
 DIST bitset-2.8.4.tar.gz 37040 BLAKE2B 3a3db906c86fef73c20a038f01f7053efe2f7d2802b8a627657dbfe807c2d043834f7afab6a3fda66f3b4a87c27255c000f0cebffa7620e88e5f3790a3544914 SHA512 709c4f064416b22ae37fc9659a9eb74007fff5ce12eb998c386a268427a012238258bbd0f019682a5172a98b7b2a476fd60017bf34e199159e838b254b48ffe7
diff --git a/dev-libs/bitset/bitset-2.8.3.ebuild b/dev-libs/bitset/bitset-2.8.3.ebuild
deleted file mode 100644
index 0f9c70752602..000000000000
--- a/dev-libs/bitset/bitset-2.8.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils
-
-DESCRIPTION="A compressed bitset with supporting data structures and algorithms"
-HOMEPAGE="https://github.com/chriso/bitset"
-SRC_URI="https://github.com/chriso/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="jemalloc static-libs tcmalloc"
-KEYWORDS="amd64 x86"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools[-minimal] )
-	jemalloc? ( >=dev-libs/jemalloc-3.2 )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="?? ( jemalloc tcmalloc )"
-
-DOCS=( README.md )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with jemalloc) \
-		$(use_with tcmalloc)
-	)
-	autotools-utils_src_configure
-}
diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest
index 1988535872e4..1856f997aa63 100644
--- a/net-misc/yandex-disk/Manifest
+++ b/net-misc/yandex-disk/Manifest
@@ -1,4 +1,2 @@
-DIST yandex-disk-0.1.5.940-1.fedora.i386.rpm 4551033 BLAKE2B 7d989a6aa3c2659bddeedd38cd0e4763548352e270d5ecfeaecf0aa901836dd8a1b4f794f71d2345d0041242773f01a8222e31d9a2ded50bf434dfce1250bbe2 SHA512 40438b9b079c3f1fc9c23794abd320b552f9f77c0f7aa4972fd2de94f60b607bc067a56e00bb35597a505e087ecc6ec7089b90d87695320c685abbf4af735db4
-DIST yandex-disk-0.1.5.940-1.fedora.x86_64.rpm 4349853 BLAKE2B 87982bbcdabfe5e78f81a2f2a2bd8669ab05f217fc716564b2040a584fa76e7244f8c9e5ad01d1f93419dc33b1ea49eaee72e8cc65d84330ef90deac80feeacd SHA512 0e52eb6275a349191b56d89a1e288c7112a8f93c31d4017787ede0a1fd7b69666f8425abb0309500361cbdd56e850e2380f74730d5ace97f1b3e4dd2c5eed6fb
 DIST yandex-disk-0.1.5.978-1.fedora.i386.rpm 4353188 BLAKE2B 5d82bf72cf670754c6889e1b7f4c99c47426fe938f7131381bf06d1bb6d5e98d403d746b336624f958a75839fb0c73982b14ba86d4d3db581286ace31fac48f7 SHA512 59008f42463185fab2aed221b44283e57c279ef7fd0966732dc3b6a3f474104f2ca676d77e7d958f53bff38aac9c0f7ea82b25202fd9da5f0de62bb56a983319
 DIST yandex-disk-0.1.5.978-1.fedora.x86_64.rpm 4534132 BLAKE2B 1e39bf6a9dab9c6d7bf1960214c23a9196347d7d757e014b22cd37a598f479e2576346ad1d38bc8986f7a1b30529db0e0e58b0fc20f51d4abcbdac028759678c SHA512 d4f22bf008767289abf95237aa86ae27b33b99c62ba89381c4ed73a510d8096c169c1c215274133cc7fdf885fb7d629e758cea5925f4afc5acf7b6d688bf0078
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
deleted file mode 100644
index 0ba7ec85dfa9..000000000000
--- a/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils rpm
-
-MY_P="${PN}-${PV/_p/-}"
-
-DESCRIPTION="CLI to access Yandex Disk file storage service"
-HOMEPAGE="https://disk.yandex.ru"
-SRC_URI="
-	amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm )
-	x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm )
-"
-
-LICENSE="YDSLA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-DEPEND=""
-RDEPEND="sys-libs/zlib"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/bin/yandex-disk"
-
-src_prepare() {
-	# bug #526312
-	sed -i \
-		-e '/have /d' \
-		-e 's/+o nospace/-o nospace/' \
-		-e '/^complete/s/-X //' \
-		etc/bash_completion.d/yandex-disk-completion.bash || die
-
-	eapply_user
-}
-
-src_install() {
-	exeinto /opt/bin
-	doexe usr/bin/yandex-disk
-	newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}"
-	insinto /usr/share/man
-	doins -r usr/share/man/*
-	insinto /usr/share
-	doins -r usr/share/locale
-}
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
index 7f1a75788731..c2f03cb326ab 100644
--- a/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
+++ b/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="YDSLA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 DEPEND=""
 RDEPEND="sys-libs/zlib"